Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 11148011: Move audio decoder initialization to AudioRendererImpl. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: nits Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/tools/player_wtl/movie.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/pipeline_integration_test_base.cc
diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc
index 7c1cc5de5b2d6efbbd65680b02e9209706260561..9e3c6a916daf07b144a529eb275d441b5297086f 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -197,16 +197,17 @@ PipelineIntegrationTestBase::CreateFilterCollection(
Decryptor* decryptor) {
scoped_ptr<FilterCollection> collection(new FilterCollection());
collection->SetDemuxer(demuxer);
- collection->AddAudioDecoder(new FFmpegAudioDecoder(
+ scoped_refptr<AudioDecoder> audio_decoder = new FFmpegAudioDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- media::MessageLoopFactory::kDecoder)));
- scoped_refptr<VideoDecoder> decoder = new FFmpegVideoDecoder(
+ media::MessageLoopFactory::kDecoder));
+ scoped_refptr<VideoDecoder> video_decoder = new FFmpegVideoDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
media::MessageLoopFactory::kDecoder),
decryptor);
- collection->GetVideoDecoders()->push_back(decoder);
+ collection->GetAudioDecoders()->push_back(audio_decoder);
+ collection->GetVideoDecoders()->push_back(video_decoder);
// Disable frame dropping if hashing is enabled.
renderer_ = new VideoRendererBase(
« no previous file with comments | « media/filters/audio_renderer_impl_unittest.cc ('k') | media/tools/player_wtl/movie.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698