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

Unified Diff: webkit/media/filter_helpers.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: webkit/media/filter_helpers.cc
diff --git a/webkit/media/filter_helpers.cc b/webkit/media/filter_helpers.cc
index 9ae007ced88fb826274b76db490221f4f4476436..6c57bfab8c4da00c0b4a04affd8551c35c7f22cd 100644
--- a/webkit/media/filter_helpers.cc
+++ b/webkit/media/filter_helpers.cc
@@ -22,10 +22,12 @@ static void AddDefaultDecodersToCollection(
media::MessageLoopFactory* message_loop_factory,
media::FilterCollection* filter_collection,
media::Decryptor* decryptor) {
- filter_collection->AddAudioDecoder(new media::FFmpegAudioDecoder(
- base::Bind(&media::MessageLoopFactory::GetMessageLoop,
- base::Unretained(message_loop_factory),
- media::MessageLoopFactory::kAudioDecoder)));
+ scoped_refptr<media::FFmpegAudioDecoder> ffmpeg_audio_decoder =
+ new media::FFmpegAudioDecoder(
+ base::Bind(&media::MessageLoopFactory::GetMessageLoop,
+ base::Unretained(message_loop_factory),
+ media::MessageLoopFactory::kAudioDecoder));
+ filter_collection->GetAudioDecoders()->push_back(ffmpeg_audio_decoder);
scoped_refptr<media::FFmpegVideoDecoder> ffmpeg_video_decoder =
new media::FFmpegVideoDecoder(
« media/filters/audio_renderer_impl.cc ('K') | « media/tools/player_x11/player_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698