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

Unified Diff: content/browser/media/webrtc_getusermedia_browsertest.cc

Issue 770713005: FakeVideoCaptureDevice: add 1080p resolution (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sorted out content_browsertests Created 6 years 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/media/webrtc_browsertest.cc ('k') | media/video/capture/fake_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media/webrtc_getusermedia_browsertest.cc
diff --git a/content/browser/media/webrtc_getusermedia_browsertest.cc b/content/browser/media/webrtc_getusermedia_browsertest.cc
index 8c8bf2dba098d3f80ae4637f5eac4ca32f25aa25..d2e69eed076d5ef66b78a3d502423a6607a72459 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -454,7 +454,8 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaWithFirstHdSecondVga) {
std::string constraints1 =
- "{video: {mandatory: {minWidth:1280 , minHeight: 720}}}";
+ "{video: {mandatory: {maxWidth:1280 , minWidth:1280 , maxHeight: 720,\
+ minHeight: 720}}}";
std::string constraints2 =
"{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
std::string expected_result = "w=1280:h=720-w=640:h=480";
@@ -463,6 +464,18 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
}
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+ TwoGetUserMediaWithFirst1080pSecondVga) {
+ std::string constraints1 =
+ "{video: {mandatory: {maxWidth:1920 , minWidth:1920 , maxHeight: 1080,\
+ minHeight: 1080}}}";
+ std::string constraints2 =
+ "{video: {mandatory: {maxWidth:640 , maxHeight: 480}}}";
+ std::string expected_result = "w=1920:h=1080-w=640:h=480";
+ RunTwoGetTwoGetUserMediaWithDifferentContraints(constraints1, constraints2,
+ expected_result);
+}
+
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TwoGetUserMediaAndVerifyFrameRate) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | media/video/capture/fake_video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698