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

content/browser/renderer_host/media/video_capture_controller_unittest.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include <memory>
@@ skipping 61 matching lines @@
   void OnError(VideoCaptureControllerID id) override { DoError(id); }
   void OnBufferCreated(VideoCaptureControllerID id,
                        mojo::ScopedSharedBufferHandle handle,
                        int length,
                        int buffer_id) override {
     DoBufferCreated(id, buffer_id);
   }
   void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {
     DoBufferDestroyed(id, buffer_id);
   }
-  void OnBufferReady(VideoCaptureControllerID id,
-                     int buffer_id,
-                     const scoped_refptr<media::VideoFrame>& frame) override {
-    EXPECT_EQ(expected_pixel_format_, frame->format());
+  void OnBufferReady(
+      VideoCaptureControllerID id,
+      int buffer_id,
+      const media::mojom::VideoFrameInfoPtr& frame_info) override {
+    EXPECT_EQ(expected_pixel_format_, frame_info->pixel_format);
+    media::VideoFrameMetadata metadata;
+    metadata.MergeInternalValuesFrom(*frame_info->metadata);
     base::TimeTicks reference_time;
-    EXPECT_TRUE(frame->metadata()->GetTimeTicks(
-        media::VideoFrameMetadata::REFERENCE_TIME, &reference_time));
-    DoBufferReady(id, frame->coded_size());
+    EXPECT_TRUE(metadata.GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
+                                      &reference_time));
+    DoBufferReady(id, frame_info->coded_size);
     if (enable_auto_return_buffer_on_buffer_ready_) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer,
                                 base::Unretained(controller_), id, this,
                                 buffer_id, resource_utilization_));
     }
   }
   void OnEnded(VideoCaptureControllerID id) override {
     DoEnded(id);
     // OnEnded() must respond by (eventually) unregistering the client.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(base::IgnoreResult(&VideoCaptureController::RemoveClient),
                    base::Unretained(controller_), id, this));
   }
 
   VideoCaptureController* controller_;
   media::VideoPixelFormat expected_pixel_format_ = media::PIXEL_FORMAT_I420;
   double resource_utilization_;
   bool enable_auto_return_buffer_on_buffer_ready_ = true;
 };
 
 class MockConsumerFeedbackObserver
     : public media::VideoFrameConsumerFeedbackObserver {
  public:
   MOCK_METHOD2(OnUtilizationReport,
                void(int frame_feedback_id, double utilization));
 };
 
-class MockFrameBufferPool : public media::FrameBufferPool {
- public:
-  MOCK_METHOD1(SetBufferHold, void(int buffer_id));
-  MOCK_METHOD1(ReleaseBufferHold, void(int buffer_id));
-};
-
 // Test fixture for testing a unit consisting of an instance of
 // VideoCaptureController connected to an instance of VideoCaptureDeviceClient,
 // an instance of VideoCaptureBufferPoolImpl, as well as related threading glue
 // that replicates how it is used in production.
 class VideoCaptureControllerTest
     : public testing::Test,
       public testing::WithParamInterface<media::VideoPixelFormat> {
  public:
   VideoCaptureControllerTest()
       : arbitrary_format_(gfx::Size(320, 240), 30, media::PIXEL_FORMAT_I420),
         arbitrary_route_id_(0x99),
         arbitrary_session_id_(100) {}
   ~VideoCaptureControllerTest() override {}
 
  protected:
   static const int kPoolSize = 3;
 
   void SetUp() override {
     controller_.reset(new VideoCaptureController());
     InitializeNewDeviceClientAndBufferPoolInstances();
-    auto frame_receiver_observer = base::MakeUnique<MockFrameBufferPool>();
-    mock_frame_receiver_observer_ = frame_receiver_observer.get();
-    controller_->SetFrameBufferPool(std::move(frame_receiver_observer));
     auto consumer_feedback_observer =
         base::MakeUnique<MockConsumerFeedbackObserver>();
     mock_consumer_feedback_observer_ = consumer_feedback_observer.get();
     controller_->SetConsumerFeedbackObserver(
         std::move(consumer_feedback_observer));
     client_a_.reset(
         new MockVideoCaptureControllerEventHandler(controller_.get()));
     client_b_.reset(
         new MockVideoCaptureControllerEventHandler(controller_.get()));
   }
 
   void TearDown() override { base::RunLoop().RunUntilIdle(); }
 
   void InitializeNewDeviceClientAndBufferPoolInstances() {
     buffer_pool_ = new media::VideoCaptureBufferPoolImpl(
         base::MakeUnique<media::VideoCaptureBufferTrackerFactoryImpl>(),
         kPoolSize);
     device_client_.reset(new media::VideoCaptureDeviceClient(
         base::MakeUnique<VideoFrameReceiverOnIOThread>(
             controller_->GetWeakPtrForIOThread()),
         buffer_pool_,
-        base::Bind(
-            &CreateGpuJpegDecoder,
-            base::Bind(&media::VideoFrameReceiver::OnIncomingCapturedVideoFrame,
-                       controller_->GetWeakPtrForIOThread()))));
+        base::Bind(&CreateGpuJpegDecoder,
+                   base::Bind(&media::VideoFrameReceiver::OnFrameReadyInBuffer,
+                              controller_->GetWeakPtrForIOThread()))));
   }
 
   void SendStubFrameToDeviceClient(const media::VideoCaptureFormat format) {
     auto stub_frame = media::VideoFrame::CreateZeroInitializedFrame(
         format.pixel_format, format.frame_size,
         gfx::Rect(format.frame_size.width(), format.frame_size.height()),
         format.frame_size, base::TimeDelta());
     const int rotation = 0;
     const int frame_feedback_id = 0;
     device_client_->OnIncomingCapturedData(
         stub_frame->data(0),
         media::VideoFrame::AllocationSize(stub_frame->format(),
                                           stub_frame->coded_size()),
         format, rotation, base::TimeTicks(), base::TimeDelta(),
         frame_feedback_id);
   }
 
   TestBrowserThreadBundle bundle_;
   scoped_refptr<media::VideoCaptureBufferPool> buffer_pool_;
   std::unique_ptr<MockVideoCaptureControllerEventHandler> client_a_;
   std::unique_ptr<MockVideoCaptureControllerEventHandler> client_b_;
   std::unique_ptr<VideoCaptureController> controller_;
   std::unique_ptr<media::VideoCaptureDevice::Client> device_client_;
-  MockFrameBufferPool* mock_frame_receiver_observer_;
   MockConsumerFeedbackObserver* mock_consumer_feedback_observer_;
   const float arbitrary_frame_rate_ = 10.0f;
   const base::TimeTicks arbitrary_reference_time_ = base::TimeTicks();
   const base::TimeDelta arbitrary_timestamp_ = base::TimeDelta();
   const media::VideoCaptureFormat arbitrary_format_;
   const VideoCaptureControllerID arbitrary_route_id_;
   const media::VideoCaptureSessionId arbitrary_session_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureControllerTest);
@@ skipping 113 matching lines @@
   // Now, simulate an incoming captured buffer from the capture device. As a
   // side effect this will cause the first buffer to be shared with clients.
   uint8_t buffer_no = 1;
   const int arbitrary_frame_feedback_id = 101;
   ASSERT_EQ(0.0, device_client_->GetBufferPoolUtilization());
   media::VideoCaptureDevice::Client::Buffer buffer =
       device_client_->ReserveOutputBuffer(
           device_format.frame_size, device_format.pixel_format,
           device_format.pixel_storage, arbitrary_frame_feedback_id);
   ASSERT_TRUE(buffer.is_valid());
-  auto buffer_access = buffer.handle_provider()->GetHandleForInProcessAccess();
+  auto buffer_access = buffer.handle_provider->GetHandleForInProcessAccess();
   ASSERT_EQ(1.0 / kPoolSize, device_client_->GetBufferPoolUtilization());
   memset(buffer_access->data(), buffer_no++, buffer_access->mapped_size());
   {
     InSequence s;
-    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_1, _)).Times(1);
+    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_1, _));
     EXPECT_CALL(*client_a_,
-                DoBufferReady(client_a_route_1, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_a_route_1, device_format.frame_size));
   }
   {
     InSequence s;
-    EXPECT_CALL(*client_b_, DoBufferCreated(client_b_route_1, _)).Times(1);
+    EXPECT_CALL(*client_b_, DoBufferCreated(client_b_route_1, _));
     EXPECT_CALL(*client_b_,
-                DoBufferReady(client_b_route_1, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_b_route_1, device_format.frame_size));
   }
   {
     InSequence s;
-    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2, _)).Times(1);
+    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2, _));
     EXPECT_CALL(*client_a_,
-                DoBufferReady(client_a_route_2, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_a_route_2, device_format.frame_size));
   }
   client_a_->resource_utilization_ = 0.5;
   client_b_->resource_utilization_ = -1.0;
-  {
-    InSequence s;
-    EXPECT_CALL(*mock_frame_receiver_observer_, SetBufferHold(buffer.id()))
-        .Times(1);
-    // Expect VideoCaptureController to call the load observer with a
-    // resource utilization of 0.5 (the largest of all reported values).
-    EXPECT_CALL(*mock_consumer_feedback_observer_,
-                OnUtilizationReport(arbitrary_frame_feedback_id, 0.5))
-        .Times(1);
-    EXPECT_CALL(*mock_frame_receiver_observer_, ReleaseBufferHold(buffer.id()))
-        .Times(1);
-  }
+  // Expect VideoCaptureController to call the load observer with a
+  // resource utilization of 0.5 (the largest of all reported values).
+  EXPECT_CALL(*mock_consumer_feedback_observer_,
+              OnUtilizationReport(arbitrary_frame_feedback_id, 0.5));
 
   device_client_->OnIncomingCapturedBuffer(std::move(buffer), device_format,
                                            arbitrary_reference_time_,
                                            arbitrary_timestamp_);
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(client_a_.get());
   Mock::VerifyAndClearExpectations(client_b_.get());
   Mock::VerifyAndClearExpectations(mock_consumer_feedback_observer_);
-  Mock::VerifyAndClearExpectations(mock_frame_receiver_observer_);
 
   // Second buffer which ought to use the same shared memory buffer. In this
   // case pretend that the Buffer pointer is held by the device for a long
   // delay. This shouldn't affect anything.
   const int arbitrary_frame_feedback_id_2 = 102;
   media::VideoCaptureDevice::Client::Buffer buffer2 =
       device_client_->ReserveOutputBuffer(
           device_format.frame_size, device_format.pixel_format,
           device_format.pixel_storage, arbitrary_frame_feedback_id_2);
   ASSERT_TRUE(buffer2.is_valid());
-  auto buffer2_access =
-      buffer2.handle_provider()->GetHandleForInProcessAccess();
+  auto buffer2_access = buffer2.handle_provider->GetHandleForInProcessAccess();
   memset(buffer2_access->data(), buffer_no++, buffer2_access->mapped_size());
   client_a_->resource_utilization_ = 0.5;
   client_b_->resource_utilization_ = 3.14;
   // Expect VideoCaptureController to call the load observer with a
   // resource utilization of 3.14 (the largest of all reported values).
-  {
-    InSequence s;
-    EXPECT_CALL(*mock_frame_receiver_observer_, SetBufferHold(buffer2.id()))
-        .Times(1);
-    // Expect VideoCaptureController to call the load observer with a
-    // resource utilization of 3.14 (the largest of all reported values).
-    EXPECT_CALL(*mock_consumer_feedback_observer_,
-                OnUtilizationReport(arbitrary_frame_feedback_id_2, 3.14))
-        .Times(1);
-    EXPECT_CALL(*mock_frame_receiver_observer_, ReleaseBufferHold(buffer2.id()))
-        .Times(1);
-  }
+  EXPECT_CALL(*mock_consumer_feedback_observer_,
+              OnUtilizationReport(arbitrary_frame_feedback_id_2, 3.14));
 
   device_client_->OnIncomingCapturedBuffer(std::move(buffer2), device_format,
                                            arbitrary_reference_time_,
                                            arbitrary_timestamp_);
 
   // The buffer should be delivered to the clients in any order.
   {
     InSequence s;
-    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_1, _)).Times(1);
+    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_1, _));
     EXPECT_CALL(*client_a_,
-                DoBufferReady(client_a_route_1, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_a_route_1, device_format.frame_size));
   }
   {
     InSequence s;
-    EXPECT_CALL(*client_b_, DoBufferCreated(client_b_route_1, _)).Times(1);
+    EXPECT_CALL(*client_b_, DoBufferCreated(client_b_route_1, _));
     EXPECT_CALL(*client_b_,
-                DoBufferReady(client_b_route_1, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_b_route_1, device_format.frame_size));
   }
   {
     InSequence s;
-    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2, _)).Times(1);
+    EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2, _));
     EXPECT_CALL(*client_a_,
-                DoBufferReady(client_a_route_2, device_format.frame_size))
-        .Times(1);
+                DoBufferReady(client_a_route_2, device_format.frame_size));
   }
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(client_a_.get());
   Mock::VerifyAndClearExpectations(client_b_.get());
   Mock::VerifyAndClearExpectations(mock_consumer_feedback_observer_);
-  Mock::VerifyAndClearExpectations(mock_frame_receiver_observer_);
 
   // Add a fourth client now that some buffers have come through.
   controller_->AddClient(client_b_route_2, client_b_.get(), 1, session_1);
   Mock::VerifyAndClearExpectations(client_b_.get());
 
   // Third, fourth, and fifth buffers. Pretend they all arrive at the same time.
   for (int i = 0; i < kPoolSize; i++) {
     const int arbitrary_frame_feedback_id = 200 + i;
     media::VideoCaptureDevice::Client::Buffer buffer =
         device_client_->ReserveOutputBuffer(
             device_format.frame_size, device_format.pixel_format,
             device_format.pixel_storage, arbitrary_frame_feedback_id);
     ASSERT_TRUE(buffer.is_valid());
-    auto buffer_access =
-        buffer.handle_provider()->GetHandleForInProcessAccess();
+    auto buffer_access = buffer.handle_provider->GetHandleForInProcessAccess();
     memset(buffer_access->data(), buffer_no++, buffer_access->mapped_size());
     device_client_->OnIncomingCapturedBuffer(std::move(buffer), device_format,
                                              arbitrary_reference_time_,
                                              arbitrary_timestamp_);
   }
   // ReserveOutputBuffer ought to fail now, because the pool is depleted.
   ASSERT_FALSE(device_client_
                    ->ReserveOutputBuffer(
                        device_format.frame_size, device_format.pixel_format,
                        device_format.pixel_storage, arbitrary_frame_feedback_id)
@@ skipping 30 matching lines @@
   controller_->RemoveClient(client_a_route_1, client_a_.get());
   // Kill B1 via session close (posts a task to disconnect).
   EXPECT_CALL(*client_b_, DoEnded(client_b_route_1)).Times(1);
   controller_->StopSession(300);
   // Queue up another buffer.
   media::VideoCaptureDevice::Client::Buffer buffer3 =
       device_client_->ReserveOutputBuffer(
           device_format.frame_size, device_format.pixel_format,
           device_format.pixel_storage, arbitrary_frame_feedback_id);
   ASSERT_TRUE(buffer3.is_valid());
-  auto buffer3_access =
-      buffer3.handle_provider()->GetHandleForInProcessAccess();
+  auto buffer3_access = buffer3.handle_provider->GetHandleForInProcessAccess();
   memset(buffer3_access->data(), buffer_no++, buffer3_access->mapped_size());
   device_client_->OnIncomingCapturedBuffer(std::move(buffer3), device_format,
                                            arbitrary_reference_time_,
                                            arbitrary_timestamp_);
 
   media::VideoCaptureDevice::Client::Buffer buffer4 =
       device_client_->ReserveOutputBuffer(
           device_format.frame_size, device_format.pixel_format,
           device_format.pixel_storage, arbitrary_frame_feedback_id);
   {
     // Kill A2 via session close (posts a task to disconnect, but A2 must not
     // be sent either of these two buffers).
     EXPECT_CALL(*client_a_, DoEnded(client_a_route_2)).Times(1);
     controller_->StopSession(200);
   }
   ASSERT_TRUE(buffer4.is_valid());
-  auto buffer4_access =
-      buffer4.handle_provider()->GetHandleForInProcessAccess();
+  auto buffer4_access = buffer4.handle_provider->GetHandleForInProcessAccess();
   memset(buffer4_access->data(), buffer_no++, buffer4_access->mapped_size());
   device_client_->OnIncomingCapturedBuffer(std::move(buffer4), device_format,
                                            arbitrary_reference_time_,
                                            arbitrary_timestamp_);
   // B2 is the only client left, and is the only one that should
   // get the buffer.
   EXPECT_CALL(*client_b_,
               DoBufferReady(client_b_route_2, device_format.frame_size))
       .Times(2);
   base::RunLoop().RunUntilIdle();
@@ skipping 300 matching lines @@
   // buffer is expected to stay alive.
   EXPECT_CALL(*client_a_, DoBufferDestroyed(_, first_buffer_id)).Times(0);
   EXPECT_CALL(*client_a_, DoBufferDestroyed(_, second_buffer_id)).Times(0);
   controller_->ReturnBuffer(arbitrary_route_id_, client_a_.get(),
                             second_buffer_id, arbitrary_utilization);
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(client_a_.get());
 }
 
 }  // namespace content