summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/renderer/media/webmediaplayer_impl.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index 4be4b9f..3f23df7 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -1083,7 +1083,6 @@ void WebMediaPlayerImpl::NotifyDownloading(bool is_downloading) {
void WebMediaPlayerImpl::StartPipeline() {
const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
- bool increase_preroll_on_underflow = true;
// Keep track if this is a MSE or non-MSE playback.
UMA_HISTOGRAM_BOOLEAN("Media.MSE.Playback",
@@ -1114,12 +1113,6 @@ void WebMediaPlayerImpl::StartPipeline() {
// TODO(acolwell): Remove this once http://crbug.com/151045 is fixed.
gpu_factories_ = NULL;
#endif
-
- // Disable preroll increases on underflow since the web application has no
- // way to detect that this is happening and runs the risk of triggering
- // unwanted garbage collection if it is to aggressive about appending data.
- // TODO(acolwell): Remove this once http://crbug.com/144683 is fixed.
- increase_preroll_on_underflow = false;
}
scoped_ptr<media::FilterCollection> filter_collection(
@@ -1144,8 +1137,7 @@ void WebMediaPlayerImpl::StartPipeline() {
new media::AudioRendererImpl(media_loop_,
audio_source_provider_.get(),
audio_decoders.Pass(),
- set_decryptor_ready_cb,
- increase_preroll_on_underflow));
+ set_decryptor_ready_cb));
filter_collection->SetAudioRenderer(audio_renderer.Pass());
// Create our video decoders and renderer.