media/filters/decrypting_video_decoder.cc - Issue 332253002: Fix the flushing process of DecryptingAudioDecoder.

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/decrypting_video_decoder.cc

Issue 332253002: Fix the flushing process of DecryptingAudioDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Returns EOS frame after decoder flushed. Created 6 years, 6 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/decrypting_video_decoder.cc

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

index a10d2e02a09f94dbc6731bab894bd66a1da293e2..5629e915ff1b8a8aef14dc736bdb3873936f399f 100644

--- a/media/filters/decrypting_video_decoder.cc

+++ b/media/filters/decrypting_video_decoder.cc

@@ -277,8 +277,12 @@ void DecryptingVideoDecoder::DeliverFrame(

if (status == Decryptor::kNeedMoreData) {

DVLOG(2) << "DeliverFrame() - kNeedMoreData";

- state_ = scoped_pending_buffer_to_decode->end_of_stream() ? kDecodeFinished

- : kIdle;

+ if (scoped_pending_buffer_to_decode->end_of_stream()) {

+ state_ = kDecodeFinished;

+ output_cb_.Run(media::VideoFrame::CreateEOSFrame());

+ } else {

+ state_ = kIdle;

+ }

base::ResetAndReturn(&decode_cb_).Run(kOk);

return;

}