[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() + OnFrameReadyInBuffer()

media/capture/video/video_capture_device_client.cc

Index: media/capture/video/video_capture_device_client.cc
diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc
index 7bc7b2212189f04784d7239b9c289c830d6261c4..9e5f7de748a6aefdf8a5d8aef47bfafe9167968f 100644
--- a/media/capture/video/video_capture_device_client.cc
+++ b/media/capture/video/video_capture_device_client.cc
@@ -21,7 +21,6 @@
 #include "media/capture/video/video_capture_jpeg_decoder.h"
 #include "media/capture/video/video_frame_receiver.h"
 #include "media/capture/video_capture_types.h"
-#include "mojo/public/cpp/system/platform_handle.h"
 #include "third_party/libyuv/include/libyuv.h"
 
 using media::VideoCaptureFormat;
@@ -57,6 +56,25 @@ class BufferPoolProducerReservation : public Ownership {
   const int buffer_id_;
 };
 
+class BufferPoolConsumerReservation : public Ownership {
+ public:
+  BufferPoolConsumerReservation(
+      scoped_refptr<VideoCaptureBufferPool> buffer_pool,
+      int buffer_id)
+      : buffer_pool_(std::move(buffer_pool)), buffer_id_(buffer_id) {
+    // The code invoking this contstructor is supposed to have already set a
+    // consumer hold on the buffer from pool.
+  }
+
+  ~BufferPoolConsumerReservation() override {
+    buffer_pool_->RelinquishConsumerHold(buffer_id_, 1);
+  }
+
+ private:
+  const scoped_refptr<VideoCaptureBufferPool> buffer_pool_;
+  const int buffer_id_;
+};
+
 class BufferPoolBufferHandleProvider : public BufferHandleProvider {
  public:
   BufferPoolBufferHandleProvider(
@@ -92,6 +110,10 @@ VideoCaptureDeviceClient::~VideoCaptureDeviceClient() {
   // This should be on the platform auxiliary thread since
   // |external_jpeg_decoder_| need to be destructed on the same thread as
   // OnIncomingCapturedData.
+
+  for (int buffer_id : buffer_ids_known_by_receiver_) {
+    receiver_->OnBufferRetired(buffer_id);
+  }
 }
 
 void VideoCaptureDeviceClient::OnIncomingCapturedData(
@@ -278,6 +300,7 @@ VideoCaptureDeviceClient::ReserveOutputBuffer(
     media::VideoPixelFormat pixel_format,
     media::VideoPixelStorage pixel_storage,
     int frame_feedback_id) {
+  DFAKE_SCOPED_RECURSIVE_LOCK(call_from_producer_);
   DCHECK_GT(frame_size.width(), 0);
   DCHECK_GT(frame_size.height(), 0);
   DCHECK(IsFormatSupported(pixel_format));
@@ -286,8 +309,15 @@ VideoCaptureDeviceClient::ReserveOutputBuffer(
   const int buffer_id =
       buffer_pool_->ReserveForProducer(frame_size, pixel_format, pixel_storage,
                                        frame_feedback_id, &buffer_id_to_drop);
-  if (buffer_id_to_drop != VideoCaptureBufferPool::kInvalidId)
-    receiver_->OnBufferDestroyed(buffer_id_to_drop);
+  if (buffer_id_to_drop != VideoCaptureBufferPool::kInvalidId) {
+    // Buffer pool has decided to releasea buffer. Notify receiver in case
+    // the buffer has already been shared with it.
+    if (buffer_ids_known_by_receiver_.find(buffer_id_to_drop) !=
+        buffer_ids_known_by_receiver_.end()) {
+      buffer_ids_known_by_receiver_.erase(buffer_id_to_drop);
+      receiver_->OnBufferRetired(buffer_id_to_drop);
+    }
+  }
   if (buffer_id == VideoCaptureBufferPool::kInvalidId)
     return Buffer();
   return MakeBufferStruct(buffer_pool_, buffer_id, frame_feedback_id);
@@ -298,6 +328,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedBuffer(
     const VideoCaptureFormat& format,
     base::TimeTicks reference_time,
     base::TimeDelta timestamp) {
+  DFAKE_SCOPED_RECURSIVE_LOCK(call_from_producer_);
   OnIncomingCapturedBufferExt(std::move(buffer), format, reference_time,
                               timestamp, gfx::Rect(format.frame_size),
                               VideoFrameMetadata());
@@ -310,35 +341,35 @@ void VideoCaptureDeviceClient::OnIncomingCapturedBufferExt(
     base::TimeDelta timestamp,
     gfx::Rect visible_rect,
     const VideoFrameMetadata& additional_metadata) {
-  auto buffer_mojo_handle =
-      buffer_pool_->GetHandleForInterProcessTransit(buffer.id());
-  base::SharedMemoryHandle memory_handle;
-  size_t memory_size = 0;
-  bool read_only_flag = false;
-  const MojoResult unwrap_result_code = mojo::UnwrapSharedMemoryHandle(
-      std::move(buffer_mojo_handle), &memory_handle, &memory_size,
-      &read_only_flag);
-  DCHECK_EQ(MOJO_RESULT_OK, unwrap_result_code);
+  DFAKE_SCOPED_RECURSIVE_LOCK(call_from_producer_);
 
-  auto buffer_access = buffer.handle_provider->GetHandleForInProcessAccess();
-  scoped_refptr<media::VideoFrame> frame =
-      media::VideoFrame::WrapExternalSharedMemory(
-          format.pixel_format,           // format
-          format.frame_size,             // coded_size
-          visible_rect,                  // visible_rect
-          format.frame_size,             // natural_size
-          buffer_access->data(),         // data
-          buffer_access->mapped_size(),  // data_size
-          memory_handle,                 // handle
-          0,                             // shared_memory_offset
-          timestamp);                    // timestamp
-  frame->metadata()->MergeMetadataFrom(&additional_metadata);
-  frame->metadata()->SetDouble(media::VideoFrameMetadata::FRAME_RATE,
-                               format.frame_rate);
-  frame->metadata()->SetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
-                                  reference_time);
-
-  receiver_->OnIncomingCapturedVideoFrame(std::move(buffer), std::move(frame));
+  if (buffer_ids_known_by_receiver_.find(buffer.id()) ==
+      buffer_ids_known_by_receiver_.end()) {
+    receiver_->OnNewBufferHandle(buffer.id(),
+                                 std::move(buffer.handle_provider));
+    buffer_ids_known_by_receiver_.insert(buffer.id());
+  }
+
+  VideoFrameMetadata metadata;
+  metadata.MergeMetadataFrom(&additional_metadata);
+  metadata.SetDouble(media::VideoFrameMetadata::FRAME_RATE, format.frame_rate);
+  metadata.SetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
+                        reference_time);
+
+  mojom::VideoFrameInfoPtr info = mojom::VideoFrameInfo::New();
+  info->timestamp = timestamp;
+  info->pixel_format = format.pixel_format;
+  info->storage_type = format.pixel_storage;
+  info->coded_size = format.frame_size;
+  info->visible_rect = visible_rect;
+  info->metadata = metadata.CopyInternalValues();
+
+  buffer_pool_->HoldForConsumers(buffer.id(), 1);
+  receiver_->OnFrameReadyInBuffer(
+      buffer.id(), buffer.frame_feedback_id(),
+      base::MakeUnique<BufferPoolConsumerReservation>(buffer_pool_,
+                                                      buffer.id()),
+      std::move(info));
 }
 
 media::VideoCaptureDevice::Client::Buffer
@@ -347,6 +378,7 @@ VideoCaptureDeviceClient::ResurrectLastOutputBuffer(
     media::VideoPixelFormat format,
     media::VideoPixelStorage storage,
     int new_frame_feedback_id) {
+  DFAKE_SCOPED_RECURSIVE_LOCK(call_from_producer_);
   const int buffer_id =
       buffer_pool_->ResurrectLastForProducer(dimensions, format, storage);
   if (buffer_id == VideoCaptureBufferPool::kInvalidId)