Index: media/mojo/clients/mojo_video_decoder.cc |
diff --git a/media/mojo/clients/mojo_video_decoder.cc b/media/mojo/clients/mojo_video_decoder.cc |
index 37135b8ad135da4a01b20674e5103e94de40d24d..e43b684bc29c5dd6c684b14f9f52dad9b996a6d1 100644 |
--- a/media/mojo/clients/mojo_video_decoder.cc |
+++ b/media/mojo/clients/mojo_video_decoder.cc |
@@ -26,11 +26,14 @@ namespace media { |
MojoVideoDecoder::MojoVideoDecoder( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
GpuVideoAcceleratorFactories* gpu_factories, |
+ MediaLog* media_log, |
mojom::VideoDecoderPtr remote_decoder) |
: task_runner_(task_runner), |
remote_decoder_info_(remote_decoder.PassInterface()), |
gpu_factories_(gpu_factories), |
client_binding_(this), |
+ media_log_service_(media_log), |
+ media_log_binding_(&media_log_service_), |
weak_factory_(this) { |
DVLOG(1) << __func__; |
} |
@@ -198,10 +201,12 @@ void MojoVideoDecoder::BindRemoteDecoder() { |
remote_decoder_.set_connection_error_handler( |
base::Bind(&MojoVideoDecoder::Stop, base::Unretained(this))); |
- // TODO(sandersd): Does this need its own error handler? |
mojom::VideoDecoderClientAssociatedPtrInfo client_ptr_info; |
client_binding_.Bind(mojo::MakeRequest(&client_ptr_info)); |
+ mojom::MediaLogAssociatedPtrInfo media_log_ptr_info; |
+ media_log_binding_.Bind(mojo::MakeRequest(&media_log_ptr_info)); |
+ |
// TODO(sandersd): Better buffer sizing. |
mojo::ScopedDataPipeConsumerHandle remote_consumer_handle; |
mojo_decoder_buffer_writer_ = MojoDecoderBufferWriter::Create( |
@@ -217,9 +222,9 @@ void MojoVideoDecoder::BindRemoteDecoder() { |
} |
} |
- remote_decoder_->Construct(std::move(client_ptr_info), |
- std::move(remote_consumer_handle), |
- std::move(command_buffer_id)); |
+ remote_decoder_->Construct( |
+ std::move(client_ptr_info), std::move(media_log_ptr_info), |
+ std::move(remote_consumer_handle), std::move(command_buffer_id)); |
} |
void MojoVideoDecoder::Stop() { |