Tie multibuffers to URLs

media/blink/multibuffer.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/multibuffer.h"
 
 #include "base/bind.h"
 
 namespace media {
 
@@ skipping 143 matching lines @@
 
     // Make sure that there are no present blocks between the writer and
     // the requested position, as that will cause the writer to quit.
     if (closest_writer > closest_block) {
       provider = writer_index_[closest_writer];
       DCHECK(provider);
     }
   }
   if (!provider) {
     DCHECK(writer_index_.find(pos) == writer_index_.end());
-    provider = writer_index_[pos] = CreateWriter(pos);
-    provider->SetAvailableCallback(base::Bind(
-        &MultiBuffer::DataProviderEvent, base::Unretained(this), provider));
+    provider = writer_index_[pos] = CreateWriter(pos).release();

[xhwang, 2015/11/23 23:09:21]

release() seems hacky. Can we switch to use std::map<BlockId,
scoped_ptr<DataProvider>> asap?

[hubbe, 2015/11/24 22:55:10]

Done.

   }
   provider->SetDeferred(false);
 }
 
 void MultiBuffer::RemoveReader(const BlockId& pos, Reader* reader) {
   auto i = readers_.find(pos);
   if (i == readers_.end())
     return;
   i->second.erase(reader);
   if (i->second.empty()) {
     readers_.erase(i);
   }
 }
 
 void MultiBuffer::CleanupWriters(const BlockId& pos) {
   BlockId p2 = pos + kMaxWaitForReaderOffset;
   BlockId closest_writer = ClosestPreviousEntry(writer_index_, p2);
   while (closest_writer > pos - kMaxWaitForWriterOffset) {
     DCHECK(writer_index_[closest_writer]);
-    DataProviderEvent(writer_index_[closest_writer]);
+    OnDataProviderEvent(writer_index_[closest_writer]);
     closest_writer = ClosestPreviousEntry(writer_index_, closest_writer - 1);
   }
 }
 
 bool MultiBuffer::Contains(const BlockId& pos) const {
   DCHECK(present_[pos] == 0 || present_[pos] == 1)
       << " pos = " << pos << " present_[pos] " << present_[pos];
   DCHECK_EQ(present_[pos], data_.find(pos) != data_.end() ? 1 : 0);
   return !!present_[pos];
 }
@@ skipping 54 matching lines @@
       }
       if (i.interval_end() == freed_range.first.end) {
         // Notify the following range that it contains fewer blocks.
         auto j = i;
         ++j;
         DCHECK_EQ(j.value(), 1);
         NotifyAvailableRange(j.interval(), j.interval());
       }
     }
   }
+  if (data_.empty())
+    OnEmpty();
 }
 
+void MultiBuffer::OnEmpty() {}
+
 void MultiBuffer::AddProvider(scoped_ptr<DataProvider> provider) {
   // If there is already a provider in the same location, we delete it.
   DCHECK(!provider->Available());
   BlockId pos = provider->Tell();
   DataProvider** place = &writer_index_[pos];
   DCHECK_NE(*place, provider.get());
   if (*place)
     delete *place;
   *place = provider.release();
 }
@@ skipping 44 matching lines @@
   if (RangeSupported() && Contains(id))
     return true;
 
   return false;
 }
 
 void MultiBuffer::Prune(size_t max_to_free) {
   lru_->Prune(max_to_free);
 }
 
-void MultiBuffer::DataProviderEvent(DataProvider* provider_tmp) {
+void MultiBuffer::OnDataProviderEvent(DataProvider* provider_tmp) {
   scoped_ptr<DataProvider> provider(RemoveProvider(provider_tmp));
   BlockId start_pos = provider->Tell();
   BlockId pos = start_pos;
   bool eof = false;
   int64_t blocks_before = data_.size();
 
   while (!ProviderCollision(pos) && !eof) {
     if (!provider->Available()) {
       AddProvider(provider.Pass());
       break;
@@ skipping 133 matching lines @@
 }
 
 void MultiBuffer::IncrementMaxSize(int32_t size) {
   max_size_ += size;
   lru_->IncrementMaxSize(size);
   DCHECK_GE(max_size_, 0);
   // Pruning only happens when blocks are added.
 }
 
 }  // namespace media