Improve retry support for media network loading.

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 17 matching lines @@
 using blink::WebURLLoader;
 using blink::WebURLLoaderOptions;
 using blink::WebURLRequest;
 using blink::WebURLResponse;
 
 namespace media {
 
 // The number of milliseconds to wait before retrying a failed load.
 const int kLoaderFailedRetryDelayMs = 250;
 
+// Each retry, add this many MS to the delay.
+const int kAdditionalDelayPerRetryMs = 50;
+
 // The number of milliseconds to wait before retrying when the server
 // decides to not give us all the data at once.
 const int kLoaderPartialRetryDelayMs = 25;
 
 const int kHttpOK = 200;
 const int kHttpPartialContent = 206;
 const int kHttpRangeNotSatisfiable = 416;
-const int kMaxRetries = 3;
+// total delay is:
+// (kLoaderPartialRetryDelayMs +
+//  kAdditionalDelayPerRetryMs * (kMaxRetries - 1) / 2) * kMaxretries = 29250 ms
+const int kMaxRetries = 30;
 
 ResourceMultiBufferDataProvider::ResourceMultiBufferDataProvider(
     UrlData* url_data,
     MultiBufferBlockId pos)
     : pos_(pos),
       url_data_(url_data),
       retries_(0),
       cors_mode_(url_data->cors_mode()),
       origin_(url_data->url().GetOrigin()),
       weak_factory_(this) {
@@ skipping 348 matching lines @@
            << ", domain=" << error.domain.utf8().data()
            << ", localizedDescription="
            << error.localizedDescription.utf8().data();
   DCHECK(active_loader_.get());
 
   if (retries_ < kMaxRetries && pos_ != 0) {
     retries_++;
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE, base::Bind(&ResourceMultiBufferDataProvider::Start,
                               weak_factory_.GetWeakPtr()),
-        base::TimeDelta::FromMilliseconds(kLoaderFailedRetryDelayMs));
+        base::TimeDelta::FromMilliseconds(
+            kLoaderFailedRetryDelayMs + kAdditionalDelayPerRetryMs * retries_));

[DaleCurtis, 2016/03/10 01:23:32]

IIRC we reuse the BufferedDataSource unittest for this class too right?

[hubbe, 2016/03/11 03:18:53]

No, we do not.
Also, the tests we have weren't really testing what they were supposed to test,
but that is fixed now.

   } else {
     // We don't need to continue loading after failure.
     //
     // Keep it alive until we exit this method so that |error| remains valid.
     scoped_ptr<ActiveLoader> active_loader = std::move(active_loader_);
     url_data_->Fail();
   }
 }
 
 bool ResourceMultiBufferDataProvider::ParseContentRange(
@@ skipping 67 matching lines @@
   }
 
   if (byte_pos() != first_byte_position) {
     return false;
   }
 
   return true;
 }
 
 }  // namespace media