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

Unified Diff: media/base/pipeline.cc

Issue 403723006: Make media::AudioRenderer inherit from media::TimeSource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 e1af61130aa392b5c7d4f00cb5821a4afe861b0d..9d0a45a034bf1301be808a1c8f17fa1b8019a52b 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -447,7 +447,7 @@ void Pipeline::DoSeek(
SerialRunner::Queue bound_fns;
{
base::AutoLock auto_lock(lock_);
- PauseClockAndStopRendering_Locked();
+ PauseClockAndStopTicking_Locked();
}
// Pause.
@@ -750,7 +750,7 @@ void Pipeline::RunEndedCallbackIfNeeded() {
{
base::AutoLock auto_lock(lock_);
- PauseClockAndStopRendering_Locked();
+ PauseClockAndStopTicking_Locked();
interpolator_->SetBounds(duration_, duration_);
}
@@ -863,7 +863,7 @@ void Pipeline::PausePlayback() {
DCHECK(task_runner_->BelongsToCurrentThread());
base::AutoLock auto_lock(lock_);
- PauseClockAndStopRendering_Locked();
+ PauseClockAndStopTicking_Locked();
}
void Pipeline::StartPlayback() {
@@ -878,7 +878,7 @@ void Pipeline::StartPlayback() {
// stream, we pause the clock until we receive a valid timestamp.
base::AutoLock auto_lock(lock_);
interpolation_state_ = INTERPOLATION_WAITING_FOR_AUDIO_TIME_UPDATE;
- audio_renderer_->StartRendering();
+ audio_renderer_->StartTicking();
} else {
base::AutoLock auto_lock(lock_);
interpolation_state_ = INTERPOLATION_STARTED;
@@ -887,19 +887,19 @@ void Pipeline::StartPlayback() {
}
}
-void Pipeline::PauseClockAndStopRendering_Locked() {
+void Pipeline::PauseClockAndStopTicking_Locked() {
lock_.AssertAcquired();
switch (interpolation_state_) {
case INTERPOLATION_STOPPED:
return;
case INTERPOLATION_WAITING_FOR_AUDIO_TIME_UPDATE:
- audio_renderer_->StopRendering();
+ audio_renderer_->StopTicking();
break;
case INTERPOLATION_STARTED:
if (audio_renderer_)
- audio_renderer_->StopRendering();
+ audio_renderer_->StopTicking();
interpolator_->StopInterpolating();
break;
}

Powered by Google App Engine
This is Rietveld 408576698