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

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

Issue 195363002: VideoCapturerDelegate: Retrieve supported/in-use format(s) for constraint negotiation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Corrected min fps from 30 to 10 in a test. Created 6 years, 9 months 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
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 03493c09ef5285c4cb4356d9c8e6682940e62551..7f3aceaec818bb69ff739a392fd3dcdf9bc57804 100644
--- a/content/browser/media/webrtc_getusermedia_browsertest.cc
+++ b/content/browser/media/webrtc_getusermedia_browsertest.cc
@@ -468,7 +468,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
std::string constraints_4_3 = GenerateGetUserMediaCall(
- kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 30, 30);
+ kGetUserMediaAndAnalyseAndStop, 640, 640, 480, 480, 10, 30);
NavigateToURL(shell(), url);
ASSERT_EQ("w=640:h=480",
@@ -483,7 +483,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
std::string constraints_16_9 = GenerateGetUserMediaCall(
- kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 30, 30);
+ kGetUserMediaAndAnalyseAndStop, 640, 640, 360, 360, 10, 30);
NavigateToURL(shell(), url);
ASSERT_EQ("w=640:h=360",
@@ -498,7 +498,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetUserMediaBrowserTest,
GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
std::string constraints_1_1 = GenerateGetUserMediaCall(
- kGetUserMediaAndAnalyseAndStop, 320, 320, 320, 320, 30, 30);
+ kGetUserMediaAndAnalyseAndStop, 320, 320, 320, 320, 10, 30);
NavigateToURL(shell(), url);
ASSERT_EQ("w=320:h=320",
@@ -548,13 +548,12 @@ IN_PROC_BROWSER_TEST_P(WebRtcConstraintsBrowserTest, GetUserMediaConstraints) {
}
static const UserMediaSizes kAllUserMediaSizes[] = {
- {320, 320, 180, 180, 30, 30},
- {320, 320, 240, 240, 30, 30},
- {640, 640, 360, 360, 30, 30},
- {640, 640, 480, 480, 30, 30},
- {960, 960, 720, 720, 30, 30},
- {1280, 1280, 720, 720, 30, 30},
- {1920, 1920, 1080, 1080, 30, 30}};
+ {320, 320, 180, 180, 10, 30},
+ {320, 320, 240, 240, 10, 30},
+ {640, 640, 360, 360, 10, 30},
+ {640, 640, 480, 480, 10, 30},
+ {960, 960, 720, 720, 10, 30},
+ {1280, 1280, 720, 720, 10, 30}};
INSTANTIATE_TEST_CASE_P(UserMedia,
WebRtcConstraintsBrowserTest,
« no previous file with comments | « content/browser/media/webrtc_browsertest.cc ('k') | content/renderer/media/media_stream_video_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698