Index: media/filters/ffmpeg_demuxer.cc |
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
index 7195d1fd04af137daea4b1e35c0e5deb429efff8..d329492be4808fca7491f6b9fbe49c523f48f805 100644 |
--- a/media/filters/ffmpeg_demuxer.cc |
+++ b/media/filters/ffmpeg_demuxer.cc |
@@ -779,9 +779,16 @@ |
} |
bool FFmpegDemuxerStream::HasAvailableCapacity() { |
- // Try to have two second's worth of encoded data per stream. |
- const base::TimeDelta kCapacity = base::TimeDelta::FromSeconds(2); |
+ // TODO(scherkus): Remove this return and reenable time-based capacity |
+ // after our data sources support canceling/concurrent reads, see |
+ // http://crbug.com/165762 for details. |
+#if 1 |
+ return !read_cb_.is_null(); |
+#else |
+ // Try to have one second's worth of encoded data per stream. |
+ const base::TimeDelta kCapacity = base::TimeDelta::FromSeconds(1); |
return buffer_queue_.IsEmpty() || buffer_queue_.Duration() < kCapacity; |
+#endif |
} |
size_t FFmpegDemuxerStream::MemoryUsage() const { |