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

Unified Diff: media/filters/pipeline_controller.cc

Issue 2618883002: [Media, Video] Enable the video track for a new renderer. (Closed)
Patch Set: Fixed debug tests Created 3 years, 11 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/filters/pipeline_controller.h ('k') | media/filters/pipeline_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_controller.cc
diff --git a/media/filters/pipeline_controller.cc b/media/filters/pipeline_controller.cc
index 2055afb9dc08cdd3a3879434301051a1b84167c8..e999d92ab39073a3b28fd0fcdd4ecb3f186f5659 100644
--- a/media/filters/pipeline_controller.cc
+++ b/media/filters/pipeline_controller.cc
@@ -14,17 +14,23 @@ PipelineController::PipelineController(
const RendererFactoryCB& renderer_factory_cb,
const SeekedCB& seeked_cb,
const SuspendedCB& suspended_cb,
+ const BeforeResumeCB& before_resume_cb,
+ const ResumedCB& resumed_cb,
const PipelineStatusCB& error_cb)
: pipeline_(pipeline),
renderer_factory_cb_(renderer_factory_cb),
seeked_cb_(seeked_cb),
suspended_cb_(suspended_cb),
+ before_resume_cb_(before_resume_cb),
+ resumed_cb_(resumed_cb),
error_cb_(error_cb),
weak_factory_(this) {
DCHECK(pipeline_);
DCHECK(!renderer_factory_cb_.is_null());
DCHECK(!seeked_cb_.is_null());
DCHECK(!suspended_cb_.is_null());
+ DCHECK(!before_resume_cb_.is_null());
+ DCHECK(!resumed_cb_.is_null());
DCHECK(!error_cb_.is_null());
}
@@ -123,12 +129,18 @@ void PipelineController::OnPipelineStatus(State state,
return;
}
+ State old_state = state_;
state_ = state;
if (state == State::PLAYING) {
// Start(), Seek(), or Resume() completed; we can be sure that
// |demuxer_| got the seek it was waiting for.
waiting_for_seek_ = false;
+
+ // TODO(avayvod): Remove resumed callback after https://crbug.com/678374 is
+ // properly fixed.
+ if (old_state == State::RESUMING)
+ resumed_cb_.Run();
} else if (state == State::SUSPENDED) {
// Warning: possibly reentrant. The state may change inside this callback.
// It must be safe to call Dispatch() twice in a row here.
@@ -180,6 +192,7 @@ void PipelineController::Dispatch() {
pending_resume_ = false;
state_ = State::RESUMING;
+ before_resume_cb_.Run();
pipeline_->Resume(renderer_factory_cb_.Run(), seek_time_,
base::Bind(&PipelineController::OnPipelineStatus,
weak_factory_.GetWeakPtr(), State::PLAYING));
« no previous file with comments | « media/filters/pipeline_controller.h ('k') | media/filters/pipeline_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698