summaryrefslogtreecommitdiffstats
path: root/webkit/media
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 05:51:38 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-12 05:51:38 +0000
commit26cc34ddcdb9fcec36931303171985a2f378396b (patch)
treeb66b045877d1c42997fb95a75a4d2b5ac4459ad7 /webkit/media
parentf6ee0f67d4652e94b614ffcc8ee532ab99f2847c (diff)
downloadchromium_src-26cc34ddcdb9fcec36931303171985a2f378396b.zip
chromium_src-26cc34ddcdb9fcec36931303171985a2f378396b.tar.gz
chromium_src-26cc34ddcdb9fcec36931303171985a2f378396b.tar.bz2
Don't pause-and-buffer non-range-supporting streams.
BUG=60691 Review URL: http://codereview.chromium.org/10050031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r--webkit/media/buffered_data_source.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/media/buffered_data_source.cc b/webkit/media/buffered_data_source.cc
index 68359b4..0b135c6 100644
--- a/webkit/media/buffered_data_source.cc
+++ b/webkit/media/buffered_data_source.cc
@@ -288,6 +288,11 @@ void BufferedDataSource::SetBitrateTask(int bitrate) {
BufferedResourceLoader::DeferStrategy
BufferedDataSource::ChooseDeferStrategy() {
DCHECK(MessageLoop::current() == render_loop_);
+ // We never cache 200 responses, and don't want to get too far ahead of the
+ // read-head (and thus require a restart), so keep to the thresholds.
+ if (loader_.get() && !loader_->range_supported())
+ return BufferedResourceLoader::kThresholdDefer;
+
// If the page indicated preload=metadata, then load exactly what is needed
// needed for starting playback.
if (!media_has_played_ && preload_ == METADATA)