diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 18:48:54 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 18:48:54 +0000 |
| commit | bf5604e21324c32393afa9754d37106d432bc8a7 (patch) | |
| tree | fefe898402437a56c091a2261dd99aaa1609e333 /webkit/glue/webmediaplayer_impl.cc | |
| parent | 675960006c65bd69ae927ac22fcd6a04f5f3dd15 (diff) | |
| download | chromium_src-bf5604e21324c32393afa9754d37106d432bc8a7.zip chromium_src-bf5604e21324c32393afa9754d37106d432bc8a7.tar.gz chromium_src-bf5604e21324c32393afa9754d37106d432bc8a7.tar.bz2 | |
Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollection
MediaFilterCollection is the only code that uses FilterType now so
I'm moving the enum into that class and removing all references from
the MediaFilter & derived classes.
BUG=61823
TEST=No new functionality. Existing tests pass.
Review URL: http://codereview.chromium.org/4653005
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/4991003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webmediaplayer_impl.cc')
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index bbf6172..02d98ca 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -278,18 +278,18 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( proxy_->SetDataSource(buffered_data_source); if (use_simple_data_source) { - filter_collection_->AddDataSource(simple_data_source); - filter_collection_->AddDataSource(buffered_data_source); + filter_collection_->AddFilter(simple_data_source); + filter_collection_->AddFilter(buffered_data_source); } else { - filter_collection_->AddDataSource(buffered_data_source); - filter_collection_->AddDataSource(simple_data_source); + filter_collection_->AddFilter(buffered_data_source); + filter_collection_->AddFilter(simple_data_source); } // Add in the default filter factories. - filter_collection_->AddDemuxer(new media::FFmpegDemuxer()); - filter_collection_->AddAudioDecoder(new media::FFmpegAudioDecoder()); - filter_collection_->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL)); - filter_collection_->AddAudioRenderer(new media::NullAudioRenderer()); + filter_collection_->AddFilter(new media::FFmpegDemuxer()); + filter_collection_->AddFilter(new media::FFmpegAudioDecoder()); + filter_collection_->AddFilter(new media::FFmpegVideoDecoder(NULL)); + filter_collection_->AddFilter(new media::NullAudioRenderer()); } WebMediaPlayerImpl::~WebMediaPlayerImpl() { |