Chromium Code Reviews| 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..47c4fc18f4c0f74affcfd405f1c6a1f93e045ddf 100644 |
| --- a/media/mojo/services/mojo_decoder_factory.cc |
| +++ b/media/mojo/services/mojo_decoder_factory.cc |
| @@ -35,10 +35,14 @@ void MojoDecoderFactory::CreateAudioDecoders( |
| 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 media::MojoVideoDecoder( |
|
xhwang
2016/05/05 17:26:37
nit: here and above, no need for media::
sandersd (OOO until July 31)
2016/05/06 01:23:55
Done.
|
| + task_runner, gpu_factories, std::move(remote_decoder))); |
| #endif |
| } |