Reland: Reorganize media::VideoCapture* types

content/browser/renderer_host/media/video_capture_host_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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 181 matching lines @@
   }
 
   void OnBufferFilledDispatch(int device_id,
                               int buffer_id,
                               base::Time timestamp,
                               const media::VideoCaptureFormat& frame_format) {
     base::SharedMemory* dib = filled_dib_[buffer_id];
     ASSERT_TRUE(dib != NULL);
     if (dump_video_) {
       if (!format_.IsValid()) {
-        dumper_.StartDump(frame_format.width, frame_format.height);
+        dumper_.StartDump(frame_format.frame_size.width(),
+                          frame_format.frame_size.height());
         format_ = frame_format;
       }
-      ASSERT_EQ(format_.width, frame_format.width)
+      ASSERT_EQ(format_.frame_size.width(), frame_format.frame_size.width())
           << "Dump format does not handle variable resolution.";
-      ASSERT_EQ(format_.height, frame_format.height)
-          << "Dump format does not handle variable resolution.";;
+      ASSERT_EQ(format_.frame_size.height(), frame_format.frame_size.height())
+          << "Dump format does not handle variable resolution.";
       dumper_.NewVideoFrame(dib->memory());
     }
 
     OnBufferFilled(device_id, buffer_id, timestamp, frame_format);
     if (return_buffers_) {
       VideoCaptureHost::OnReceiveEmptyBuffer(device_id, buffer_id);
     }
   }
 
   void OnStateChangedDispatch(int device_id, VideoCaptureState state) {
@@ skipping 121 matching lines @@
     EXPECT_CALL(*host_, OnNewBufferCreated(kDeviceId, _, _, _))
         .Times(AnyNumber()).WillRepeatedly(Return());
 
     base::RunLoop run_loop;
     EXPECT_CALL(*host_, OnBufferFilled(kDeviceId, _, _, _))
         .Times(AnyNumber()).WillOnce(ExitMessageLoop(
             message_loop_, run_loop.QuitClosure()));
 
     media::VideoCaptureParams params;
     params.requested_format = media::VideoCaptureFormat(
-        352, 288, 30, media::ConstantResolutionVideoCaptureDevice);
-    params.session_id = opened_session_id_;
-    host_->OnStartCapture(kDeviceId, params);
+        gfx::Size(352, 288), 30, media::PIXEL_FORMAT_I420);
+    host_->OnStartCapture(kDeviceId, opened_session_id_, params);
     run_loop.Run();
   }
 
   void StartStopCapture() {
     // Quickly start and then stop capture, without giving much chance for
     // asynchronous start operations to complete.
     InSequence s;
     base::RunLoop run_loop;
     EXPECT_CALL(*host_, OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED));
     media::VideoCaptureParams params;
     params.requested_format = media::VideoCaptureFormat(
-        352, 288, 30, media::ConstantResolutionVideoCaptureDevice);
-    params.session_id = opened_session_id_;
-    host_->OnStartCapture(kDeviceId, params);
+        gfx::Size(352, 288), 30, media::PIXEL_FORMAT_I420);
+    host_->OnStartCapture(kDeviceId, opened_session_id_, params);
     host_->OnStopCapture(kDeviceId);
     run_loop.RunUntilIdle();
   }
 
 #ifdef DUMP_VIDEO
   void CaptureAndDumpVideo(int width, int height, int frame_rate) {
     InSequence s;
     EXPECT_CALL(*host_.get(), OnNewBufferCreated(kDeviceId, _, _, _))
         .Times(AnyNumber()).WillRepeatedly(Return());
 
     base::RunLoop run_loop;
     EXPECT_CALL(*host_, OnBufferFilled(kDeviceId, _, _, _))
         .Times(AnyNumber())
         .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure()));
 
     media::VideoCaptureParams params;
-    params.requested_format = media::VideoCaptureFormat(
-        width, height, frame_rate, media::ConstantResolutionVideoCaptureDevice);
-    params.session_id = opened_session_id_;
+    params.requested_format =
+        media::VideoCaptureFormat(gfx::Size(width, height), frame_rate);
     host_->SetDumpVideo(true);
-    host_->OnStartCapture(kDeviceId, params);
+    host_->OnStartCapture(kDeviceId, opened_session_id_, params);
     run_loop.Run();
   }
 #endif
 
   void StopCapture() {
     base::RunLoop run_loop;
     EXPECT_CALL(*host_, OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED))
         .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure()));
 
     host_->OnStopCapture(kDeviceId);
@@ skipping 85 matching lines @@
 #ifdef DUMP_VIDEO
 TEST_F(VideoCaptureHostTest, CaptureAndDumpVideoVga) {
   CaptureAndDumpVideo(640, 480, 30);
 }
 TEST_F(VideoCaptureHostTest, CaptureAndDump720P) {
   CaptureAndDumpVideo(1280, 720, 30);
 }
 #endif
 
 }  // namespace content