Index: media/mojo/services/renderer_config_default.cc |
diff --git a/media/mojo/services/renderer_config_default.cc b/media/mojo/services/renderer_config_default.cc |
index 0d7215ff154f93ea2a3fd1a71ae706de0217d8de..76da6db577025bdca91734d0e72c312438fd4d0b 100644 |
--- a/media/mojo/services/renderer_config_default.cc |
+++ b/media/mojo/services/renderer_config_default.cc |
@@ -10,9 +10,17 @@ |
#include "media/audio/audio_output_stream_sink.h" |
#include "media/audio/fake_audio_log_factory.h" |
#include "media/base/media.h" |
-#include "media/filters/ffmpeg_audio_decoder.h" |
#include "media/filters/opus_audio_decoder.h" |
+#if !defined(OS_ANDROID) |
+#include "media/filters/ffmpeg_audio_decoder.h" |
+#include "media/filters/ffmpeg_video_decoder.h" |
+#endif |
+ |
+#if !defined(MEDIA_DISABLE_LIBVPX) |
+#include "media/filters/vpx_video_decoder.h" |
+#endif |
+ |
namespace media { |
namespace internal { |
@@ -56,6 +64,25 @@ class DefaultRendererConfig : public PlatformRendererConfig { |
return audio_decoders.Pass(); |
} |
+ ScopedVector<VideoDecoder> GetVideoDecoders( |
+ const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner, |
+ const LogCB& media_log_cb) override { |
+ ScopedVector<VideoDecoder> video_decoders; |
+ |
+ // TODO(dalecurtis): If we ever need GPU video decoders, we'll need to |
+ // figure out how to retrieve the GpuVideoAcceleratorFactories... |
+ |
+#if !defined(MEDIA_DISABLE_LIBVPX) |
+ video_decoders.push_back(new VpxVideoDecoder(media_task_runner)); |
+#endif // !defined(MEDIA_DISABLE_LIBVPX) |
+ |
+#if !defined(OS_ANDROID) |
+ video_decoders.push_back(new FFmpegVideoDecoder(media_task_runner)); |
+#endif |
+ |
+ return video_decoders.Pass(); |
+ } |
+ |
scoped_refptr<AudioRendererSink> GetAudioRendererSink() override { |
return new AudioOutputStreamSink(); |
} |