Fix ChunkDemuxer so it properly outputs buffered ranges.

webkit/media/webmediaplayer_impl.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 "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 73 matching lines @@
 
 #define COMPILE_ASSERT_MATCHING_ENUM(name)                              \
   COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayer::CORSMode ## name) == \
                  static_cast<int>(BufferedResourceLoader::k ## name),   \
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(Unspecified);
 COMPILE_ASSERT_MATCHING_ENUM(Anonymous);
 COMPILE_ASSERT_MATCHING_ENUM(UseCredentials);
 #undef COMPILE_ASSERT_MATCHING_ENUM
 
+static WebKit::WebTimeRanges ConvertToWebTimeRanges(
+    const media::Ranges<base::TimeDelta>& ranges) {
+  WebKit::WebTimeRanges result(ranges.size());
+  for (size_t i = 0; i < ranges.size(); i++) {
+    result[i].start = ranges.start(i).InSecondsF();
+    result[i].end = ranges.end(i).InSecondsF();
+  }
+  return result;
+}
+
 WebMediaPlayerImpl::WebMediaPlayerImpl(
     WebKit::WebFrame* frame,
     WebKit::WebMediaPlayerClient* client,
     base::WeakPtr<WebMediaPlayerDelegate> delegate,
     media::FilterCollection* collection,
     WebKit::WebAudioSourceProvider* audio_source_provider,
     media::MessageLoopFactory* message_loop_factory,
     MediaStreamClient* media_stream_client,
     media::MediaLog* media_log)
     : frame_(frame),
@@ skipping 360 matching lines @@
   return network_state_;
 }
 
 WebMediaPlayer::ReadyState WebMediaPlayerImpl::readyState() const {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   return ready_state_;
 }
 
 const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
-  media::Ranges<base::TimeDelta> buffered_time_ranges =
-      pipeline_->GetBufferedTimeRanges();
-  WebKit::WebTimeRanges web_ranges(buffered_time_ranges.size());
-  for (size_t i = 0; i < buffered_time_ranges.size(); ++i) {
-    web_ranges[i].start = buffered_time_ranges.start(i).InSecondsF();
-    web_ranges[i].end = buffered_time_ranges.end(i).InSecondsF();
-  }
+  WebKit::WebTimeRanges web_ranges(
+      ConvertToWebTimeRanges(pipeline_->GetBufferedTimeRanges()));
   buffered_.swap(web_ranges);
   return buffered_;
 }
 
 float WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   // We don't support seeking in streaming media.
   if (proxy_ && proxy_->data_source() && proxy_->data_source()->IsStreaming())
     return 0.0f;
@@ skipping 158 matching lines @@
 }
 
 bool WebMediaPlayerImpl::sourceRemoveId(const WebKit::WebString& id) {
   DCHECK(!id.isEmpty());
   proxy_->DemuxerRemoveId(id.utf8().data());
   return true;
 }
 
 WebKit::WebTimeRanges WebMediaPlayerImpl::sourceBuffered(
     const WebKit::WebString& id) {
-  media::ChunkDemuxer::Ranges buffered_ranges;
-  if (!proxy_->DemuxerBufferedRange(id.utf8().data(), &buffered_ranges))
-    return WebKit::WebTimeRanges();
-
-  WebKit::WebTimeRanges ranges(buffered_ranges.size());
-  for (size_t i = 0; i < buffered_ranges.size(); i++) {
-    ranges[i].start = buffered_ranges[i].first.InSecondsF();
-    ranges[i].end = buffered_ranges[i].second.InSecondsF();
-  }
-  return ranges;
+  return ConvertToWebTimeRanges(proxy_->DemuxerBufferedRange(id.utf8().data()));
 }
 
 bool WebMediaPlayerImpl::sourceAppend(const unsigned char* data,
                                       unsigned length) {
   return sourceAppend(WebKit::WebString::fromUTF8("DefaultSourceId"),
                       data, length);
 }
 
 bool WebMediaPlayerImpl::sourceAppend(const WebKit::WebString& id,
                                       const unsigned char* data,
@@ skipping 342 matching lines @@
   return audio_source_provider_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media