Add mailbox-based Mojo VideoFrame variant.

media/mojo/services/mojo_video_decoder_service.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_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/optional.h"

[nasko, 2017/02/16 21:37:29]

Where is base::optional used here? Do we really need this include?

[sandersd (OOO until July 31), 2017/02/25 01:19:38]

Done.

 #include "media/base/decode_status.h"
 #include "media/mojo/interfaces/video_decoder.mojom.h"
 
+namespace gpu {
+struct SyncToken;
+};
+
 namespace media {
 
 class MojoDecoderBufferReader;
 class MojoMediaClient;
 class VideoDecoder;
 class VideoFrame;
 
 // Implementation of a mojom::VideoDecoder which runs in the GPU process,
 // and wraps a media::VideoDecoder.
 class MojoVideoDecoderService : public mojom::VideoDecoder {
  public:
   explicit MojoVideoDecoderService(MojoMediaClient* mojo_media_client);
   ~MojoVideoDecoderService() final;
 
   // mojom::VideoDecoder implementation
   void Construct(mojom::VideoDecoderClientAssociatedPtrInfo client,
                  mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe,
                  mojom::CommandBufferIdPtr command_buffer_id) final;
   void Initialize(mojom::VideoDecoderConfigPtr config,
                   bool low_delay,
                   const InitializeCallback& callback) final;
   void Decode(mojom::DecoderBufferPtr buffer,
               const DecodeCallback& callback) final;
   void Reset(const ResetCallback& callback) final;
+  void OnReleaseMailbox(const base::UnguessableToken& release_token,
+                        const gpu::SyncToken& release_sync_token) final;
 
  private:
   // Helper methods so that we can bind them with a weak pointer to avoid
   // running mojom::VideoDecoder callbacks after connection error happens and
   // |this| is deleted. It's not safe to run the callbacks after a connection
   // error.
   void OnDecoderInitialized(const InitializeCallback& callback, bool success);
   void OnDecoderRead(const DecodeCallback& callback,
                      scoped_refptr<DecoderBuffer> buffer);
   void OnDecoderDecoded(const DecodeCallback& callback, DecodeStatus status);
   void OnDecoderReset(const ResetCallback& callback);
 
   void OnDecoderOutput(const scoped_refptr<VideoFrame>& frame);
 
   mojom::VideoDecoderClientAssociatedPtr client_;
   std::unique_ptr<MojoDecoderBufferReader> mojo_decoder_buffer_reader_;
 
   MojoMediaClient* mojo_media_client_;
   std::unique_ptr<media::VideoDecoder> decoder_;
 
   base::WeakPtr<MojoVideoDecoderService> weak_this_;
   base::WeakPtrFactory<MojoVideoDecoderService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoVideoDecoderService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_