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

Unified Diff: media/filters/decoder_stream.cc

Issue 1918693003: Fix EOS reached before decoder fallback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/base/fake_demuxer_stream.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index 0783b465f0ce94b32076cc635469abb6612fbfdd..e8f590cf9627c66222c27f9de13f220b593c9e07 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -210,12 +210,14 @@ template <DemuxerStream::Type StreamType>
bool DecoderStream<StreamType>::CanDecodeMore() const {
DCHECK(task_runner_->BelongsToCurrentThread());
+ bool buffers_left = !(fallback_buffers_.empty() && decoding_eos_);
+
// Limit total number of outputs stored in |ready_outputs_| and being decoded.
// It only makes sense to saturate decoder completely when output queue is
// empty.
int num_decodes =
static_cast<int>(ready_outputs_.size()) + pending_decode_requests_;
- return !decoding_eos_ && num_decodes < GetMaxDecodeRequests();
+ return buffers_left && num_decodes < GetMaxDecodeRequests();
}
template <DemuxerStream::Type StreamType>
« no previous file with comments | « media/base/fake_demuxer_stream.cc ('k') | media/filters/video_frame_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698