Consolidate duplicated frame / capability structures in video_capture_types.h

media/video/capture/video_capture_device_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/scoped_ptr.h"
 #include "base/message_loop/message_loop.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"
@@ skipping 141 matching lines @@
   VideoCaptureCapability rx_capability;
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .Times(1).WillOnce(SaveArg<0>(&rx_capability));
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   VideoCaptureCapability capture_format(640,
                                         480,
                                         30,
-                                        VideoCaptureCapability::kI420,
+                                        PIXEL_FORMAT_I420,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   EXPECT_EQ(rx_capability.width, 640);
   EXPECT_EQ(rx_capability.height, 480);
@@ skipping 17 matching lines @@
   // be different from one machine to the next.
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .Times(1);
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   VideoCaptureCapability capture_format(1280,
                                         720,
                                         30,
-                                        VideoCaptureCapability::kI420,
+                                        PIXEL_FORMAT_I420,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   device->Stop();
   device->DeAllocate();
@@ skipping 13 matching lines @@
       .Times(0);
 
   // Get info about the new resolution.
   VideoCaptureCapability rx_capability;
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .Times(AtLeast(1)).WillOnce(SaveArg<0>(&rx_capability));
 
   VideoCaptureCapability capture_format(637,
                                         472,
                                         35,
-                                        VideoCaptureCapability::kI420,
+                                        PIXEL_FORMAT_I420,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
   device->DeAllocate();
   EXPECT_EQ(rx_capability.width, 640);
   EXPECT_EQ(rx_capability.height, 480);
 }
 
 TEST_F(VideoCaptureDeviceTest, ReAllocateCamera) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
     DVLOG(1) << "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.
   VideoCaptureCapability rx_capability_1;
   VideoCaptureCapability rx_capability_2;
   VideoCaptureCapability capture_format_1(640,
                                           480,
                                           30,
-                                          VideoCaptureCapability::kI420,
+                                          PIXEL_FORMAT_I420,
                                           0,
                                           false,
                                           ConstantResolutionVideoCaptureDevice);
   VideoCaptureCapability capture_format_2(1280,
                                           1024,
                                           30,
-                                          VideoCaptureCapability::kI420,
+                                          PIXEL_FORMAT_I420,
                                           0,
                                           false,
                                           ConstantResolutionVideoCaptureDevice);
   VideoCaptureCapability capture_format_3(320,
                                           240,
                                           30,
-                                          VideoCaptureCapability::kI420,
+                                          PIXEL_FORMAT_I420,
                                           0,
                                           false,
                                           ConstantResolutionVideoCaptureDevice);
 
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .WillOnce(SaveArg<0>(&rx_capability_1));
   device->Allocate(capture_format_1, frame_observer_.get());
   device->Start();
   // Nothing shall happen.
   device->Allocate(capture_format_2, frame_observer_.get());
@@ skipping 28 matching lines @@
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
   // Get info about the new resolution.
   VideoCaptureCapability rx_capability;
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .WillOnce(SaveArg<0>(&rx_capability));
 
   VideoCaptureCapability capture_format(640,
                                         480,
                                         30,
-                                        VideoCaptureCapability::kI420,
+                                        PIXEL_FORMAT_I420,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   EXPECT_EQ(rx_capability.width, 640);
@@ skipping 17 matching lines @@
   VideoCaptureCapability rx_capability;
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .Times(1).WillOnce(SaveArg<0>(&rx_capability));
 
   EXPECT_CALL(*frame_observer_, OnErr())
       .Times(0);
 
   VideoCaptureCapability capture_format(640,
                                         480,
                                         30,
-                                        VideoCaptureCapability::kI420,
+                                        PIXEL_FORMAT_I420,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
 
   device->Start();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
   EXPECT_EQ(rx_capability.width, 640);
   EXPECT_EQ(rx_capability.height, 480);
   EXPECT_EQ(rx_capability.frame_rate, 30);
@@ skipping 16 matching lines @@
       .Times(0);
   // Verify we get MJPEG from the device. Not all devices can capture 1280x720
   // @ 30 fps, so we don't care about the exact resolution we get.
   VideoCaptureCapability rx_capability;
   EXPECT_CALL(*frame_observer_, OnFrameInfo(_))
       .WillOnce(SaveArg<0>(&rx_capability));
 
   VideoCaptureCapability capture_format(1280,
                                         720,
                                         30,
-                                        VideoCaptureCapability::kMJPEG,
+                                        PIXEL_FORMAT_MJPEG,
                                         0,
                                         false,
                                         ConstantResolutionVideoCaptureDevice);
   device->Allocate(capture_format, frame_observer_.get());
 
   device->Start();
   // Get captured video frames.
   PostQuitTask();
   EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_max_timeout()));
-  EXPECT_EQ(rx_capability.color, VideoCaptureCapability::kMJPEG);
+  EXPECT_EQ(rx_capability.color, PIXEL_FORMAT_MJPEG);
   device->DeAllocate();
 }
 
 TEST_F(VideoCaptureDeviceTest, FakeCaptureVariableResolution) {
   VideoCaptureDevice::Names names;
 
   FakeVideoCaptureDevice::GetDeviceNames(&names);
   media::VideoCaptureCapability capture_format;
   capture_format.width = 640;
   capture_format.height = 480;
@@ skipping 24 matching lines @@
       .Times(AtLeast(action_count / 30));
   device->Start();
   for (int i = 0; i < action_count; ++i) {
     EXPECT_TRUE(wait_event_.TimedWait(TestTimeouts::action_timeout()));
   }
   device->Stop();
   device->DeAllocate();
 }
 
 };  // namespace media