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

Unified Diff: media/filters/audio_renderer_impl.cc

Issue 163433004: Stop DecryptingDemuxerStream in AudioRendererImpl::Stop(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/filters/audio_renderer_impl.cc
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc
index 52258426ee1ed3cb6559f9a6a3666e8e3e693a3b..a102b6e132920943dbb7901cc16130068b358dae 100644
--- a/media/filters/audio_renderer_impl.cc
+++ b/media/filters/audio_renderer_impl.cc
@@ -216,6 +216,19 @@ void AudioRendererImpl::Stop(const base::Closure& callback) {
sink_ = NULL;
}
+ if (decrypting_demuxer_stream_) {
+ decrypting_demuxer_stream_->Stop(
+ base::Bind(&AudioRendererImpl::StopDecoder, weak_this_));
+ return;
+ }
+
+ StopDecoder();
+}
+
+void AudioRendererImpl::StopDecoder() {
+ DCHECK(task_runner_->BelongsToCurrentThread());
+ DCHECK(!stop_cb_.is_null());
+
if (decoder_) {
decoder_->Stop(base::ResetAndReturn(&stop_cb_));
return;

Powered by Google App Engine
This is Rietveld 408576698