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 5a21c212495f4a1c0c416facf78c4985e53fef29..a488410e9be5d32984ed234e26c7a6105a13fcd1 100644 |
--- a/media/mojo/services/mojo_decoder_factory.cc |
+++ b/media/mojo/services/mojo_decoder_factory.cc |
@@ -29,16 +29,20 @@ void MojoDecoderFactory::CreateAudioDecoders( |
&audio_decoder_ptr); |
audio_decoders->push_back( |
- new media::MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr))); |
+ new MojoAudioDecoder(task_runner, std::move(audio_decoder_ptr))); |
#endif |
} |
void MojoDecoderFactory::CreateVideoDecoders( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
+ GpuVideoAcceleratorFactories* gpu_factories, |
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()); |
+ interfaces::VideoDecoderPtr remote_decoder; |
+ shell::GetInterface<interfaces::VideoDecoder>(interface_provider_, |
+ &remote_decoder); |
+ video_decoders->push_back(new MojoVideoDecoder(task_runner, gpu_factories, |
+ std::move(remote_decoder))); |
#endif |
} |