Adding VideoCaptureDevice for Mac.

media/video/capture/video_capture_device_unittest.cc

 // Copyright (c) 2011 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/scoped_ptr.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/video_capture_device.h"
+#include "media/video/capture/video_capture_device_unittest_helper.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_MACOSX)
+// The camera is 'locked' by the application once started on MAC OS X, not when

[dmac, 2011/10/14 23:31:35]

s/MAC/Mac/

[mflodman_chromium_OOO, 2011/10/16 21:58:38]

Done.

+// allocated as for Windows and Linux, and this test case will fail.
+#define MAYBE_AllocateSameCameraTwice DISABLED_AllocateSameCameraTwice
+#else
+#define MAYBE_AllocateSameCameraTwice AllocateSameCameraTwice
+#endif
+
+#if defined(OS_MACOSX)
+// Mac/QTKit will always give you the size you ask for and this case will fail.
+#define MAYBE_AllocateBadSize DISABLED_AllocateBadSize
+#else
+#define MAYBE_AllocateBadSize AllocateBadSize
+#endif
+
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Return;
 using ::testing::AtLeast;
 
 namespace media {
 
 class MockFrameObserver: public media::VideoCaptureDevice::EventHandler {

[dmac, 2011/10/14 23:31:35]

space between r and :

[mflodman_chromium_OOO, 2011/10/16 21:58:38]

Done.

  public:
   MOCK_METHOD0(OnErr, void());
   MOCK_METHOD3(OnFrameInfo, void(int width, int height, int frame_rate));
 
   explicit MockFrameObserver(base::WaitableEvent* wait_event)
      : wait_event_(wait_event) {}
 
   virtual void OnError() OVERRIDE {
     OnErr();
   }
@@ skipping 50 matching lines @@
 
   // Get info about the new resolution.
   EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 30))
       .Times(1);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   device->Allocate(640, 480, 30, frame_observer_.get());
   device->Start();
-  // Wait for 3s or for captured frame.
+  // Get captured video frames.
+  ExecuteRunLoop();

[dmac, 2011/10/14 23:31:35]

Have you considered using a MessageLoop (new MessageLoopForUI()) and a
loop_->PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask,
TestTimeouts::action_max_timeout_ms()); ?

[mflodman_chromium_OOO, 2011/10/16 21:58:38]

I wasn't aware of the MessageLoopForUI, thanks for pointing this out.

I changed to using 5 sec as delay, which should be enough and a big margin.
'TestTimeouts::action_max_timeout_ms()' gave a delay of 45s for each test case,
which seems a bit long.

   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->Stop();
   device->DeAllocate();
 }
 
 TEST_F(VideoCaptureDeviceTest, Capture720p) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     LOG(WARNING) << "No camera available. Exiting test.";
     return;
   }
 
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_FALSE(device.get() == NULL);
 
   // Get info about the new resolution.
   // We don't care about the resulting resolution or frame rate as it might
   // be different from one machine to the next.
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_, _, _))
       .Times(1);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   device->Allocate(1280, 720, 30, frame_observer_.get());
   device->Start();
   // Get captured video frames.
+  ExecuteRunLoop();
   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->Stop();
   device->DeAllocate();
 }
 
-TEST_F(VideoCaptureDeviceTest, AllocateSameCameraTwice) {
+TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateSameCameraTwice) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     LOG(WARNING) << "No camera available. Exiting test.";
     return;
   }
   scoped_ptr<VideoCaptureDevice> device1(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_TRUE(device1.get() != NULL);
 
   scoped_ptr<VideoCaptureDevice> device2(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_TRUE(device2.get() != NULL);
 
   // 1. Get info about the new resolution on the first allocated camera
   EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 30));
 
   device1->Allocate(640, 480, 30, frame_observer_.get());
 
   // 2. Error when trying to allocate the same camera again.
   EXPECT_CALL(*frame_observer_, OnErr());
   device2->Allocate(640, 480, 30, frame_observer_.get());
 
   device1->DeAllocate();
   device2->DeAllocate();
 }
 
-TEST_F(VideoCaptureDeviceTest, AllocateBadSize) {
+TEST_F(VideoCaptureDeviceTest, MAYBE_AllocateBadSize) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     LOG(WARNING) << "No camera available. Exiting test.";
     return;
   }
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_TRUE(device.get() != NULL);
 
   EXPECT_CALL(*frame_observer_, OnErr())
@@ skipping 26 matching lines @@
   device->Allocate(640, 480, 30, frame_observer_.get());
   device->Start();
   // Nothing shall happen.
   device->Allocate(1280, 1024, 30, frame_observer_.get());
   device->DeAllocate();
   // Allocate new size 320, 240
   device->Allocate(320, 240, 30, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
+  ExecuteRunLoop();
   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->Stop();
   device->DeAllocate();
 }
 
 TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     LOG(WARNING) << "No camera available. Exiting test.";
     return;
   }
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
   ASSERT_TRUE(device.get() != NULL);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
   // Get info about the new resolution.
   EXPECT_CALL(*frame_observer_, OnFrameInfo(640, 480, 30));
 
   device->Allocate(640, 480, 30, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
+  ExecuteRunLoop();
   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->DeAllocate();
 }
 
 TEST_F(VideoCaptureDeviceTest, TestFakeCapture) {
   VideoCaptureDevice::Names names;
 
   FakeVideoCaptureDevice::GetDeviceNames(&names);
 
@@ skipping 13 matching lines @@
   device->Allocate(640, 480, 30, frame_observer_.get());
 
   device->Start();
   EXPECT_TRUE(wait_event_.TimedWait(base::TimeDelta::FromMilliseconds(
       TestTimeouts::action_max_timeout_ms())));
   device->Stop();
   device->DeAllocate();
 }
 
 };  // namespace media