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 /media/base/pipeline_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 'media/base/pipeline_impl.cc')
| -rw-r--r-- | media/base/pipeline_impl.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 7765cd0..7f17ff8 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -954,7 +954,7 @@ void PipelineImpl::InitializeDataSource() { scoped_refptr<DataSource> data_source; while (true) { - filter_collection_->SelectDataSource(&data_source); + filter_collection_->SelectFilter(&data_source); if (!data_source || data_source->IsUrlSupported(url_)) break; } @@ -979,7 +979,7 @@ void PipelineImpl::InitializeDemuxer( CHECK(data_source); - filter_collection_->SelectDemuxer(&demuxer); + filter_collection_->SelectFilter(&demuxer); if (!demuxer) { SetError(PIPELINE_ERROR_REQUIRED_FILTER_MISSING); return; @@ -1001,7 +1001,7 @@ bool PipelineImpl::InitializeAudioDecoder( if (stream) { scoped_refptr<AudioDecoder> audio_decoder; - filter_collection_->SelectAudioDecoder(&audio_decoder); + filter_collection_->SelectFilter(&audio_decoder); if (audio_decoder) { PrepareFilter(audio_decoder); @@ -1028,7 +1028,7 @@ bool PipelineImpl::InitializeVideoDecoder( if (stream) { scoped_refptr<VideoDecoder> video_decoder; - filter_collection_->SelectVideoDecoder(&video_decoder); + filter_collection_->SelectFilter(&video_decoder); if (video_decoder) { PrepareFilter(video_decoder); @@ -1050,7 +1050,7 @@ bool PipelineImpl::InitializeAudioRenderer( DCHECK(IsPipelineOk()); if (decoder) { - filter_collection_->SelectAudioRenderer(&audio_renderer_); + filter_collection_->SelectFilter(&audio_renderer_); if (audio_renderer_) { PrepareFilter(audio_renderer_); @@ -1070,7 +1070,7 @@ bool PipelineImpl::InitializeVideoRenderer( DCHECK(IsPipelineOk()); if (decoder) { - filter_collection_->SelectVideoRenderer(&video_renderer_); + filter_collection_->SelectFilter(&video_renderer_); if (video_renderer_) { PrepareFilter(video_renderer_); |