Stop DecryptingDemuxerStream in AudioRendererImpl::Stop().

media/filters/audio_renderer_impl.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/filters/audio_renderer_impl.h"
 
 #include <math.h>
 
 #include <algorithm>
 
@@ skipping 198 matching lines @@
     underflow_cb_.Reset();
     time_cb_.Reset();
     flush_cb_.Reset();
   }
 
   if (sink_) {
     sink_->Stop();
     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());
 
   base::AutoLock auto_lock(lock_);
   DCHECK(!sink_playing_);
   DCHECK_EQ(state_, kPaused);
   DCHECK(!pending_read_) << "Pending read must complete before seeking";
   DCHECK(preroll_cb_.is_null());
 
@@ skipping 491 matching lines @@
   }
 }
 
 void AudioRendererImpl::ChangeState_Locked(State new_state) {
   DVLOG(1) << __FUNCTION__ << " : " << state_ << " -> " << new_state;
   lock_.AssertAcquired();
   state_ = new_state;
 }
 
 }  // namespace media