Add mailbox-based Mojo VideoFrame variant.

media/mojo/clients/mojo_video_decoder.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/clients/mojo_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/unguessable_token.h"
+#include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/video_frame.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
 #include "media/mojo/interfaces/media_types.mojom.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 
 namespace media {
 
 MojoVideoDecoder::MojoVideoDecoder(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     GpuVideoAcceleratorFactories* gpu_factories,
     mojom::VideoDecoderPtr remote_decoder)
     : task_runner_(task_runner),
       remote_decoder_info_(remote_decoder.PassInterface()),
       gpu_factories_(gpu_factories),
-      client_binding_(this) {
+      client_binding_(this),
+      weak_factory_(this) {
   DVLOG(1) << __func__;
 }
 
 MojoVideoDecoder::~MojoVideoDecoder() {
   DVLOG(1) << __func__;
   Stop();
 }
 
 std::string MojoVideoDecoder::GetDisplayName() const {
   // TODO(sandersd): Build the name including information from the remote end.
   return "MojoVideoDecoder";
 }
 
 void MojoVideoDecoder::Initialize(const VideoDecoderConfig& config,
                                   bool low_delay,
                                   CdmContext* cdm_context,
                                   const InitCB& init_cb,
                                   const OutputCB& output_cb) {
   DVLOG(1) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(!cdm_context);
 
+  if (!weak_this_)
+    weak_this_ = weak_factory_.GetWeakPtr();
+
   if (!remote_decoder_bound_)
     BindRemoteDecoder();
 
   if (has_connection_error_) {
     task_runner_->PostTask(FROM_HERE, base::Bind(init_cb, false));
     return;
   }
 
   initialized_ = false;
   init_cb_ = init_cb;
@@ skipping 33 matching lines @@
     return;
   }
 
   uint64_t decode_id = decode_counter_++;
   pending_decodes_[decode_id] = decode_cb;
   remote_decoder_->Decode(std::move(mojo_buffer),
                           base::Bind(&MojoVideoDecoder::OnDecodeDone,
                                      base::Unretained(this), decode_id));
 }
 
-void MojoVideoDecoder::OnVideoFrameDecoded(mojom::VideoFramePtr frame) {
+void MojoVideoDecoder::OnVideoFrameDecoded(

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

Can this be called on multiple threads?

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

No, it is a Mojo IPC callback and so should only be called on the bound thread.

+    mojom::VideoFramePtr frame,
+    const base::Optional<base::UnguessableToken>& release_token) {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
-  output_cb_.Run(frame.To<scoped_refptr<VideoFrame>>());
+
+  scoped_refptr<VideoFrame> video_frame = frame.To<scoped_refptr<VideoFrame>>();
+  if (release_token) {
+    video_frame->SetReleaseMailboxCB(
+        BindToCurrentLoop(base::Bind(&MojoVideoDecoder::OnReleaseMailbox,
+                                     weak_this_, release_token.value())));
+  }
+  output_cb_.Run(std::move(video_frame));
+}
+
+void MojoVideoDecoder::OnReleaseMailbox(
+    const base::UnguessableToken& release_token,
+    const gpu::SyncToken& release_sync_token) {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  remote_decoder_->OnReleaseMailbox(release_token, release_sync_token);
 }
 
 void MojoVideoDecoder::OnDecodeDone(uint64_t decode_id, DecodeStatus status) {
   DVLOG(2) << __func__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   auto it = pending_decodes_.find(decode_id);
   if (it == pending_decodes_.end()) {
     DLOG(ERROR) << "Decode request " << decode_id << " not found";
     Stop();
@@ skipping 87 matching lines @@
 
   for (const auto& pending_decode : pending_decodes_)
     pending_decode.second.Run(DecodeStatus::DECODE_ERROR);
   pending_decodes_.clear();
 
   if (!reset_cb_.is_null())
     base::ResetAndReturn(&reset_cb_).Run();
 }
 
 }  // namespace media