Reland: Reorganize media::VideoCapture* types

content/browser/renderer_host/media/web_contents_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 "content/browser/renderer_host/media/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 321 matching lines @@
         new PoolBuffer(buffer_pool_, buffer_id, data, size));
   }
 
   virtual void OnIncomingCapturedFrame(
       const uint8* data,
       int length,
       base::Time timestamp,
       int rotation,
       bool flip_vert,
       bool flip_horiz,
-      const media::VideoCaptureCapability& frame_info) OVERRIDE {
+      const media::VideoCaptureFormat& frame_format) OVERRIDE {
     FAIL();
   }
 
   virtual void OnIncomingCapturedBuffer(const scoped_refptr<Buffer>& buffer,
                                         media::VideoFrame::Format format,
                                         const gfx::Size& dimensions,
                                         base::Time timestamp,
                                         int frame_rate) OVERRIDE {
     EXPECT_EQ(gfx::Size(kTestWidth, kTestHeight), dimensions);
     EXPECT_EQ(media::VideoFrame::I420, format);
@@ skipping 234 matching lines @@
 
   TestBrowserThreadBundle thread_bundle_;
 };
 
 TEST_F(WebContentsVideoCaptureDeviceTest, InvalidInitialWebContentsError) {
   // Before the installs itself on the UI thread up to start capturing, we'll
   // delete the web contents. This should trigger an error which can happen in
   // practice; we should be able to recover gracefully.
   ResetWebContents();
 
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForError());
   device()->StopAndDeAllocate();
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, WebContentsDestroyed) {
   // We'll simulate the tab being closed after the capture pipeline is up and
   // running.
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
   // Do one capture to prove
   source()->SetSolidColor(SK_ColorRED);
   SimulateDrawEvent();
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorRED));
 
   base::RunLoop().RunUntilIdle();
 
   // Post a task to close the tab. We should see an error reported to the
   // consumer.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&WebContentsVideoCaptureDeviceTest::ResetWebContents,
                  base::Unretained(this)));
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForError());
   device()->StopAndDeAllocate();
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest,
        StopDeviceBeforeCaptureMachineCreation) {
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
 
   // Make a point of not running the UI messageloop here.
   device()->StopAndDeAllocate();
   DestroyVideoCaptureDevice();
 
   // Currently, there should be CreateCaptureMachineOnUIThread() and
   // DestroyCaptureMachineOnUIThread() tasks pending on the current (UI) message
   // loop. These should both succeed without crashing, and the machine should
   // wind up in the idle state.
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, StopWithRendererWorkToDo) {
   // Set up the test to use RGB copies and an normal
   source()->SetCanCopyToVideoFrame(false);
   source()->SetUseFrameSubscriber(false);
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
 
   base::RunLoop().RunUntilIdle();
 
   for (int i = 0; i < 10; ++i)
     SimulateDrawEvent();
 
   ASSERT_FALSE(client_observer()->HasError());
   device()->StopAndDeAllocate();
   ASSERT_FALSE(client_observer()->HasError());
   base::RunLoop().RunUntilIdle();
   ASSERT_FALSE(client_observer()->HasError());
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, DeviceRestart) {
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
   base::RunLoop().RunUntilIdle();
   source()->SetSolidColor(SK_ColorRED);
   SimulateDrawEvent();
   SimulateDrawEvent();
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorRED));
   SimulateDrawEvent();
   SimulateDrawEvent();
   source()->SetSolidColor(SK_ColorGREEN);
   SimulateDrawEvent();
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
   device()->StopAndDeAllocate();
 
   // Device is stopped, but content can still be animating.
   SimulateDrawEvent();
   SimulateDrawEvent();
   base::RunLoop().RunUntilIdle();
 
   StubClientObserver observer2;
-  device()->AllocateAndStart(capture_format, observer2.PassClient());
+  device()->AllocateAndStart(capture_params, observer2.PassClient());
   source()->SetSolidColor(SK_ColorBLUE);
   SimulateDrawEvent();
   ASSERT_NO_FATAL_FAILURE(observer2.WaitForNextColor(SK_ColorBLUE));
   source()->SetSolidColor(SK_ColorYELLOW);
   SimulateDrawEvent();
   ASSERT_NO_FATAL_FAILURE(observer2.WaitForNextColor(SK_ColorYELLOW));
   device()->StopAndDeAllocate();
 }
 
 // The "happy case" test.  No scaling is needed, so we should be able to change
 // the picture emitted from the source and expect to see each delivered to the
 // consumer. The test will alternate between the three capture paths, simulating
 // falling in and out of accelerated compositing.
 TEST_F(WebContentsVideoCaptureDeviceTest, GoesThroughAllTheMotions) {
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
 
   for (int i = 0; i < 6; i++) {
     const char* name = NULL;
     switch (i % 3) {
       case 0:
         source()->SetCanCopyToVideoFrame(true);
         source()->SetUseFrameSubscriber(false);
         name = "VideoFrame";
         break;
       case 1:
@@ skipping 25 matching lines @@
     ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorBLUE));
 
     source()->SetSolidColor(SK_ColorBLACK);
     SimulateDrawEvent();
     ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorBLACK));
   }
   device()->StopAndDeAllocate();
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, RejectsInvalidAllocateParams) {
-  media::VideoCaptureCapability capture_format(
-      1280,
-      720,
-      -2,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(1280, 720);
+  capture_params.requested_format.frame_rate = -2;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&media::VideoCaptureDevice::AllocateAndStart,
                  base::Unretained(device()),
-                 capture_format,
+                 capture_params,
                  base::Passed(client_observer()->PassClient())));
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForError());
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&media::VideoCaptureDevice::StopAndDeAllocate,
                  base::Unretained(device())));
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(WebContentsVideoCaptureDeviceTest, BadFramesGoodFrames) {
-  media::VideoCaptureCapability capture_format(
-      kTestWidth,
-      kTestHeight,
-      kTestFramesPerSecond,
-      media::PIXEL_FORMAT_I420,
-      media::ConstantResolutionVideoCaptureDevice);
+  media::VideoCaptureParams capture_params;
+  capture_params.requested_format.frame_size.SetSize(kTestWidth, kTestHeight);
+  capture_params.requested_format.frame_rate = kTestFramesPerSecond;
+  capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+  capture_params.allow_resolution_change = false;
   // 1x1 is too small to process; we intend for this to result in an error.
   source()->SetCopyResultSize(1, 1);
   source()->SetSolidColor(SK_ColorRED);
-  device()->AllocateAndStart(
-      capture_format, client_observer()->PassClient());
+  device()->AllocateAndStart(capture_params, client_observer()->PassClient());
 
   // These frames ought to be dropped during the Render stage. Let
   // several captures to happen.
   ASSERT_NO_FATAL_FAILURE(source()->WaitForNextCopy());
   ASSERT_NO_FATAL_FAILURE(source()->WaitForNextCopy());
   ASSERT_NO_FATAL_FAILURE(source()->WaitForNextCopy());
   ASSERT_NO_FATAL_FAILURE(source()->WaitForNextCopy());
   ASSERT_NO_FATAL_FAILURE(source()->WaitForNextCopy());
 
   // Now push some good frames through; they should be processed normally.
   source()->SetCopyResultSize(kTestWidth, kTestHeight);
   source()->SetSolidColor(SK_ColorGREEN);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
   source()->SetSolidColor(SK_ColorRED);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorRED));
 
   device()->StopAndDeAllocate();
 }
 
 }  // namespace
 }  // namespace content