Fix ChunkDemuxer so it properly outputs buffered ranges.

media/filters/chunk_demuxer_unittest.cc

 // 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.
 
 #include "base/bind.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_demuxer_host.h"
 #include "media/base/test_data_util.h"
@@ skipping 237 matching lines @@
     const uint8* start = data;
     const uint8* end = data + length;
     while (start < end) {
       int64 old_buffered_bytes = buffered_bytes_;
       size_t append_size = std::min(piece_size,
                                     static_cast<size_t>(end - start));
       if (!AppendData(start, append_size))
         return false;
       start += append_size;
 
-      EXPECT_GT(buffered_bytes_, old_buffered_bytes);
+      EXPECT_GE(buffered_bytes_, old_buffered_bytes);

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

Why the change?  Rounding?

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

Some of the appends are smaller than an actual frame so buffered_bytes_ doesn't
change because the time ranges don't change.

     }
     return true;
   }
 
   bool AppendInitSegment(bool has_audio, bool has_video,
                          bool video_content_encoded) {
     return AppendInitSegment(kSourceId, has_audio, has_video,
                              video_content_encoded);
   }
 
   bool AppendInitSegment(const std::string& source_id,
                          bool has_audio, bool has_video,
                          bool video_content_encoded) {
     scoped_array<uint8> info_tracks;
     int info_tracks_size = 0;
     CreateInitSegment(has_audio, has_video, video_content_encoded,
                       &info_tracks, &info_tracks_size);
     return AppendData(source_id, info_tracks.get(), info_tracks_size);
   }
 
   void InitDoneCalled(PipelineStatus expected_status,
                       PipelineStatus status) {
     EXPECT_EQ(status, expected_status);
   }
 
   PipelineStatusCB CreateInitDoneCB(const base::TimeDelta& expected_duration,
                                     PipelineStatus expected_status) {
-    if (expected_status == PIPELINE_OK)
+    if (expected_status == PIPELINE_OK) {
+      if (expected_duration != kInfiniteDuration())
+        EXPECT_CALL(host_, SetTotalBytes(_));
       EXPECT_CALL(host_, SetDuration(expected_duration));
+    }
 
     return base::Bind(&ChunkDemuxerTest::InitDoneCalled,
                       base::Unretained(this),
                       expected_status);
   }
 
   bool InitDemuxer(bool has_audio, bool has_video,
                    bool video_content_encoded) {
     PipelineStatus expected_status =
         (has_audio || has_video) ? PIPELINE_OK : DEMUXER_ERROR_COULD_NOT_OPEN;
@@ skipping 1318 matching lines @@
                  NewExpectedStatusCB(PIPELINE_OK));
 
   // Generate a cluster to fulfill this seek, where audio timecode begins 25ms
   // after the video.
   scoped_ptr<Cluster> middle_cluster(GenerateCluster(5025, 5000, 8));
   ASSERT_TRUE(AppendData(middle_cluster->data(), middle_cluster->size()));
   GenerateExpectedReads(5025, 5000, 8, audio, video);
 }
 
 }  // namespace media