Rename AudioRenderer::Play/Pause() to Start/StopRendering().

media/base/pipeline.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 403 matching lines @@
 
     case kStarting:
       return DoPlay(done_cb);
 
     case kStarted:
       {
         base::AutoLock l(lock_);
         // We use audio stream to update the clock. So if there is such a
         // stream, we pause the clock until we receive a valid timestamp.
         waiting_for_clock_update_ = true;
-        if (!audio_renderer_) {
+        if (audio_renderer_) {
+          audio_renderer_->StartRendering();
+        } else {
           clock_->SetMaxTime(clock_->Duration());
           StartClockIfWaitingForTimeUpdate_Locked();
         }
       }
 
       DCHECK(!seek_cb_.is_null());
       DCHECK_EQ(status_, PIPELINE_OK);
 
       // Fire canplaythrough immediately after playback begins because of
       // crbug.com/106480.
@@ skipping 40 matching lines @@
 }
 
 void Pipeline::DoSeek(
     base::TimeDelta seek_timestamp,
     const PipelineStatusCB& done_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!pending_callbacks_.get());
   SerialRunner::Queue bound_fns;
 
   // Pause.
-  if (audio_renderer_) {
-    bound_fns.Push(base::Bind(
-        &AudioRenderer::Pause, base::Unretained(audio_renderer_.get())));
-  }
   if (text_renderer_) {
     bound_fns.Push(base::Bind(
         &TextRenderer::Pause, base::Unretained(text_renderer_.get())));
   }
 
   // Flush.
   if (audio_renderer_) {
     bound_fns.Push(base::Bind(
         &AudioRenderer::Flush, base::Unretained(audio_renderer_.get())));
   }
@@ skipping 27 matching lines @@
 }
 
 void Pipeline::DoPlay(const PipelineStatusCB& done_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!pending_callbacks_.get());
   SerialRunner::Queue bound_fns;
 
   PlaybackRateChangedTask(GetPlaybackRate());
   VolumeChangedTask(GetVolume());
 
-  if (audio_renderer_) {
-    bound_fns.Push(base::Bind(
-        &AudioRenderer::Play, base::Unretained(audio_renderer_.get())));
-  }
-
   if (video_renderer_) {
     bound_fns.Push(base::Bind(
         &VideoRenderer::Play, base::Unretained(video_renderer_.get())));
   }
 
   if (text_renderer_) {
     bound_fns.Push(base::Bind(
         &TextRenderer::Play, base::Unretained(text_renderer_.get())));
   }
 
@@ skipping 200 matching lines @@
 
   SetState(kSeeking);
   base::TimeDelta seek_timestamp = std::max(time, demuxer_->GetStartTime());
   seek_cb_ = seek_cb;
   audio_ended_ = false;
   video_ended_ = false;
   text_ended_ = false;
 
   // Kick off seeking!
   {
+    if (audio_renderer_)
+      audio_renderer_->StopRendering();
+
     base::AutoLock auto_lock(lock_);
     if (clock_->IsPlaying())
       clock_->Pause();
     clock_->SetTime(seek_timestamp, seek_timestamp);
   }
   DoSeek(seek_timestamp, base::Bind(
       &Pipeline::OnStateTransition, base::Unretained(this)));
 }
 
 void Pipeline::DoAudioRendererEnded() {
@@ skipping 127 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (!waiting_for_clock_update_)
     return;
 
   waiting_for_clock_update_ = false;
   clock_->Play();
 }
 
 }  // namespace media