media/filters/decoder_stream.cc - Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor.

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_stream.cc

Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only Created 6 years, 5 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_stream.cc

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

index 8a17c593edc62053483943d4f573c898852c65aa..f8714f25fa0cd1ffd21598f8229259db353b0050 100644

--- a/media/filters/decoder_stream.cc

+++ b/media/filters/decoder_stream.cc

@@ -189,13 +189,12 @@ void DecoderStream<StreamType>::Stop(const base::Closure& closure) {

if (decrypting_demuxer_stream_)

decrypting_demuxer_stream_->Stop();

- if (decoder_)

- decoder_->Stop();

- state_ = STATE_STOPPED;

stream_ = NULL;

decoder_.reset();

decrypting_demuxer_stream_.reset();

+ state_ = STATE_STOPPED;

task_runner_->PostTask(FROM_HERE, closure);

}

« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decrypting_audio_decoder.h » ('j') | no next file with comments »