media/filters/decoder_stream.cc - Issue 2543623003: media: Allow config change between clear and encrypted streams

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 2543623003: media: Allow config change between clear and encrypted streams (Closed)

Patch Set: media: Allow config change between clear and encrypted streams Created 3 years, 11 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 a177c67935e3f1e62293009bb8be4fcdfc710ea9..db424e3ab91e41dd2a33b59c7e28e9e814195a23 100644

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

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

@@ -205,7 +205,8 @@ void DecoderStream<StreamType>::Reset(const base::Closure& closure) {

template <DemuxerStream::Type StreamType>

bool DecoderStream<StreamType>::CanReadWithoutStalling() const {

DCHECK(task_runner_->BelongsToCurrentThread());

- return !ready_outputs_.empty() || decoder_->CanReadWithoutStalling();

+ return !ready_outputs_.empty() ||

+ (decoder_ && decoder_->CanReadWithoutStalling());

}

template <>