media: Plumb MediaLog to MojoVideoDecoderService.

media/mojo/clients/mojo_video_decoder.h

 // 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.
 
 #ifndef MEDIA_MOJO_CLIENTS_MOJO_VIDEO_DECODER_H_
 #define MEDIA_MOJO_CLIENTS_MOJO_VIDEO_DECODER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/video_decoder.h"
+#include "media/mojo/clients/mojo_media_log_service.h"
 #include "media/mojo/interfaces/video_decoder.mojom.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class GpuVideoAcceleratorFactories;
+class MediaLog;
 class MojoDecoderBufferWriter;
 
 // A VideoDecoder, for use in the renderer process, that proxies to a
 // mojom::VideoDecoder. It is assumed that the other side will be implemented by
 // MojoVideoDecoderService, running in the GPU process, and that the remote
 // decoder will be hardware accelerated.
 class MojoVideoDecoder final : public VideoDecoder,
                                public mojom::VideoDecoderClient {
  public:
   MojoVideoDecoder(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                    GpuVideoAcceleratorFactories* gpu_factories,
+                   MediaLog* media_log,
                    mojom::VideoDecoderPtr remote_decoder);
   ~MojoVideoDecoder() final;
 
   // VideoDecoder implementation.
   std::string GetDisplayName() const final;
   void Initialize(const VideoDecoderConfig& config,
                   bool low_delay,
                   CdmContext* cdm_context,
                   const InitCB& init_cb,
                   const OutputCB& output_cb) final;
@@ skipping 37 matching lines @@
   InitCB init_cb_;
   OutputCB output_cb_;
   uint64_t decode_counter_ = 0;
   std::map<uint64_t, DecodeCB> pending_decodes_;
   base::Closure reset_cb_;
 
   mojom::VideoDecoderPtr remote_decoder_;
   std::unique_ptr<MojoDecoderBufferWriter> mojo_decoder_buffer_writer_;
   bool remote_decoder_bound_ = false;
   bool has_connection_error_ = false;
-  mojo::AssociatedBinding<VideoDecoderClient> client_binding_;
+  mojo::AssociatedBinding<mojom::VideoDecoderClient> client_binding_;
+  MojoMediaLogService media_log_service_;
+  mojo::AssociatedBinding<mojom::MediaLog> media_log_binding_;
 
   bool initialized_ = false;
   bool needs_bitstream_conversion_ = false;
   bool can_read_without_stalling_ = true;
   int32_t max_decode_requests_ = 1;
 
   base::WeakPtr<MojoVideoDecoder> weak_this_;
   base::WeakPtrFactory<MojoVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_VIDEO_DECODER_H_