[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() + 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.
 
 // Unit test for VideoCaptureController.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <stdint.h>
 #include <string.h>
@@ skipping 60 matching lines @@
                        mojo::ScopedSharedBufferHandle handle,
                        int length,
                        int buffer_id) override {
     DoBufferCreated(id);
   }
   void OnBufferDestroyed(VideoCaptureControllerID id, int buffer_id) override {
     DoBufferDestroyed(id);
   }
   void OnBufferReady(VideoCaptureControllerID id,
                      int buffer_id,
-                     const scoped_refptr<media::VideoFrame>& frame) override {
-    EXPECT_EQ(expected_pixel_format_, frame->format());
+                     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);
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&VideoCaptureController::ReturnBuffer,
                    base::Unretained(controller_), id, this, buffer_id,
                    gpu::SyncToken(), 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_;
 };
 
 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 class.
 class VideoCaptureControllerTest
     : public testing::Test,
       public testing::WithParamInterface<media::VideoPixelFormat> {
  public:
   VideoCaptureControllerTest() {}
   ~VideoCaptureControllerTest() override {}
 
  protected:
   static const int kPoolSize = 3;
 
   void SetUp() override {
     scoped_refptr<media::VideoCaptureBufferPool> buffer_pool(
         new media::VideoCaptureBufferPoolImpl(
             base::MakeUnique<media::VideoCaptureBufferTrackerFactoryImpl>(),
             kPoolSize));
     controller_.reset(new VideoCaptureController());
     device_client_.reset(new media::VideoCaptureDeviceClient(
         base::MakeUnique<VideoFrameReceiverOnIOThread>(
             controller_->GetWeakPtrForIOThread()),
         buffer_pool,
-        base::Bind(
-            &CreateGpuJpegDecoder,
-            base::Bind(&media::VideoFrameReceiver::OnIncomingCapturedVideoFrame,
-                       controller_->GetWeakPtrForIOThread()))));
-    auto frame_receiver_observer = base::MakeUnique<MockFrameBufferPool>();
-    mock_frame_receiver_observer_ = frame_receiver_observer.get();
-    controller_->SetFrameBufferPool(std::move(frame_receiver_observer));
+        base::Bind(&CreateGpuJpegDecoder,
+                   base::Bind(&media::VideoFrameReceiver::OnFrameReadyInBuffer,
+                              controller_->GetWeakPtrForIOThread()))));
     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(); }
 
   TestBrowserThreadBundle bundle_;
   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();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureControllerTest);
 };
 
 // A simple test of VideoCaptureController's ability to add, remove, and keep
@@ skipping 160 matching lines @@
   }
   {
     InSequence s;
     EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2)).Times(1);
     EXPECT_CALL(*client_a_,
                 DoBufferReady(client_a_route_2, device_format.frame_size))
         .Times(1);
   }
   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))
+      .Times(1);
 
   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();
   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))
+      .Times(1);
 
   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);
@@ skipping 12 matching lines @@
     InSequence s;
     EXPECT_CALL(*client_a_, DoBufferCreated(client_a_route_2)).Times(1);
     EXPECT_CALL(*client_a_,
                 DoBufferReady(client_a_route_2, device_format.frame_size))
         .Times(1);
   }
   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++) {
@@ skipping 176 matching lines @@
   Mock::VerifyAndClearExpectations(client_a_.get());
 
   // Second client connects after the error state. It also should get told of
   // the error.
   EXPECT_CALL(*client_b_, DoError(route_id)).Times(1);
   controller_->AddClient(route_id, client_b_.get(), 200, session_200);
   Mock::VerifyAndClearExpectations(client_b_.get());
 }
 
 }  // namespace content