diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:02:42 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-18 07:02:42 +0000 |
| commit | 8a8f4d1a570302b00c7c2a64c699a108621893ec (patch) | |
| tree | c291166134e75e4baceb798b689e0dd4d70efe1e /media/tools | |
| parent | 741c28f9db1521cb02c6b89fe2966f67f4329dff (diff) | |
| download | chromium_src-8a8f4d1a570302b00c7c2a64c699a108621893ec.zip chromium_src-8a8f4d1a570302b00c7c2a64c699a108621893ec.tar.gz chromium_src-8a8f4d1a570302b00c7c2a64c699a108621893ec.tar.bz2 | |
Move audio decoder initialization to AudioRendererImpl.
Also add support to multiple audio decoder initializaiton.
BUG=145635
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/11148011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162658 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 ed162ce..3029da9 100644 --- a/media/tools/player_wtl/movie.cc +++ b/media/tools/player_wtl/movie.cc @@ -76,7 +76,7 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) { // Create filter collection. scoped_ptr<FilterCollection> collection(new FilterCollection()); collection->SetDemuxer(new FFmpegDemuxer(pipeline_loop, data_source)); - collection->AddAudioDecoder(new FFmpegAudioDecoder( + collection->GetAudioDecoders()->push_back(new FFmpegAudioDecoder( base::Bind(&MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory_.get()), media::MessageLoopFactory::kDecoder))); diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index fd30b9a..b1c814e 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -117,7 +117,7 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop, scoped_ptr<media::FilterCollection> collection( new media::FilterCollection()); collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source)); - collection->AddAudioDecoder(new media::FFmpegAudioDecoder( + collection->GetAudioDecoders()->push_back(new media::FFmpegAudioDecoder( base::Bind(&media::MessageLoopFactory::GetMessageLoop, base::Unretained(message_loop_factory), media::MessageLoopFactory::kDecoder))); |