Fix buffered range reporting for ChunkDemuxer

media/filters/chunk_demuxer.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 "media/filters/chunk_demuxer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
@@ skipping 705 matching lines @@
         DVLOG(1) << "AppendData(): called in unexpected state " << state_;
         return false;
     }
 
     // Check to see if data was appended at the pending seek point. This
     // indicates we have parsed enough data to complete the seek.
     if (old_seek_pending && !IsSeekPending_Locked() && !seek_cb_.is_null()) {
       std::swap(cb, seek_cb_);
     }
 
-    if (duration_ > TimeDelta() && duration_ != kInfiniteDuration()) {

[Ami GONE FROM CHROMIUM, 2012/07/10 23:11:12]

Do you want to DCHECK these during init?

[acolwell GONE FROM CHROMIUM, 2012/07/10 23:19:30]

No. These were just here for the old byte range code so we didn't divide by
something insane.

-      if (audio_ && !video_) {
-        ranges = audio_->GetBufferedRanges();
-      } else if (!audio_ && video_) {
-        ranges = video_->GetBufferedRanges();
-      } else {
-        ranges = ComputeIntersection();
-      }
+    if (audio_ && !video_) {
+      ranges = audio_->GetBufferedRanges();
+    } else if (!audio_ && video_) {
+      ranges = video_->GetBufferedRanges();
+    } else {
+      ranges = ComputeIntersection();
     }
   }
 
   for (size_t i = 0; i < ranges.size(); ++i)
     host_->AddBufferedTimeRange(ranges.start(i), ranges.end(i));
 
   if (!cb.is_null())
     cb.Run(PIPELINE_OK);
 
   return true;
@@ skipping 236 matching lines @@
   // TODO(vrk): There should be a special case for the first appends where all
   // streams (for both demuxed and muxed case) begin at the earliest stream
   // timestamp. (crbug.com/132815)
   if (audio_ && source_id == source_id_audio_)
     audio_->OnNewMediaSegment(start_timestamp);
   if (video_ && source_id == source_id_video_)
     video_->OnNewMediaSegment(start_timestamp);
 }
 
 }  // namespace media