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

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 CDM stuff, fixed Opus 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..55e58ad04f52ead6a9f4b78c71eae160e449a062 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(
@@ -51,11 +55,18 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
// Create our audio decoders and renderer.
ScopedVector<AudioDecoder> audio_decoders;
+#if defined(OS_ANDROID)
DaleCurtis 2016/02/04 23:15:31 This should be pushed after FFmpeg/Opus so they ar
Tima Vaisburd 2016/02/06 03:54:12 I just forgot to remove debugging code. I'm keepin
+ DVLOG(1) << __FUNCTION__ << ": adding AndroidAudioDecoder";
+ audio_decoders.push_back(new AndroidAudioDecoder(media_task_runner));
xhwang 2016/02/05 21:37:37 The DefaultRendererFactory will be used in the ren
Tima Vaisburd 2016/02/06 03:54:12 Acknowledged.
+#endif
+
#if !defined(MEDIA_DISABLE_FFMPEG)
+ DVLOG(1) << __FUNCTION__ << ": adding FFMpegAudioDecoder";
audio_decoders.push_back(
new FFmpegAudioDecoder(media_task_runner, media_log_));
#endif
+ DVLOG(1) << __FUNCTION__ << ": adding OpusAudioDecoder";
xhwang 2016/02/05 21:37:37 nit: It's not very interesting to know what decode
Tima Vaisburd 2016/02/06 03:54:12 As I said before, I just forgot to remove the debu
audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
« 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