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

Unified Diff: media/filters/pipeline_integration_test_base.cc

Issue 10918022: Move AudioDecoder initialization into AudioRenderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
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 1e961a8122f660aef6027df6f6404dc321bcb6c0..0d1529edd879e4c4ec88abb9d5d907cc56575f84 100644
--- a/media/filters/pipeline_integration_test_base.cc
+++ b/media/filters/pipeline_integration_test_base.cc
@@ -199,16 +199,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::kAudioDecoder)));
- scoped_refptr<VideoDecoder> decoder = new FFmpegVideoDecoder(
+ media::MessageLoopFactory::kAudioDecoder));
+ collection->GetAudioDecoders()->push_back(audio_decoder);
+ scoped_refptr<VideoDecoder> video_decoder = new FFmpegVideoDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
media::MessageLoopFactory::kVideoDecoder),
decryptor);
- collection->GetVideoDecoders()->push_back(decoder);
+ collection->GetVideoDecoders()->push_back(video_decoder);
// Disable frame dropping if hashing is enabled.
renderer_ = new VideoRendererBase(

Powered by Google App Engine
This is Rietveld 408576698