diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 22:04:49 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-15 22:04:49 +0000 |
| commit | b7ba5b5e11aaa87de7601daf1ab5443fe41a6f3c (patch) | |
| tree | cfe597f6707c7edd075944c97da2849194daa937 /webkit/glue/webmediaplayer_impl.cc | |
| parent | b87c4a775b5b625dc2034b70e1232862d5d7faac (diff) | |
| download | chromium_src-b7ba5b5e11aaa87de7601daf1ab5443fe41a6f3c.zip chromium_src-b7ba5b5e11aaa87de7601daf1ab5443fe41a6f3c.tar.gz chromium_src-b7ba5b5e11aaa87de7601daf1ab5443fe41a6f3c.tar.bz2 | |
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.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=66125
Review URL: http://codereview.chromium.org/4653005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66182 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 02d98ca..bbf6172 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_->AddFilter(simple_data_source); - filter_collection_->AddFilter(buffered_data_source); + filter_collection_->AddDataSource(simple_data_source); + filter_collection_->AddDataSource(buffered_data_source); } else { - filter_collection_->AddFilter(buffered_data_source); - filter_collection_->AddFilter(simple_data_source); + filter_collection_->AddDataSource(buffered_data_source); + filter_collection_->AddDataSource(simple_data_source); } // Add in the default filter factories. - 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()); + 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()); } WebMediaPlayerImpl::~WebMediaPlayerImpl() { |