diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 19:44:22 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 19:44:22 +0000 |
| commit | c88c7c2bd7ddf9b88d09c51a991d1ac4cd24b741 (patch) | |
| tree | 2c7c43c8d41f7a2625416263a4c26c1ffbbd8630 /webkit/glue | |
| parent | 967be67d0228174b07c0f2815dd14157b6e245c3 (diff) | |
| download | chromium_src-c88c7c2bd7ddf9b88d09c51a991d1ac4cd24b741.zip chromium_src-c88c7c2bd7ddf9b88d09c51a991d1ac4cd24b741.tar.gz chromium_src-c88c7c2bd7ddf9b88d09c51a991d1ac4cd24b741.tar.bz2 | |
DemuxerFactory is born!
PipelineImpl no longer knows about DataSources, with DemuxerFactory taking a
DataSourceFactory when appropriate (i.e. for FFmpegDemuxerFactory).
This diff is relative to patchset 8 of issue 6480050, which must be submitted
first.
BUG=none
TEST=media_unittests pass; chrome plays videos; trybots passed: mac,linux,linux_clang,win_layout; trybots with only unrelated-looking failures: win,{mac,linux}_layout
Review URL: http://codereview.chromium.org/6648004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index 2d5e6a6..098cd61 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -16,7 +16,7 @@ #include "media/base/pipeline_impl.h" #include "media/base/video_frame.h" #include "media/filters/ffmpeg_audio_decoder.h" -#include "media/filters/ffmpeg_demuxer.h" +#include "media/filters/ffmpeg_demuxer_factory.h" #include "media/filters/ffmpeg_video_decoder.h" #include "media/filters/null_audio_renderer.h" #include "skia/ext/platform_canvas.h" @@ -335,11 +335,12 @@ bool WebMediaPlayerImpl::Initialize( data_source_factory->AddFactory(simple_data_source_factory.release()); } - filter_collection_->SetDataSourceFactory(data_source_factory.release()); + scoped_ptr<media::DemuxerFactory> demuxer_factory( + new media::FFmpegDemuxerFactory(data_source_factory.release(), + pipeline_message_loop)); + filter_collection_->SetDemuxerFactory(demuxer_factory.release()); // Add in the default filter factories. - filter_collection_->AddDemuxer(new media::FFmpegDemuxer( - message_loop_factory_->GetMessageLoop("DemuxThread"))); filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder( message_loop_factory_->GetMessageLoop("AudioDecoderThread"))); filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder( |