Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: media/blink/resource_multibuffer_data_provider.cc

Issue 2133803004: Fix MultibufferDataSource::GetSize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bugfix Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/resource_multibuffer_data_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/resource_multibuffer_data_provider.cc
diff --git a/media/blink/resource_multibuffer_data_provider.cc b/media/blink/resource_multibuffer_data_provider.cc
index d8f3458330c1ab8b010ac9d947786cd26962903f..c07cf8668cce200bc142a181d18ee54191e2c12a 100644
--- a/media/blink/resource_multibuffer_data_provider.cc
+++ b/media/blink/resource_multibuffer_data_provider.cc
@@ -72,8 +72,11 @@ void ResourceMultiBufferDataProvider::Start() {
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(
@@ -403,8 +406,6 @@ void ResourceMultiBufferDataProvider::didFinishLoading(
// 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?
@@ -501,6 +502,11 @@ bool ResourceMultiBufferDataProvider::ParseContentRange(
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();
« no previous file with comments | « media/blink/resource_multibuffer_data_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698