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

Unified Diff: media/filters/decrypting_video_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decrypting_video_decoder.h ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 5629e915ff1b8a8aef14dc736bdb3873936f399f..eb40625f8a3720f5a41c7aaf44f03398f5e68747 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -31,7 +31,7 @@ DecryptingVideoDecoder::DecryptingVideoDecoder(
weak_factory_(this) {}
void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
- bool /* live_mode */,
+ bool /* low_delay */,
const PipelineStatusCB& status_cb,
const OutputCB& output_cb) {
DVLOG(2) << "Initialize()";
@@ -82,7 +82,6 @@ void DecryptingVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
// Return empty frames if decoding has finished.
if (state_ == kDecodeFinished) {
- output_cb_.Run(VideoFrame::CreateEOSFrame());
base::ResetAndReturn(&decode_cb_).Run(kOk);
return;
}
@@ -277,12 +276,8 @@ void DecryptingVideoDecoder::DeliverFrame(
if (status == Decryptor::kNeedMoreData) {
DVLOG(2) << "DeliverFrame() - kNeedMoreData";
- if (scoped_pending_buffer_to_decode->end_of_stream()) {
- state_ = kDecodeFinished;
- output_cb_.Run(media::VideoFrame::CreateEOSFrame());
- } else {
- state_ = kIdle;
- }
+ state_ = scoped_pending_buffer_to_decode->end_of_stream() ? kDecodeFinished
+ : kIdle;
base::ResetAndReturn(&decode_cb_).Run(kOk);
return;
}
« no previous file with comments | « media/filters/decrypting_video_decoder.h ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698