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

Unified Diff: chromecast/media/cma/filters/cma_renderer.cc

Issue 976473002: Chromecast buildfix: CMA renderer has new Initialize interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromecast/media/cma/filters/cma_renderer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/cma/filters/cma_renderer.cc
diff --git a/chromecast/media/cma/filters/cma_renderer.cc b/chromecast/media/cma/filters/cma_renderer.cc
index 799dd618c9b549e650c3046dd7d0fa10a5fb4012..a8a46f5d2646e7da562215fd6ae9f8c0be145a70 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_;
« no previous file with comments | « chromecast/media/cma/filters/cma_renderer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698