diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:13:13 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-29 15:13:13 +0000 |
| commit | 57c9ae399f80f00b533aa92c9eafeee748aa3b1c (patch) | |
| tree | db5b26fc3e9090edda0c370dfdcb6790058611f3 /webkit | |
| parent | 8238dd6190819daade7ee98f669e23a5a56ee4fa (diff) | |
| download | chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.zip chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.tar.gz chromium_src-57c9ae399f80f00b533aa92c9eafeee748aa3b1c.tar.bz2 | |
Remove AdaptiveDemuxer since it's been replaced with ChunkingDemuxer.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/8065023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 0c6c9ba..c504235 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -17,7 +17,6 @@ #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/chunk_demuxer_factory.h" #include "media/filters/dummy_demuxer_factory.h" #include "media/filters/ffmpeg_audio_decoder.h" @@ -190,27 +189,8 @@ bool WebMediaPlayerImpl::Initialize( data_source_factory->AddFactory(simple_data_source_factory.release()); } - 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())); - - std::string sourceUrl; - - // TODO(acolwell): Uncomment once WebKit changes are checked in. - // https://bugs.webkit.org/show_bug.cgi?id=64731 - //sourceUrl = GetClient()->sourceURL().spec(); - - if (!sourceUrl.empty()) { - demuxer_factory.reset( - new media::ChunkDemuxerFactory(sourceUrl, - demuxer_factory.release(), - proxy_)); - } - } - filter_collection_->SetDemuxerFactory(demuxer_factory.release()); + filter_collection_->SetDemuxerFactory(new media::FFmpegDemuxerFactory( + data_source_factory.release(), pipeline_message_loop)); // Add in the default filter factories. filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder( |