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

Unified Diff: media/base/pipeline.cc

Issue 526653002: Replace init_cb in Renderer::Initialize() with base::Closure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 3 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
Index: media/base/pipeline.cc
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index 486bfaba1a370847d3f221121162791217983ab9..02f30a95d14802a0722f564afd30fb2026a547ee 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -337,7 +337,7 @@ void Pipeline::StateTransitionTask(PipelineStatus status) {
return InitializeDemuxer(done_cb);
case kInitRenderer:
- return InitializeRenderer(done_cb);
+ return InitializeRenderer(base::Bind(done_cb, PIPELINE_OK));
case kPlaying:
// Report metadata the first time we enter the playing state.
@@ -665,14 +665,13 @@ void Pipeline::InitializeDemuxer(const PipelineStatusCB& done_cb) {
demuxer_->Initialize(this, done_cb, text_renderer_);
}
-void Pipeline::InitializeRenderer(const PipelineStatusCB& done_cb) {
+void Pipeline::InitializeRenderer(const base::Closure& done_cb) {
DCHECK(task_runner_->BelongsToCurrentThread());
if (!demuxer_->GetStream(DemuxerStream::AUDIO) &&
!demuxer_->GetStream(DemuxerStream::VIDEO)) {
renderer_.reset();
- task_runner_->PostTask(
- FROM_HERE, base::Bind(done_cb, PIPELINE_ERROR_COULD_NOT_RENDER));
+ OnError(PIPELINE_ERROR_COULD_NOT_RENDER);
return;
}
« no previous file with comments | « media/base/pipeline.h ('k') | media/base/pipeline_unittest.cc » ('j') | media/base/renderer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698