media/filters/decoder_selector.cc - Issue 165733002: Add DecryptingDemuxerStream::Stop().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/decoder_selector.cc

Issue 165733002: Add DecryptingDemuxerStream::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:

Index: media/filters/decoder_selector.cc

diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc

index 8f71d56b7f173a3e7d46c7c80c1d0b70d6d695fc..d9c7ea68201cc29242473cf8565d7fc7761f1fe3 100644

--- a/media/filters/decoder_selector.cc

+++ b/media/filters/decoder_selector.cc

@@ -130,7 +130,7 @@ void DecoderSelector<StreamType>::Abort() {

}

if (decrypted_stream_) {

- decrypted_stream_->Reset(

+ decrypted_stream_->Stop(

xhwang 2014/02/14 01:33:19 DecoderSelector is new in M34. So I need to do a m

base::Bind(&DecoderSelector<StreamType>::ReturnNullDecoder,

weak_ptr_factory_.GetWeakPtr()));

return;