Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(264)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/renderer_host/media/desktop_capture_device_unittest.cc

Issue 83633008: Reland: Reorganize media::VideoCapture* types (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/media/desktop_capture_device.cc ('k') | content/browser/renderer_host/media/video_capture_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/desktop_capture_device_unittest.cc
diff --git a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
index a3926e94b261dca3921dc3d5d93675f4d02ea7f5..c8843e623923989cccf291846da6f1d484922577 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/desktop_capture_device_unittest.cc
@@ -51,7 +51,7 @@ class MockDeviceClient : public media::VideoCaptureDevice::Client {
int rotation,
bool flip_vert,
bool flip_horiz,
- const media::VideoCaptureCapability& frame_info));
+ const media::VideoCaptureFormat& frame_format));
MOCK_METHOD5(OnIncomingCapturedBuffer,
void(const scoped_refptr<Buffer>& buffer,
media::VideoFrame::Format format,
@@ -120,7 +120,7 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {
DesktopCaptureDevice capture_device(
worker_pool_->GetSequencedTaskRunner(worker_pool_->GetSequenceToken()),
capturer.Pass());
- media::VideoCaptureCapability caps;
+ media::VideoCaptureFormat format;
base::WaitableEvent done_event(false, false);
int frame_size;
@@ -129,23 +129,25 @@ TEST_F(DesktopCaptureDeviceTest, MAYBE_Capture) {
EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _, _, _))
.WillRepeatedly(
DoAll(SaveArg<1>(&frame_size),
- SaveArg<6>(&caps),
+ SaveArg<6>(&format),
InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
- media::VideoCaptureCapability capture_format(
- 640, 480, kFrameRate, media::PIXEL_FORMAT_I420,
- media::ConstantResolutionVideoCaptureDevice);
+ media::VideoCaptureParams capture_params;
+ capture_params.requested_format.frame_size.SetSize(640, 480);
+ capture_params.requested_format.frame_rate = kFrameRate;
+ capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+ capture_params.allow_resolution_change = false;
capture_device.AllocateAndStart(
- capture_format, client.PassAs<media::VideoCaptureDevice::Client>());
+ capture_params, client.PassAs<media::VideoCaptureDevice::Client>());
EXPECT_TRUE(done_event.TimedWait(TestTimeouts::action_max_timeout()));
capture_device.StopAndDeAllocate();
- EXPECT_GT(caps.width, 0);
- EXPECT_GT(caps.height, 0);
- EXPECT_EQ(kFrameRate, caps.frame_rate);
- EXPECT_EQ(media::PIXEL_FORMAT_ARGB, caps.color);
+ EXPECT_GT(format.frame_size.width(), 0);
+ EXPECT_GT(format.frame_size.height(), 0);
+ EXPECT_EQ(kFrameRate, format.frame_rate);
+ EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
- EXPECT_EQ(caps.width * caps.height * 4, frame_size);
+ EXPECT_EQ(format.frame_size.GetArea() * 4, frame_size);
worker_pool_->FlushForTesting();
}
@@ -158,7 +160,7 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
worker_pool_->GetSequencedTaskRunner(worker_pool_->GetSequenceToken()),
scoped_ptr<webrtc::DesktopCapturer>(mock_capturer));
- media::VideoCaptureCapability caps;
+ media::VideoCaptureFormat format;
base::WaitableEvent done_event(false, false);
int frame_size;
@@ -167,18 +169,18 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _, _, _))
.WillRepeatedly(
DoAll(SaveArg<1>(&frame_size),
- SaveArg<6>(&caps),
+ SaveArg<6>(&format),
InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
- media::VideoCaptureCapability capture_format(
- kTestFrameWidth1,
- kTestFrameHeight1,
- kFrameRate,
- media::PIXEL_FORMAT_I420,
- media::ConstantResolutionVideoCaptureDevice);
+ media::VideoCaptureParams capture_params;
+ capture_params.requested_format.frame_size.SetSize(kTestFrameWidth1,
+ kTestFrameHeight1);
+ capture_params.requested_format.frame_rate = kFrameRate;
+ capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+ capture_params.allow_resolution_change = false;
capture_device.AllocateAndStart(
- capture_format, client.PassAs<media::VideoCaptureDevice::Client>());
+ capture_params, client.PassAs<media::VideoCaptureDevice::Client>());
// Capture at least two frames, to ensure that the source frame size has
// changed while capturing.
@@ -188,12 +190,12 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeConstantResolution) {
capture_device.StopAndDeAllocate();
- EXPECT_EQ(kTestFrameWidth1, caps.width);
- EXPECT_EQ(kTestFrameHeight1, caps.height);
- EXPECT_EQ(kFrameRate, caps.frame_rate);
- EXPECT_EQ(media::PIXEL_FORMAT_ARGB, caps.color);
+ EXPECT_EQ(kTestFrameWidth1, format.frame_size.width());
+ EXPECT_EQ(kTestFrameHeight1, format.frame_size.height());
+ EXPECT_EQ(kFrameRate, format.frame_rate);
+ EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
- EXPECT_EQ(caps.width * caps.height * 4, frame_size);
+ EXPECT_EQ(format.frame_size.GetArea() * 4, frame_size);
worker_pool_->FlushForTesting();
}
@@ -206,25 +208,25 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
worker_pool_->GetSequencedTaskRunner(worker_pool_->GetSequenceToken()),
scoped_ptr<webrtc::DesktopCapturer>(mock_capturer));
- media::VideoCaptureCapability caps;
+ media::VideoCaptureFormat format;
base::WaitableEvent done_event(false, false);
scoped_ptr<MockDeviceClient> client(new MockDeviceClient());
EXPECT_CALL(*client, OnError()).Times(0);
EXPECT_CALL(*client, OnIncomingCapturedFrame(_, _, _, _, _, _, _))
.WillRepeatedly(
- DoAll(SaveArg<6>(&caps),
+ DoAll(SaveArg<6>(&format),
InvokeWithoutArgs(&done_event, &base::WaitableEvent::Signal)));
- media::VideoCaptureCapability capture_format(
- kTestFrameWidth2,
- kTestFrameHeight2,
- kFrameRate,
- media::PIXEL_FORMAT_I420,
- media::VariableResolutionVideoCaptureDevice);
+ media::VideoCaptureParams capture_params;
+ capture_params.requested_format.frame_size.SetSize(kTestFrameWidth2,
+ kTestFrameHeight2);
+ capture_params.requested_format.frame_rate = kFrameRate;
+ capture_params.requested_format.pixel_format = media::PIXEL_FORMAT_I420;
+ capture_params.allow_resolution_change = false;
capture_device.AllocateAndStart(
- capture_format, client.PassAs<media::VideoCaptureDevice::Client>());
+ capture_params, client.PassAs<media::VideoCaptureDevice::Client>());
// Capture at least three frames, to ensure that the source frame size has
// changed at least twice while capturing.
@@ -236,10 +238,10 @@ TEST_F(DesktopCaptureDeviceTest, ScreenResolutionChangeVariableResolution) {
capture_device.StopAndDeAllocate();
- EXPECT_EQ(kTestFrameWidth1, caps.width);
- EXPECT_EQ(kTestFrameHeight1, caps.height);
- EXPECT_EQ(kFrameRate, caps.frame_rate);
- EXPECT_EQ(media::PIXEL_FORMAT_ARGB, caps.color);
+ EXPECT_EQ(kTestFrameWidth1, format.frame_size.width());
+ EXPECT_EQ(kTestFrameHeight1, format.frame_size.height());
+ EXPECT_EQ(kFrameRate, format.frame_rate);
+ EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
worker_pool_->FlushForTesting();
}
« no previous file with comments | « content/browser/renderer_host/media/desktop_capture_device.cc ('k') | content/browser/renderer_host/media/video_capture_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698