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 /media/tools | |
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 'media/tools')
-rw-r--r-- | media/tools/player_wtl/movie.cc | 20 | ||||
-rw-r--r-- | media/tools/player_x11/player_x11.cc | 18 |
2 files changed, 20 insertions, 18 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index c12d724..81ca6fe 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -1,6 +1,6 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this -// source code is governed by a BSD-style license that can be found in the -// LICENSE file. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. #include "media/tools/player_wtl/movie.h" @@ -55,17 +55,17 @@ bool Movie::Open(const wchar_t* url, WtlVideoRenderer* video_renderer) { // Create filter collection. scoped_ptr<MediaFilterCollection> collection(new MediaFilterCollection()); - collection->AddFilter(new FileDataSource()); - collection->AddFilter(new FFmpegAudioDecoder()); - collection->AddFilter(new FFmpegDemuxer()); - collection->AddFilter(new FFmpegVideoDecoder(NULL)); + collection->AddDataSource(new FileDataSource()); + collection->AddAudioDecoder(new FFmpegAudioDecoder()); + collection->AddDemuxer(new FFmpegDemuxer()); + collection->AddVideoDecoder(new FFmpegVideoDecoder(NULL)); if (enable_audio_) { - collection->AddFilter(new AudioRendererImpl()); + collection->AddAudioRenderer(new AudioRendererImpl()); } else { - collection->AddFilter(new media::NullAudioRenderer()); + collection->AddAudioRenderer(new media::NullAudioRenderer()); } - collection->AddFilter(video_renderer); + collection->AddVideoRenderer(video_renderer); thread_.reset(new base::Thread("PipelineThread")); thread_->Start(); diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index ad307c4..ffff1bd 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -99,21 +99,23 @@ bool InitPipeline(MessageLoop* message_loop, // Create our filter factories. scoped_ptr<media::MediaFilterCollection> collection( new media::MediaFilterCollection()); - collection->AddFilter(new media::FileDataSource()); - collection->AddFilter(new media::FFmpegDemuxer()); - collection->AddFilter(new media::FFmpegAudioDecoder()); + collection->AddDataSource(new media::FileDataSource()); + collection->AddDemuxer(new media::FFmpegDemuxer()); + collection->AddAudioDecoder(new media::FFmpegAudioDecoder()); if (CommandLine::ForCurrentProcess()->HasSwitch( switches::kEnableOpenMax)) { - collection->AddFilter(new media::OmxVideoDecoder(NULL)); + collection->AddVideoDecoder(new media::OmxVideoDecoder(NULL)); } else { - collection->AddFilter(new media::FFmpegVideoDecoder(NULL)); + collection->AddVideoDecoder(new media::FFmpegVideoDecoder(NULL)); } - collection->AddFilter(new Renderer(g_display, g_window, paint_message_loop)); + collection->AddVideoRenderer(new Renderer(g_display, + g_window, + paint_message_loop)); if (enable_audio) - collection->AddFilter(new media::AudioRendererImpl()); + collection->AddAudioRenderer(new media::AudioRendererImpl()); else - collection->AddFilter(new media::NullAudioRenderer()); + collection->AddAudioRenderer(new media::NullAudioRenderer()); // Creates the pipeline and start it. *pipeline = new media::PipelineImpl(message_loop); |