Commit 6cd43fe5 authored by phoglund@chromium.org's avatar phoglund@chromium.org

No longer checking 1080p in QtKit for WebRTC webcam tests.

QtKit doesn't support 1080p, which I found out when I enabled our C920-
equipped mac bot. Therefore we will no longer try to test that.

Also temporarily disabling QVGA for qtkit since it incorrectly acquires
320x180 rather than 320x240.

BUG=375185
TBR=tommi@chromium.org

Review URL: https://codereview.chromium.org/295943003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271684 0039d316-1c4b-4281-b951-d872f2087c98
parent fba66ae5
......@@ -76,6 +76,14 @@ class WebRtcWebcamBrowserTest : public WebRtcTestBase,
return actual_stream_size;
}
bool IsOnQtKit() const {
#if defined(OS_MACOSX)
return GetParam() && std::string(GetParam()) == switches::kForceQTKit;
#else
return false;
#endif
}
int get_user_media_call_count_;
};
......@@ -92,14 +100,23 @@ IN_PROC_BROWSER_TEST_P(WebRtcWebcamBrowserTest,
return;
}
if (!IsOnQtKit()) {
// Temporarily disabled on QtKit due to http://crbug.com/375185.
EXPECT_EQ("320x240",
GetUserMediaAndGetStreamSize(tab,
kAudioVideoCallConstraintsQVGA));
}
EXPECT_EQ("640x480",
GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraintsVGA));
EXPECT_EQ("320x240",
GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraintsQVGA));
EXPECT_EQ("640x360",
GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints360p));
EXPECT_EQ("1280x720",
GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints720p));
if (IsOnQtKit())
return; // QTKit only supports up to 720p.
EXPECT_EQ("1920x1080",
GetUserMediaAndGetStreamSize(tab, kAudioVideoCallConstraints1080p));
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment