diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 22:02:47 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-10 22:02:47 +0000 |
| commit | 873da2638d7ce577ef70931fcd346b38515d767f (patch) | |
| tree | cc1e59e62e2e76f8f2f16aa90ecd9fb4010f3c04 /media/tools | |
| parent | e516a3c151576c3ac7c0d146239fd3c191a51320 (diff) | |
| download | chromium_src-873da2638d7ce577ef70931fcd346b38515d767f.zip chromium_src-873da2638d7ce577ef70931fcd346b38515d767f.tar.gz chromium_src-873da2638d7ce577ef70931fcd346b38515d767f.tar.bz2 | |
Move VideoDecoder initialization into VideoRendererBase to simplify implementing codec config changes during playback.
BUG=141533
TEST=Existing PipelineTest.*, VideoRendererBaseTest.*
Review URL: https://chromiumcodereview.appspot.com/10836167
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/player_wtl/movie.cc | 2 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc index eb117ba..2660b2e 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -77,7 +77,7 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), "AudioDecoderThread"))); - collection->AddVideoDecoder(new FFmpegVideoDecoder( + collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), "VideoDecoderThread"), diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 85f3fb67..e224021 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -119,7 +119,7 @@ bool InitPipeline(MessageLoop* message_loop, base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), "AudioDecoderThread"))); - collection->AddVideoDecoder(new media::FFmpegVideoDecoder( + collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), "VideoDecoderThread"), |