Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Side by Side Diff: media/renderers/video_renderer_impl.h

Issue 1423163004: media: Replace DecryptorReadyCB with CdmReadyCB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/renderers/renderer_impl.cc ('k') | media/renderers/video_renderer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_ 5 #ifndef MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_
6 #define MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_ 6 #define MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 VideoRendererSink* sink, 55 VideoRendererSink* sink,
56 ScopedVector<VideoDecoder> decoders, 56 ScopedVector<VideoDecoder> decoders,
57 bool drop_frames, 57 bool drop_frames,
58 GpuVideoAcceleratorFactories* gpu_factories, 58 GpuVideoAcceleratorFactories* gpu_factories,
59 const scoped_refptr<MediaLog>& media_log); 59 const scoped_refptr<MediaLog>& media_log);
60 ~VideoRendererImpl() override; 60 ~VideoRendererImpl() override;
61 61
62 // VideoRenderer implementation. 62 // VideoRenderer implementation.
63 void Initialize(DemuxerStream* stream, 63 void Initialize(DemuxerStream* stream,
64 const PipelineStatusCB& init_cb, 64 const PipelineStatusCB& init_cb,
65 const SetDecryptorReadyCB& set_decryptor_ready_cb, 65 const SetCdmReadyCB& set_cdm_ready_cb,
66 const StatisticsCB& statistics_cb, 66 const StatisticsCB& statistics_cb,
67 const BufferingStateCB& buffering_state_cb, 67 const BufferingStateCB& buffering_state_cb,
68 const base::Closure& ended_cb, 68 const base::Closure& ended_cb,
69 const PipelineStatusCB& error_cb, 69 const PipelineStatusCB& error_cb,
70 const TimeSource::WallClockTimeCB& wall_clock_time_cb, 70 const TimeSource::WallClockTimeCB& wall_clock_time_cb,
71 const base::Closure& waiting_for_decryption_key_cb) override; 71 const base::Closure& waiting_for_decryption_key_cb) override;
72 void Flush(const base::Closure& callback) override; 72 void Flush(const base::Closure& callback) override;
73 void StartPlayingFrom(base::TimeDelta timestamp) override; 73 void StartPlayingFrom(base::TimeDelta timestamp) override;
74 void OnTimeStateChanged(bool time_progressing) override; 74 void OnTimeStateChanged(bool time_progressing) override;
75 75
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 // NOTE: Weak pointers must be invalidated before all other member variables. 263 // NOTE: Weak pointers must be invalidated before all other member variables.
264 base::WeakPtrFactory<VideoRendererImpl> weak_factory_; 264 base::WeakPtrFactory<VideoRendererImpl> weak_factory_;
265 265
266 DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl); 266 DISALLOW_COPY_AND_ASSIGN(VideoRendererImpl);
267 }; 267 };
268 268
269 } // namespace media 269 } // namespace media
270 270
271 #endif // MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_ 271 #endif // MEDIA_RENDERERS_VIDEO_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « media/renderers/renderer_impl.cc ('k') | media/renderers/video_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698