MojoVideoDecoder: Plumb metadata methods.

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/threading/thread_task_runner_handle.h"
@@ skipping 19 matching lines @@
 MojoVideoDecoderService::~MojoVideoDecoderService() {}
 
 void MojoVideoDecoderService::Construct(
     mojom::VideoDecoderClientAssociatedPtrInfo client,
     mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe) {
   DVLOG(1) << __FUNCTION__;
 
   if (decoder_)
     return;
 
-  // TODO(sandersd): Provide callback for requesting a stub.
+  // TODO(sandersd): Provide callback for requesting a GpuCommandBufferStub.
   decoder_ = mojo_media_client_->CreateVideoDecoder(
       base::ThreadTaskRunnerHandle::Get());
 
   client_.Bind(std::move(client));
 
   mojo_decoder_buffer_reader_.reset(
       new MojoDecoderBufferReader(std::move(decoder_buffer_pipe)));
 }
 
 void MojoVideoDecoderService::Initialize(mojom::VideoDecoderConfigPtr config,
                                          bool low_delay,
                                          const InitializeCallback& callback) {
   DVLOG(1) << __FUNCTION__;
 
   if (!decoder_) {
-    callback.Run(false);
+    callback.Run(false, false, 1);
     return;
   }
 
   decoder_->Initialize(
       config.To<VideoDecoderConfig>(), low_delay, nullptr,
       base::Bind(&MojoVideoDecoderService::OnDecoderInitialized, weak_this_,
                  callback),
       base::Bind(&MojoVideoDecoderService::OnDecoderOutput, weak_this_));
 }
 
 void MojoVideoDecoderService::Decode(mojom::DecoderBufferPtr buffer,
                                      const DecodeCallback& callback) {
-  DVLOG(1) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__;
 
   if (!decoder_) {
     callback.Run(DecodeStatus::DECODE_ERROR);
     return;
   }
 
   // TODO(sandersd): After a decode error, we should enter an error state and
   // reject all future method calls.
   scoped_refptr<DecoderBuffer> media_buffer =
       mojo_decoder_buffer_reader_->ReadDecoderBuffer(buffer);
@@ skipping 16 matching lines @@
   }
 
   decoder_->Reset(base::Bind(&MojoVideoDecoderService::OnDecoderReset,
                              weak_this_, callback));
 }
 
 void MojoVideoDecoderService::OnDecoderInitialized(
     const InitializeCallback& callback,
     bool success) {
   DVLOG(1) << __FUNCTION__;
-  callback.Run(success);
+  DCHECK(decoder_);
+  callback.Run(success, decoder_->NeedsBitstreamConversion(),
+               decoder_->GetMaxDecodeRequests());
 }
 
 void MojoVideoDecoderService::OnDecoderDecoded(const DecodeCallback& callback,
                                                DecodeStatus status) {
-  DVLOG(1) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__;
+  DCHECK(decoder_);
+  DCHECK(decoder_->CanReadWithoutStalling());
   callback.Run(status);
 }
 
 void MojoVideoDecoderService::OnDecoderReset(const ResetCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   callback.Run();
 }
 
 void MojoVideoDecoderService::OnDecoderOutput(
     const scoped_refptr<VideoFrame>& frame) {
-  DVLOG(1) << __FUNCTION__;
+  DVLOG(2) << __FUNCTION__;
   DCHECK(client_);
   client_->OnVideoFrameDecoded(mojom::VideoFrame::From(frame));
 }
 
 }  // namespace media