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

Unified Diff: media/renderers/default_renderer_factory.cc

Issue 1651673002: Add MediaCodecAudioDecoder implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed all changes to decoder_buffer.cc Created 4 years, 10 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
« media/filters/android/android_audio_decoder.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index b708ad92dfd3b88f8c2d0a8f5524415cf0754822..182a0f09ceceec1983a4973813291352348ed954 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -28,6 +28,10 @@
#include "media/filters/vpx_video_decoder.h"
#endif
+#if defined(OS_ANDROID)
+#include "media/filters/android/android_audio_decoder.h"
+#endif
+
namespace media {
DefaultRendererFactory::DefaultRendererFactory(
@@ -58,6 +62,11 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
+#if defined(OS_ANDROID)
+ // TODO(timav): replace AndroidAudioDecoder with MojoAudioDecoder.
+ audio_decoders.push_back(new AndroidAudioDecoder(media_task_runner));
+#endif
xhwang 2016/02/08 20:03:35 Thanks! This probably should not be checked in b
Tima Vaisburd 2016/02/11 20:23:23 All changes to this file are removed.
+
scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
media_task_runner, audio_renderer_sink, std::move(audio_decoders),
audio_hardware_config_, media_log_));
« media/filters/android/android_audio_decoder.cc ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698