Index: media/mojo/services/mojo_decoder_factory.cc |
diff --git a/media/mojo/services/mojo_decoder_factory.cc b/media/mojo/services/mojo_decoder_factory.cc |
index c23534df67964b6fd94ab5a5b82e6fe16170123a..390a55c1f77ff1db848404f5476059d8f9182547 100644 |
--- a/media/mojo/services/mojo_decoder_factory.cc |
+++ b/media/mojo/services/mojo_decoder_factory.cc |
@@ -4,23 +4,33 @@ |
#include "media/mojo/services/mojo_decoder_factory.h" |
-#include "media/mojo/interfaces/service_factory.mojom.h" |
#include "media/mojo/services/mojo_audio_decoder.h" |
+#include "media/mojo/services/mojo_video_decoder.h" |
namespace media { |
MojoDecoderFactory::MojoDecoderFactory( |
- interfaces::ServiceFactory* service_factory) |
- : service_factory_(service_factory) { |
- DCHECK(service_factory_); |
+ mojo::shell::mojom::InterfaceProvider* interface_provider) |
+ : interface_provider_(interface_provider) { |
+ DCHECK(interface_provider_); |
} |
MojoDecoderFactory::~MojoDecoderFactory() {} |
void MojoDecoderFactory::CreateAudioDecoders( |
ScopedVector<AudioDecoder>* audio_decoders) { |
+#if defined(ENABLE_MOJO_AUDIO_DECODER) |
// TODO(xhwang): Connect to mojo audio decoder service and pass it here. |
audio_decoders->push_back(new media::MojoAudioDecoder()); |
+#endif |
+} |
+ |
+void MojoDecoderFactory::CreateVideoDecoders( |
+ ScopedVector<VideoDecoder>* video_decoders) { |
+#if defined(ENABLE_MOJO_VIDEO_DECODER) |
+ // TODO(sandersd): Connect to mojo video decoder service and pass it here. |
+ video_decoders->push_back(new media::MojoVideoDecoder()); |
+#endif |
} |
} // namespace media |