diff options
| author | gunsch <gunsch@chromium.org> | 2015-03-02 16:29:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-03 00:30:36 +0000 |
| commit | 60492b548ef6897223b22233a7fd28c05c71322c (patch) | |
| tree | dbb4f662216e7e573042d24c180dd25d21fdce95 /chromecast | |
| parent | f6629637feb3bbf186de75da8fe4028a5244389f (diff) | |
| download | chromium_src-60492b548ef6897223b22233a7fd28c05c71322c.zip chromium_src-60492b548ef6897223b22233a7fd28c05c71322c.tar.gz chromium_src-60492b548ef6897223b22233a7fd28c05c71322c.tar.bz2 | |
Chromecast buildfix: CMA renderer has new Initialize interface.
See: https://codereview.chromium.org/935243002
R=erickung@chromium.org,lcwu@chromium.org
BUG=None
Review URL: https://codereview.chromium.org/976473002
Cr-Commit-Position: refs/heads/master@{#318809}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/cma/filters/cma_renderer.cc | 6 | ||||
| -rw-r--r-- | chromecast/media/cma/filters/cma_renderer.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chromecast/media/cma/filters/cma_renderer.cc b/chromecast/media/cma/filters/cma_renderer.cc index 799dd61..a8a46f5 100644 --- a/chromecast/media/cma/filters/cma_renderer.cc +++ b/chromecast/media/cma/filters/cma_renderer.cc @@ -75,7 +75,8 @@ void CmaRenderer::Initialize( const ::media::BufferingStateCB& buffering_state_cb, const PaintCB& paint_cb, const base::Closure& ended_cb, - const ::media::PipelineStatusCB& error_cb) { + const ::media::PipelineStatusCB& error_cb, + const base::Closure& waiting_for_decryption_key_cb) { CMALOG(kLogControl) << __FUNCTION__; DCHECK(thread_checker_.CalledOnValidThread()); DCHECK_EQ(state_, kUninitialized) << state_; @@ -84,6 +85,7 @@ void CmaRenderer::Initialize( DCHECK(!ended_cb.is_null()); DCHECK(!error_cb.is_null()); DCHECK(!buffering_state_cb.is_null()); + DCHECK(!waiting_for_decryption_key_cb.is_null()); DCHECK(demuxer_stream_provider->GetStream(::media::DemuxerStream::AUDIO) || demuxer_stream_provider->GetStream(::media::DemuxerStream::VIDEO)); @@ -95,6 +97,8 @@ void CmaRenderer::Initialize( paint_cb_ = paint_cb; ended_cb_ = ended_cb; error_cb_ = error_cb; + // TODO(erickung): wire up waiting_for_decryption_key_cb. + waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb; MediaPipelineClient media_pipeline_client; media_pipeline_client.error_cb = error_cb_; diff --git a/chromecast/media/cma/filters/cma_renderer.h b/chromecast/media/cma/filters/cma_renderer.h index 33fc2b1..62efd7c 100644 --- a/chromecast/media/cma/filters/cma_renderer.h +++ b/chromecast/media/cma/filters/cma_renderer.h @@ -45,7 +45,8 @@ class CmaRenderer : public ::media::Renderer { const ::media::BufferingStateCB& buffering_state_cb, const PaintCB& paint_cb, const base::Closure& ended_cb, - const ::media::PipelineStatusCB& error_cb) override; + const ::media::PipelineStatusCB& error_cb, + const base::Closure& waiting_for_decryption_key_cb) override; void Flush(const base::Closure& flush_cb) override; void StartPlayingFrom(base::TimeDelta time) override; void SetPlaybackRate(float playback_rate) override; @@ -108,6 +109,7 @@ class CmaRenderer : public ::media::Renderer { ::media::PipelineStatusCB error_cb_; ::media::BufferingStateCB buffering_state_cb_; base::Closure flush_cb_; + base::Closure waiting_for_decryption_key_cb_; // Renderer state. // Used mostly for checking that transitions are correct. |