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

Unified Diff: media/mojo/services/mojo_renderer_impl.cc

Issue 591203003: media: Pass DemuxerStreamProvider in Renderer::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 2 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 | « media/mojo/services/mojo_renderer_impl.h ('k') | media/mojo/services/renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_renderer_impl.cc
diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc
index d905b2c0eb7c1c3b4adeb7aa0d899b194a6d3b4a..1ecd93b2a7ea3ff478b13c02df8ed65e90cfa3fe 100644
--- a/media/mojo/services/mojo_renderer_impl.cc
+++ b/media/mojo/services/mojo_renderer_impl.cc
@@ -17,10 +17,8 @@ namespace media {
MojoRendererImpl::MojoRendererImpl(
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
- DemuxerStreamProvider* demuxer_stream_provider,
mojo::ServiceProvider* audio_renderer_provider)
: task_runner_(task_runner),
- demuxer_stream_provider_(demuxer_stream_provider),
weak_factory_(this) {
// For now we only support audio and there must be a provider.
DCHECK(audio_renderer_provider);
@@ -33,12 +31,17 @@ MojoRendererImpl::~MojoRendererImpl() {
// Connection to |remote_audio_renderer_| will error-out here.
}
-void MojoRendererImpl::Initialize(const base::Closure& init_cb,
- const StatisticsCB& statistics_cb,
- const base::Closure& ended_cb,
- const PipelineStatusCB& error_cb,
- const BufferingStateCB& buffering_state_cb) {
+void MojoRendererImpl::Initialize(
+ DemuxerStreamProvider* demuxer_stream_provider,
+ const base::Closure& init_cb,
+ const StatisticsCB& statistics_cb,
+ const base::Closure& ended_cb,
+ const PipelineStatusCB& error_cb,
+ const BufferingStateCB& buffering_state_cb) {
DCHECK(task_runner_->BelongsToCurrentThread());
+ DCHECK(demuxer_stream_provider);
+
+ demuxer_stream_provider_ = demuxer_stream_provider;
init_cb_ = init_cb;
ended_cb_ = ended_cb;
error_cb_ = error_cb;
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.h ('k') | media/mojo/services/renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698