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

Unified Diff: media/base/pipeline.cc

Issue 827013005: Avoid double task trampoline for Pipeline state transitions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 5 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/base/pipeline.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline.cc
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index 9ce867d8ac6fa45c33c60be1c9647123e0cbd699..e8fa6c770edd52460335a721b86d8991c90bdb26 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -303,15 +303,6 @@ void Pipeline::SetDuration(TimeDelta duration) {
duration_change_cb_.Run();
}
-void Pipeline::OnStateTransition(PipelineStatus status) {
- DCHECK(task_runner_->BelongsToCurrentThread());
- // Force post to process state transitions after current execution frame.
- task_runner_->PostTask(
- FROM_HERE,
- base::Bind(
- &Pipeline::StateTransitionTask, weak_factory_.GetWeakPtr(), status));
-}
-
void Pipeline::StateTransitionTask(PipelineStatus status) {
DCHECK(task_runner_->BelongsToCurrentThread());
@@ -335,7 +326,7 @@ void Pipeline::StateTransitionTask(PipelineStatus status) {
pending_callbacks_.reset();
PipelineStatusCB done_cb =
- base::Bind(&Pipeline::OnStateTransition, weak_factory_.GetWeakPtr());
+ base::Bind(&Pipeline::StateTransitionTask, weak_factory_.GetWeakPtr());
// Switch states, performing any entrance actions for the new state as well.
SetState(GetNextState());
@@ -609,8 +600,8 @@ void Pipeline::SeekTask(TimeDelta time, const PipelineStatusCB& seek_cb) {
text_renderer_ended_ = false;
start_timestamp_ = seek_timestamp;
- DoSeek(seek_timestamp,
- base::Bind(&Pipeline::OnStateTransition, weak_factory_.GetWeakPtr()));
+ DoSeek(seek_timestamp, base::Bind(&Pipeline::StateTransitionTask,
+ weak_factory_.GetWeakPtr()));
}
void Pipeline::SetCdmTask(CdmContext* cdm_context,
« no previous file with comments | « media/base/pipeline.h ('k') | media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698