media: Plumb MediaLog to MojoVideoDecoderService.

media/mojo/services/mojo_video_decoder_service.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/services/mojo_video_decoder_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/optional.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
+#include "media/mojo/clients/mojo_media_log.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
 #include "media/mojo/services/mojo_media_client.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/buffer.h"
 #include "mojo/public/cpp/system/handle.h"
 
 namespace media {
 
 MojoVideoDecoderService::MojoVideoDecoderService(
     MojoMediaClient* mojo_media_client)
     : mojo_media_client_(mojo_media_client), weak_factory_(this) {
   weak_this_ = weak_factory_.GetWeakPtr();
 }
 
 MojoVideoDecoderService::~MojoVideoDecoderService() {}
 
 void MojoVideoDecoderService::Construct(
     mojom::VideoDecoderClientAssociatedPtrInfo client,
+    mojom::MediaLogAssociatedPtrInfo media_log,
     mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe,
     mojom::CommandBufferIdPtr command_buffer_id) {
   DVLOG(1) << __func__;
 
   if (decoder_) {
     // TODO(sandersd): Close the channel.
     return;
   }
 
-  decoder_ = mojo_media_client_->CreateVideoDecoder(
-      base::ThreadTaskRunnerHandle::Get(), std::move(command_buffer_id),
-      base::Bind(&MojoVideoDecoderService::OnDecoderOutput, weak_this_));
+  client_.Bind(std::move(client));
 
-  client_.Bind(std::move(client));
+  mojom::MediaLogAssociatedPtr media_log_ptr;
+  media_log_ptr.Bind(std::move(media_log));
+  media_log_ = base::MakeUnique<MojoMediaLog>(std::move(media_log_ptr));
 
   mojo_decoder_buffer_reader_.reset(
       new MojoDecoderBufferReader(std::move(decoder_buffer_pipe)));
+
+  decoder_ = mojo_media_client_->CreateVideoDecoder(
+      base::ThreadTaskRunnerHandle::Get(), media_log_.get(),
+      std::move(command_buffer_id),
+      base::Bind(&MojoVideoDecoderService::OnDecoderOutput, weak_this_));
 }
 
 void MojoVideoDecoderService::Initialize(mojom::VideoDecoderConfigPtr config,
                                          bool low_delay,
                                          const InitializeCallback& callback) {
   DVLOG(1) << __func__;
 
   if (!decoder_) {
     callback.Run(false, false, 1);
     return;
@@ skipping 94 matching lines @@
   auto it = release_mailbox_cbs_.find(release_token);
   if (it == release_mailbox_cbs_.end())
     return;
 
   MojoMediaClient::ReleaseMailboxCB cb = std::move(it->second);
   release_mailbox_cbs_.erase(it);
   std::move(cb).Run(release_sync_token);
 }
 
 }  // namespace media