media/filters/decrypting_audio_decoder.cc - Issue 339653003: No EOS frame in {Audio|Video}Decoder::OutputCB.

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

Issue 339653003: No EOS frame in {Audio|Video}Decoder::OutputCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase only 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_audio_decoder.cc

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

index bd4975302b47d35c3bdb9486691c7b21f01ecdfd..136e171d7383c5f6ed4ef5f31bd63991062b8772 100644

--- a/media/filters/decrypting_audio_decoder.cc

+++ b/media/filters/decrypting_audio_decoder.cc

@@ -294,12 +294,8 @@ void DecryptingAudioDecoder::DeliverFrame(

if (status == Decryptor::kNeedMoreData) {

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

- if (scoped_pending_buffer_to_decode->end_of_stream()) {

- state_ = kDecodeFinished;

- output_cb_.Run(AudioBuffer::CreateEOSBuffer());

- } else {

- state_ = kIdle;

- }

+ state_ = scoped_pending_buffer_to_decode->end_of_stream() ? kDecodeFinished

+ : kIdle;

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

return;

}