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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 10704142: Merge 143765 - Ensure media's buffered ranges always have a range that includes currentTime. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1180/src/
Patch Set: Created 8 years, 5 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/ranges.h ('k') | media/filters/dummy_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
===================================================================
--- media/filters/chunk_demuxer.cc (revision 145962)
+++ media/filters/chunk_demuxer.cc (working copy)
@@ -139,6 +139,9 @@
class ChunkDemuxerStream : public DemuxerStream {
public:
+ // Only present in 1180 branch to fix compile breakage; stubbed out.
+ virtual Ranges<base::TimeDelta> GetBufferedRanges() OVERRIDE;
+
typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
typedef std::deque<ReadCB> ReadCBQueue;
typedef std::deque<base::Closure> ClosureQueue;
@@ -217,6 +220,10 @@
DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
};
+Ranges<base::TimeDelta> ChunkDemuxerStream::GetBufferedRanges() {
+ return Ranges<base::TimeDelta>();
+}
+
ChunkDemuxerStream::ChunkDemuxerStream(const AudioDecoderConfig& audio_config)
: type_(AUDIO),
state_(RETURNING_DATA_FOR_READS),
« no previous file with comments | « media/base/ranges.h ('k') | media/filters/dummy_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698