MojoVideoDecoder: Plumb metadata methods.

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 "media/base/video_decoder.h"
@@ skipping 32 matching lines @@
               const DecodeCB& decode_cb) final;
   void Reset(const base::Closure& closure) final;
   bool NeedsBitstreamConversion() const final;
   bool CanReadWithoutStalling() const final;
   int GetMaxDecodeRequests() const final;
 
   // mojom::VideoDecoderClient implementation.
   void OnVideoFrameDecoded(mojom::VideoFramePtr frame) final;
 
  private:
-  void OnInitializeDone(bool status);
-  void OnDecodeDone(DecodeStatus status);
+  void OnInitializeDone(bool status,
+                        bool needs_bitstream_conversion,
+                        int32_t max_decode_requests);
+  void OnDecodeDone(uint64_t decode_id,
+                    DecodeStatus status,
+                    bool can_read_without_stalling);
   void OnResetDone();
 
   void BindRemoteDecoder();
-  void OnConnectionError();
+
+  // Cleans up callbacks and blocks future calls.
+  void Stop();
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   GpuVideoAcceleratorFactories* gpu_factories_;
 
   // Used to pass the remote decoder from the constructor (on the main thread)
   // to Initialize() (on the media thread).
   mojom::VideoDecoderPtrInfo remote_decoder_info_;
 
   InitCB init_cb_;
   OutputCB output_cb_;
-  DecodeCB decode_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_;
 
+  bool initialized_ = false;
+  bool needs_bitstream_conversion_ = false;
+  bool max_decode_requests_ = 1;

[dcheng, 2016/10/18 20:39:05]

bool?

[sandersd (OOO until July 31), 2016/10/19 18:28:30]

Done.

+  bool can_read_without_stalling_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(MojoVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_CLIENTS_MOJO_VIDEO_DECODER_H_