Stop DecryptingDemuxerStream in AudioRendererImpl::Stop().

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 52258426ee1ed3cb6559f9a6a3666e8e3e693a3b..d5aecffa41a6cd4f3c74ee7f7d38c93a3d0fd436 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -216,14 +216,26 @@ void AudioRendererImpl::Stop(const base::Closure& callback) {
     sink_ = NULL;
   }
 
+  if (decrypting_demuxer_stream_) {
+    DCHECK(decoder_);
+    decrypting_demuxer_stream_->Stop(
+        base::Bind(&AudioRendererImpl::StopDecoder, weak_this_));
+    return;
+  }
+
   if (decoder_) {

[ddorwin, 2014/02/14 04:30:51]

I wonder if it makes sense to just call StopDecoder() in all cases then have it
check decoder_ and always ensures stop_cb_ is called. It would be a chain of
steps that are always executed instead of a bunch of branches, which could get
even more complex if another one was added.

It seems it would make things easier to understand (vs. we must have a decoder_
above so we can call StopDecoder, which is going to call stop_cb_. Just a
thought.

[xhwang, 2014/02/14 18:48:06]

Done.

-    decoder_->Stop(base::ResetAndReturn(&stop_cb_));
+    StopDecoder();
     return;
   }
 
   task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&stop_cb_));
 }
 
+void AudioRendererImpl::StopDecoder() {
+  DCHECK(!stop_cb_.is_null());
+  decoder_->Stop(base::ResetAndReturn(&stop_cb_));
+}
+
 void AudioRendererImpl::Preroll(base::TimeDelta time,
                                 const PipelineStatusCB& cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());