diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 20:28:50 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 20:28:50 +0000 |
| commit | 4af58de57546a1058f575d29a9a4037172b3940b (patch) | |
| tree | aecee055c406f277175db1cf32466e0461f3b9b5 /webkit/glue/webmediaplayer_impl.cc | |
| parent | 6f00f7e6d4f18af869d89cf669bf95b8d21e67f0 (diff) | |
| download | chromium_src-4af58de57546a1058f575d29a9a4037172b3940b.zip chromium_src-4af58de57546a1058f575d29a9a4037172b3940b.tar.gz chromium_src-4af58de57546a1058f575d29a9a4037172b3940b.tar.bz2 | |
Flag-enabled the experimental x-adaptive scheme with --enable-adaptive.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6749045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 54bc600..527a297 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -16,6 +16,7 @@ #include "media/base/media_switches.h" #include "media/base/pipeline_impl.h" #include "media/base/video_frame.h" +#include "media/filters/adaptive_demuxer.h" #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer_factory.h" #include "media/filters/ffmpeg_video_decoder.h" @@ -343,6 +344,10 @@ bool WebMediaPlayerImpl::Initialize( scoped_ptr<media::DemuxerFactory> demuxer_factory( new media::FFmpegDemuxerFactory(data_source_factory.release(), pipeline_message_loop)); + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAdaptive)) { + demuxer_factory.reset(new media::AdaptiveDemuxerFactory( + demuxer_factory.release())); + } filter_collection_->SetDemuxerFactory(demuxer_factory.release()); // Add in the default filter factories. |