Fix ChunkDemuxer so it properly outputs buffered ranges.

media/filters/chunk_demuxer.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 107 matching lines @@
   bool OnAudioBuffers(const StreamParser::BufferQueue& buffers);
   bool OnVideoBuffers(const StreamParser::BufferQueue& buffers);
   bool OnKeyNeeded(scoped_array<uint8> init_data, int init_data_size);
   void OnNewMediaSegment(const std::string& source_id,
                          base::TimeDelta start_timestamp);
 
   // Helper functions for calculating GetBufferedRanges().
   bool CopyIntoRanges(
       const SourceBufferStream::TimespanList& timespans,
       Ranges* ranges_out) const;
+
+  // Computes the intersection between the video & audio
+  // buffered ranges.
+  // Returns true if the intersection was computed and stored in |ranges_out|.
+  // Returns false if no data was buffered.
+  bool ComputeIntersection(Ranges* ranges_out) const;

[Ami GONE FROM CHROMIUM, 2012/06/18 16:18:31]

I don't get why make the return value bool instead of void.
The condition currently returned as "false" is equivalent to
ranges_out->empty().
In fact, the same question arises for GetBufferedRanges() above.  Chasing its
(non-test) callers down, I think the only use is in WMPP, which in turn is only
used by WebMediaPlayerImpl::sourceBuffered(), where the return value could just
as well be ignored (and the for loop turns into a no-op).

Ditto for CopyIntoRanges().

[acolwell GONE FROM CHROMIUM, 2012/06/19 06:12:34]

Done.

+
   void AddIntersectionRange(
       SourceBufferStream::Timespan timespan_a,
       SourceBufferStream::Timespan timespan_b,
       bool last_range_after_ended,
       Ranges* ranges_out) const;
 
   mutable base::Lock lock_;
   State state_;
 
   DemuxerHost* host_;
   ChunkDemuxerClient* client_;
   PipelineStatusCB init_cb_;
   PipelineStatusCB seek_cb_;
 
   scoped_refptr<ChunkDemuxerStream> audio_;
   scoped_refptr<ChunkDemuxerStream> video_;
 
-  int64 buffered_bytes_;
-
   base::TimeDelta duration_;
 
   typedef std::map<std::string, StreamParser*> StreamParserMap;
   StreamParserMap stream_parser_map_;
 
   // Used to ensure that (1) config data matches the type and codec provided in
   // AddId(), (2) only 1 audio and 1 video sources are added, and (3) ids may be
   // removed with RemoveID() but can not be re-added (yet).
   std::string source_id_audio_;
   std::string source_id_video_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_