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_)); |