Fix MultibufferDataSource::GetSize

media/blink/resource_multibuffer_data_provider.cc

 // Copyright 2015 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/blink/resource_multibuffer_data_provider.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 54 matching lines @@
   DCHECK_GE(pos, 0);
 }
 
 void ResourceMultiBufferDataProvider::Start() {
   // Prepare the request.
   WebURLRequest request(url_data_->url());
   // TODO(mkwst): Split this into video/audio.
   request.setRequestContext(WebURLRequest::RequestContextVideo);
 
   DVLOG(1) << __FUNCTION__ << " @ " << byte_pos();
-  if (url_data_->length() > 0) {
-    DCHECK_LT(byte_pos(), url_data_->length()) << " " << url_data_->url();
+  if (url_data_->length() > 0 && byte_pos() >= url_data_->length()) {
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::Bind(&ResourceMultiBufferDataProvider::Terminate,
+                              weak_factory_.GetWeakPtr()));
+    return;
   }
 
   request.setHTTPHeaderField(
       WebString::fromUTF8(net::HttpRequestHeaders::kRange),
       WebString::fromUTF8(
           net::HttpByteRange::RightUnbounded(byte_pos()).GetHeaderValue()));
 
   url_data_->frame()->setReferrerForRequest(request, blink::WebURL());
 
   // Disable compression, compression for audio/video doesn't make sense...
@@ skipping 309 matching lines @@
     int64_t total_encoded_data_length) {
   DVLOG(1) << "didFinishLoading";
   DCHECK(active_loader_.get());
   DCHECK(!Available());
 
   // We're done with the loader.
   active_loader_.reset();
 
   // If we didn't know the |instance_size_| we do now.
   int64_t size = byte_pos();
-  if (!fifo_.empty())
-    size += fifo_.back()->data_size();
 
   // This request reports something smaller than what we've seen in the past,
   // Maybe it's transient error?
   if (url_data_->length() != kPositionNotSpecified &&
       size < url_data_->length()) {
     if (retries_ < kMaxRetries) {
       DVLOG(1) << " Partial data received.... @ pos = " << size;
       retries_++;
       base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
           FROM_HERE, base::Bind(&ResourceMultiBufferDataProvider::Start,
@@ skipping 76 matching lines @@
   }
   if (*last_byte_position < *first_byte_position ||
       (*instance_size != kPositionNotSpecified &&
        *last_byte_position >= *instance_size)) {
     return false;
   }
 
   return true;
 }
 
+void ResourceMultiBufferDataProvider::Terminate() {
+  fifo_.push_back(DataBuffer::CreateEOSBuffer());
+  url_data_->multibuffer()->OnDataProviderEvent(this);
+}
+
 int64_t ResourceMultiBufferDataProvider::byte_pos() const {
   int64_t ret = pos_;
   ret += fifo_.size();
   ret = ret << url_data_->multibuffer()->block_size_shift();
   if (!fifo_.empty()) {
     ret += fifo_.back()->data_size() - block_size();
   }
   return ret;
 }
 
@@ skipping 17 matching lines @@
   }
 
   if (byte_pos() != first_byte_position) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace media