Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(355)

Unified Diff: media/filters/ffmpeg_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: 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:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index b7e5459df0dc6511945c6df3e3b34ac25cb0a8b8..0601cb3e981cb679e7f72c26ec121d8f560da24e 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -265,10 +265,8 @@ void FFmpegAudioDecoder::DecodeBuffer(
return;
}
- if (buffer->end_of_stream()) {
+ if (buffer->end_of_stream())
state_ = kDecodeFinished;
- output_cb_.Run(AudioBuffer::CreateEOSBuffer());
- }
decode_cb.Run(kOk);
}
@@ -357,7 +355,6 @@ bool FFmpegAudioDecoder::FFmpegDecode(
const int decoded_frames = frame_decoded ? output->frame_count() : 0;
if (IsEndOfStream(result, decoded_frames, buffer)) {
DCHECK_EQ(packet.size, 0);
- output_cb_.Run(AudioBuffer::CreateEOSBuffer());
} else if (discard_helper_->ProcessBuffers(buffer, output)) {
output_cb_.Run(output);
}

Powered by Google App Engine
This is Rietveld 408576698