Improve VideoCaptureImpl unittest.

content/renderer/media/video_capture_impl_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 "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "media/base/bind_to_current_loop.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::AtLeast;
@@ skipping 12 matching lines @@
   // Filter implementation.
   MOCK_METHOD1(Send, bool(IPC::Message* message));
 
  protected:
   virtual ~MockVideoCaptureMessageFilter() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureMessageFilter);
 };
 
-class VideoCaptureImplTest : public ::testing::Test {
+struct BufferReceivedTestArg {
+  BufferReceivedTestArg(int buffer_id,
+                        media::VideoPixelFormat pixel_format,
+                        media::VideoCapturePixelFormat capture_pixel_format,
+                        const gfx::Size& coded_size,
+                        const gpu::MailboxHolder& mailbox_holder)
+      : buffer_id(buffer_id), pixel_format(pixel_format),
+        capture_pixel_format(capture_pixel_format), coded_size(coded_size),
+        mailbox_holder(mailbox_holder) {}
+
+  int buffer_id;
+  media::VideoPixelFormat pixel_format;
+  media::VideoCapturePixelFormat capture_pixel_format;
+  const gfx::Size coded_size;
+  const gpu::MailboxHolder mailbox_holder;
+};
+
+class VideoCaptureImplTest :
+    public ::testing::TestWithParam<BufferReceivedTestArg> {
  public:
   class MockVideoCaptureImpl : public VideoCaptureImpl {
    public:
     MockVideoCaptureImpl(const media::VideoCaptureSessionId id,
                          VideoCaptureMessageFilter* filter)
-        : VideoCaptureImpl(id, filter) {
+        : VideoCaptureImpl(id, filter), received_buffer_count_(0) {
     }
     ~MockVideoCaptureImpl() override {}
 
     // Override Send() to mimic device to send events.
     void Send(IPC::Message* message) override {
       CHECK(message);
 
       // In this method, messages are sent to the according handlers as if
       // we are the device.
       bool handled = true;
@@ skipping 11 matching lines @@
       IPC_END_MESSAGE_MAP()
       EXPECT_TRUE(handled);
       delete message;
     }
 
     void DeviceStartCapture(int device_id,
                             media::VideoCaptureSessionId session_id,
                             const media::VideoCaptureParams& params) {
       // Do not call OnStateChanged(VIDEO_CAPTURE_STATE_STARTED) here, as this
       // does not accurately reflect the behavior of the VideoCaptureHost.
-      capture_params_ = params;
     }
 
     void DevicePauseCapture(int device_id) {}

[mcasas, 2015/09/01 18:09:53]

Suggest mocking these two fellas since they do nothing
and have no scoped_ptr<> args (keep the comment):

MOCK_METHOD3(DeviceStartCapture,
             void(int device_id,
                  media::VideoCaptureSessionId session_id,
                  const media::VideoCaptureParams& params));
MOCK_METHOD1(DevicePauseCapture, void(int device_id));

So we also get alarmed/warned if these
methods get pinged when they shouldn't,
since non-explicit EXPECTs mean .Times(0).

As a side note I guess it should be done with
all these methods, i.e. add on ctor sth like

ON_CALL(bla)..WillByDefault(Invoke(foo()));

allowing for finer method call control.

[msu.koo, 2015/09/02 08:38:10]

It's better approach but I think changing these functions is not under this
patch's scope. How about handling it separately?

On 2015/09/01 18:09:53, mcasas wrote:

[mcasas, 2015/09/02 16:51:26]

SGTM, you can do that in a CL afterwards 
but usually we add a TODO() here.

 
     void DeviceStopCapture(int device_id) {
       OnStateChanged(VIDEO_CAPTURE_STATE_STOPPED);
     }
 
     void DeviceReceiveEmptyBuffer(int device_id,
                                   int buffer_id,
                                   uint32 sync_point,
-                                  double consumer_resource_utilization) {}
+                                  double consumer_resource_utilization) {
+      received_buffer_count_++;
+    }
 
     void DeviceGetSupportedFormats(int device_id,
                                    media::VideoCaptureSessionId session_id) {
       // When the mock message filter receives a request for the device
       // supported formats, replies immediately with an empty format list.
       OnDeviceSupportedFormatsEnumerated(media::VideoCaptureFormats());
     }
 
     void DeviceGetFormatsInUse(int device_id,
                                media::VideoCaptureSessionId session_id) {
       OnDeviceFormatsInUseReceived(media::VideoCaptureFormats());
     }
 
     void ReceiveStateChangeMessage(VideoCaptureState state) {
       OnStateChanged(state);
     }
 
-    const media::VideoCaptureParams& capture_params() const {
-      return capture_params_;
-    }
+    int received_buffer_count() const { return received_buffer_count_; }
 
    private:
-    media::VideoCaptureParams capture_params_;
+    int received_buffer_count_;
   };
 
   VideoCaptureImplTest() {
     params_small_.requested_format = media::VideoCaptureFormat(
         gfx::Size(176, 144), 30, media::VIDEO_CAPTURE_PIXEL_FORMAT_I420);
 
     params_large_.requested_format = media::VideoCaptureFormat(
         gfx::Size(320, 240), 30, media::VIDEO_CAPTURE_PIXEL_FORMAT_I420);
 
     child_process_.reset(new ChildProcess());
@@ skipping 26 matching lines @@
   void StartCapture(const media::VideoCaptureParams& params) {
     video_capture_impl_->StartCapture(
         params, base::Bind(&VideoCaptureImplTest::OnStateUpdate,
                            base::Unretained(this)),
         base::Bind(&VideoCaptureImplTest::OnFrameReady,
                    base::Unretained(this)));
   }
 
   void StopCapture() { video_capture_impl_->StopCapture(); }
 
+  void NewBuffer(int buffer_id, const base::SharedMemory& shm) {
+    video_capture_impl_->OnBufferCreated(
+        base::SharedMemory::DuplicateHandle(shm.handle()),
+        shm.mapped_size(), buffer_id);
+  }
+
+  void BufferReceived(int buffer_id, const gfx::Size& size,
+                      media::VideoPixelFormat pixel_format,
+                      const gpu::MailboxHolder& mailbox_holder) {
+    video_capture_impl_->OnBufferReceived(
+        buffer_id, base::TimeTicks::Now(), base::DictionaryValue(),
+        pixel_format, media::VideoFrame::STORAGE_SHMEM, size,
+        gfx::Rect(size), mailbox_holder);
+  }
+
+  void BufferDestroyed(int buffer_id) {
+    video_capture_impl_->OnBufferDestroyed(buffer_id);
+  }
+
   void DeInit() {
     video_capture_impl_->DeInit();
   }
 
   void GetDeviceSupportedFormats() {
     const base::Callback<void(const media::VideoCaptureFormats&)>
         callback = base::Bind(
             &VideoCaptureImplTest::OnDeviceSupportedFormats,
             base::Unretained(this));
     video_capture_impl_->GetDeviceSupportedFormats(callback);
@@ skipping 54 matching lines @@
 // Check that a request to GetDeviceFormatsInUse() ends up eventually in the
 // provided callback.
 TEST_F(VideoCaptureImplTest, GetDeviceFormatsInUse) {
   EXPECT_CALL(*this, OnDeviceFormatsInUse(_));
 
   Init();
   GetDeviceFormatsInUse();
   DeInit();
 }
 
+TEST_P(VideoCaptureImplTest, BufferReceivedWithFormat) {
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
+  EXPECT_CALL(*this, OnFrameReady(_, _)).Times(1);
+
+  const BufferReceivedTestArg& buffer_arg = GetParam();
+
+  // Create a fake shared memory for buffer.
+  base::SharedMemory shm;
+  const size_t frame_size = media::VideoFrame::AllocationSize(
+      buffer_arg.pixel_format, buffer_arg.coded_size);
+  ASSERT_TRUE(shm.CreateAndMapAnonymous(frame_size));
+
+  media::VideoCaptureParams params;
+  params.requested_format = media::VideoCaptureFormat(
+      buffer_arg.coded_size, 30, buffer_arg.capture_pixel_format);
+
+  Init();
+  StartCapture(params);
+  NewBuffer(buffer_arg.buffer_id, shm);
+  BufferReceived(buffer_arg.buffer_id, buffer_arg.coded_size,
+                 buffer_arg.pixel_format, buffer_arg.mailbox_holder);
+  StopCapture();
+  BufferDestroyed(buffer_arg.buffer_id);
+  DeInit();
+}
+
+const BufferReceivedTestArg kBufferFormats[]  = {
+  BufferReceivedTestArg(0, media::PIXEL_FORMAT_I420,
+                        media::VIDEO_CAPTURE_PIXEL_FORMAT_I420,
+                        gfx::Size(1280, 720),
+                        gpu::MailboxHolder()),
+  BufferReceivedTestArg(0, media::PIXEL_FORMAT_ARGB,
+                        media::VIDEO_CAPTURE_PIXEL_FORMAT_ARGB,
+                        gfx::Size(1280, 720),
+                        gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0))};
+
+INSTANTIATE_TEST_CASE_P(I420AndARGB,
+                        VideoCaptureImplTest,
+                        testing::ValuesIn(kBufferFormats));

[mcasas, 2015/09/01 18:09:53]

I meant defining it inside the INSTANTIATE_...
so we don't create unnecessary symbols:

INSTANTIATE_TEST_CASE_P(
    I420AndARGB,
    VideoCaptureImplTest,
    testing::ValuesIn(
        BufferReceivedTestArg(
            media::PIXEL_FORMAT_I420,
            media::VIDEO_CAPTURE_PIXEL_FORMAT_I420,
            gpu::MailboxHolder()),
        BufferReceivedTestArg(
            media::PIXEL_FORMAT_ARGB,
            media::VIDEO_CAPTURE_PIXEL_FORMAT_ARGB,
            gpu::MailboxHolder(gpu::Mailbox::Generate(), 0, 0))));

(Took the liberty of removing |buffer_id|and |coded_size|).

But on second thoughts and after searching the
code base, this doesn't seem popular at all, so
please revert it to defining |kBufferFormats| after
the struct, apologies! (And make it |static|).

[msu.koo, 2015/09/02 08:38:10]

Done.

+
+TEST_F(VideoCaptureImplTest, BufferReceivedAfterStop) {
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED)).Times(1);
+  EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED)).Times(1);
+  EXPECT_CALL(*this, OnFrameReady(_, _)).Times(0);
+
+  // Create a fake shared memory for buffer.
+  base::SharedMemory shm;
+  const size_t i420_frame_size = media::VideoFrame::AllocationSize(
+      media::PIXEL_FORMAT_I420, params_large_.requested_format.frame_size);
+  ASSERT_TRUE(shm.CreateAndMapAnonymous(i420_frame_size));
+
+  Init();
+  StartCapture(params_large_);
+  NewBuffer(0, shm);
+  StopCapture();
+  BufferReceived(0, params_large_.requested_format.frame_size,
+                 media::PIXEL_FORMAT_I420, gpu::MailboxHolder());
+  BufferDestroyed(0);
+  DeInit();
+
+  EXPECT_EQ(this->video_capture_impl_->received_buffer_count(), 1);
+}
+
 TEST_F(VideoCaptureImplTest, EndedBeforeStop) {
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED));
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STOPPED));
 
    Init();
    StartCapture(params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ENDED);
 
    StopCapture();
    DeInit();
 }
 
 TEST_F(VideoCaptureImplTest, ErrorBeforeStop) {
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_STARTED));
    EXPECT_CALL(*this, OnStateUpdate(VIDEO_CAPTURE_STATE_ERROR));
 
    Init();
    StartCapture(params_small_);
 
    // Receive state change message from browser.
    video_capture_impl_->ReceiveStateChangeMessage(VIDEO_CAPTURE_STATE_ERROR);
 
    StopCapture();
    DeInit();
 }
 
 }  // namespace content