media: Plumb MediaLog to MojoVideoDecoderService.

media/mojo/clients/mojo_video_decoder.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/clients/mojo_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/unguessable_token.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
 #include "media/mojo/interfaces/media_types.mojom.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 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__;
 }
 
 MojoVideoDecoder::~MojoVideoDecoder() {
   DVLOG(1) << __func__;
 }
 
 std::string MojoVideoDecoder::GetDisplayName() const {
   return "MojoVideoDecoder";
@@ skipping 147 matching lines @@
   DVLOG(3) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!remote_decoder_bound_);
 
   remote_decoder_.Bind(std::move(remote_decoder_info_));
   remote_decoder_bound_ = true;
 
   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(
       DemuxerStream::VIDEO, &remote_consumer_handle);
 
   media::mojom::CommandBufferIdPtr command_buffer_id;
   if (gpu_factories_) {
     base::UnguessableToken channel_token = gpu_factories_->GetChannelToken();
     if (channel_token) {
       command_buffer_id = media::mojom::CommandBufferId::New();
       command_buffer_id->channel_token = std::move(channel_token);
       command_buffer_id->route_id = gpu_factories_->GetCommandBufferRouteId();
     }
   }
 
-  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() {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   has_connection_error_ = true;
 
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(false);
 
   for (const auto& pending_decode : pending_decodes_)
     pending_decode.second.Run(DecodeStatus::DECODE_ERROR);
   pending_decodes_.clear();
 
   if (!reset_cb_.is_null())
     base::ResetAndReturn(&reset_cb_).Run();
 }
 
 }  // namespace media