diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 16:44:24 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 16:44:24 +0000 |
| commit | b517bce9d75f702c7dcffe4cdf91620ee066f818 (patch) | |
| tree | 1bbcab0fefedcbede04789c32a7cbd9076e64f16 /webkit/media/buffered_data_source.cc | |
| parent | bb5ceb93a5ec91b4bde5fd2340b4e74691720354 (diff) | |
| download | chromium_src-b517bce9d75f702c7dcffe4cdf91620ee066f818.zip chromium_src-b517bce9d75f702c7dcffe4cdf91620ee066f818.tar.gz chromium_src-b517bce9d75f702c7dcffe4cdf91620ee066f818.tar.bz2 | |
Stop dropping buffering updates on the floor for small media resources.
Before, BufferedDataSource would fail to report buffering bytes earlier than the
current seek target. This is wrong because BufferedResourceLoader has a
kForwardWaitThreshold buffer and if the seek is within that range, it'll just
keep feeding bytes to BDS until the seek target is reached. Account for this.
BUG=130843
Review URL: https://chromiumcodereview.appspot.com/10503004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140536 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/buffered_data_source.cc')
| -rw-r--r-- | webkit/media/buffered_data_source.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc index 0aec84a..9e87ca0 100644 --- a/webkit/media/buffered_data_source.cc +++ b/webkit/media/buffered_data_source.cc @@ -526,7 +526,8 @@ void BufferedDataSource::ReadCallback( if (host() && total_bytes_ != kPositionNotSpecified) { host()->SetTotalBytes(total_bytes_); - host()->AddBufferedByteRange(last_read_start_, total_bytes_); + host()->AddBufferedByteRange(loader_->first_byte_position(), + total_bytes_); } } DoneRead_Locked(bytes_read); @@ -566,8 +567,9 @@ void BufferedDataSource::NetworkEventCallback() { host()->SetNetworkActivity(is_downloading_data); } - if (host() && current_buffered_position > last_read_start_) - host()->AddBufferedByteRange(last_read_start_, current_buffered_position); + int64 start = loader_->first_byte_position(); + if (host() && current_buffered_position > start) + host()->AddBufferedByteRange(start, current_buffered_position); } void BufferedDataSource::UpdateHostState_Locked() { @@ -579,8 +581,9 @@ void BufferedDataSource::UpdateHostState_Locked() { if (total_bytes_ != kPositionNotSpecified) host()->SetTotalBytes(total_bytes_); - if (buffered_bytes_ > last_read_start_) - host()->AddBufferedByteRange(last_read_start_, buffered_bytes_); + int64 start = loader_->first_byte_position(); + if (buffered_bytes_ > start) + host()->AddBufferedByteRange(start, buffered_bytes_); } } // namespace webkit_media |