Reland: Add Stop() to AudioDecoder. (https://codereview.chromium.org/126793002/)

media/filters/audio_renderer_impl.cc

Index: media/filters/audio_renderer_impl.cc
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index 9ade30dc0dc6fdbba1dae9d7e8cbd041aee6638e..a5ce97a0c0f1a7d61890ab4ca0314d459a4c4093 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -147,8 +147,8 @@ void AudioRendererImpl::DoFlush_Locked() {
   DCHECK_EQ(state_, kPaused);
 
   if (decrypting_demuxer_stream_) {
-    decrypting_demuxer_stream_->Reset(BindToCurrentLoop(
-        base::Bind(&AudioRendererImpl::ResetDecoder, weak_this_)));
+    decrypting_demuxer_stream_->Reset(
+        base::Bind(&AudioRendererImpl::ResetDecoder, weak_this_));
     return;
   }
 
@@ -157,28 +157,29 @@ void AudioRendererImpl::DoFlush_Locked() {
 
 void AudioRendererImpl::ResetDecoder() {
   DCHECK(task_runner_->BelongsToCurrentThread());
-  decoder_->Reset(BindToCurrentLoop(
-      base::Bind(&AudioRendererImpl::ResetDecoderDone, weak_this_)));
+  decoder_->Reset(base::Bind(&AudioRendererImpl::ResetDecoderDone, weak_this_));
 }
 
 void AudioRendererImpl::ResetDecoderDone() {
-  base::AutoLock auto_lock(lock_);
-  if (state_ == kStopped)
-    return;
-
-  DCHECK_EQ(state_, kPaused);
-  DCHECK(!flush_cb_.is_null());
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  {
+    base::AutoLock auto_lock(lock_);
+    if (state_ == kStopped)
+      return;
 
-  audio_time_buffered_ = kNoTimestamp();
-  current_time_ = kNoTimestamp();
-  received_end_of_stream_ = false;
-  rendered_end_of_stream_ = false;
-  preroll_aborted_ = false;
+    DCHECK_EQ(state_, kPaused);
+    DCHECK(!flush_cb_.is_null());
 
-  earliest_end_time_ = now_cb_.Run();
-  splicer_->Reset();
-  algorithm_->FlushBuffers();
+    audio_time_buffered_ = kNoTimestamp();
+    current_time_ = kNoTimestamp();
+    received_end_of_stream_ = false;
+    rendered_end_of_stream_ = false;
+    preroll_aborted_ = false;
 
+    earliest_end_time_ = now_cb_.Run();
+    splicer_->Reset();
+    algorithm_->FlushBuffers();
+  }
   base::ResetAndReturn(&flush_cb_).Run();
 }
 
@@ -194,16 +195,29 @@ void AudioRendererImpl::Stop(const base::Closure& callback) {
     sink_ = NULL;
   }
 
+  if (state_ == kInitializing) {
+    decoder_selector_->Abort();
+    callback.Run();

[DaleCurtis, 2014/01/22 00:27:46]

Instead of running this here, I believe you need to have it run during
OnDecoderSelected(); otherwise the callback will be executed before init_cb.  

[xhwang, 2014/01/22 03:53:54]

Agree with Dale on this. Also, usually we should post the callback instead of
directly running it.

[rileya (GONE FROM CHROMIUM), 2014/01/22 17:35:28]

Done.

[DaleCurtis, 2014/01/22 18:43:26]

FYI, VideoRendererImpl is not posting a task for these same calls.  Probably a
bug which can be fixed in another CL.

+    return;
+  }
+
   {
     base::AutoLock auto_lock(lock_);
+    if (state_ == kStopped)
+      return;
+
     ChangeState_Locked(kStopped);
-    algorithm_.reset(NULL);
-    init_cb_.Reset();
+    algorithm_.reset();
     underflow_cb_.Reset();
     time_cb_.Reset();
     flush_cb_.Reset();
   }
 
+  if (decoder_) {
+    decoder_->Stop(callback);
+    return;
+  }
+
   callback.Run();

[xhwang, 2014/01/22 03:53:54]

ditto, post callback instead of directly firing it.

[rileya (GONE FROM CHROMIUM), 2014/01/22 17:35:28]

And done.

[DaleCurtis, 2014/01/22 18:43:26]

Ditto.

 }
 
@@ -245,6 +259,8 @@ void AudioRendererImpl::Initialize(DemuxerStream* stream,
   DCHECK_EQ(kUninitialized, state_);
   DCHECK(sink_);
 
+  state_ = kInitializing;
+
   weak_this_ = weak_factory_.GetWeakPtr();
   init_cb_ = init_cb;
   statistics_cb_ = statistics_cb;
@@ -270,10 +286,13 @@ void AudioRendererImpl::OnDecoderSelected(
 
   if (state_ == kStopped) {
     DCHECK(!sink_);
+    ChangeState_Locked(kUninitialized);
+    base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT);
     return;
   }
 
   if (!decoder) {
+    ChangeState_Locked(kUninitialized);
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     return;
   }
@@ -426,6 +445,7 @@ bool AudioRendererImpl::HandleSplicerBuffer(
 
   switch (state_) {
     case kUninitialized:
+    case kInitializing:
     case kFlushing:
       NOTREACHED();
       return false;
@@ -478,6 +498,7 @@ bool AudioRendererImpl::CanRead_Locked() {
 
   switch (state_) {
     case kUninitialized:
+    case kInitializing:
     case kPaused:
     case kFlushing:
     case kStopped:
@@ -667,6 +688,7 @@ void AudioRendererImpl::HandleAbortedReadOrDecodeError(bool is_decode_error) {
   PipelineStatus status = is_decode_error ? PIPELINE_ERROR_DECODE : PIPELINE_OK;
   switch (state_) {
     case kUninitialized:
+    case kInitializing:
       NOTREACHED();
       return;
     case kPaused: