VideoCapturerDelegate: Retrieve supported/in-use format(s) for constraint negotiation

content/browser/media/webrtc_getusermedia_browsertest.cc

 // Copyright 2014 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 "base/debug/trace_event_impl.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
 #include "base/values.h"
 #include "content/browser/media/webrtc_internals.h"
@@ skipping 315 matching lines @@
           "something invalid")));
 
   // Test with empty optional audio sourceID.
   EXPECT_EQ(kOK, ExecuteJavascriptAndReturnResult(
       GenerateGetUserMediaWithOptionalSourceID(
           kGetUserMediaAndStop,
           "",
           video_ids[0])));
 }
 
+// Test that opening an unsupported resolution ends up in an error.
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       GetVideoStreamWithUnsupportedVideoSize) {
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

[perkj_chrome, 2014/03/12 19:55:48]

Oh, I did this in https://codereview.chromium.org/197213004/

[mcasas, 2014/03/13 08:04:56]

I'll remove these two tests then, but I'd recommend adding
a failing gUM with valid values, not 99999.

+  GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
+  NavigateToURL(shell(), url);
+
+  std::string too_large_constraints = GenerateGetUserMediaCall(
+      kGetUserMediaAndStop, 800, 800, 600, 600, 20, 20);
+  DCHECK_NE(kOK, ExecuteJavascriptAndReturnResult(too_large_constraints));
+}
+
+// Test that opening an unsupported frame rate ends up in an error.
+IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
+                       GetVideoStreamWithUnsupportedFrameRate) {
+  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

[perkj_chrome, 2014/03/12 19:55:48]

Do we need a special test for this? I think this is the same as the one above
except for the frame rate? 

[mcasas, 2014/03/13 08:04:56]

See above.

+  GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
+  NavigateToURL(shell(), url);
+
+  std::string too_fast_constraints = GenerateGetUserMediaCall(
+      kGetUserMediaAndStop, 640, 640, 480, 480, 30, 30);
+  DCHECK_NE(kOK, ExecuteJavascriptAndReturnResult(too_fast_constraints));
+}
+
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, TwoGetUserMediaAndStop) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
   NavigateToURL(shell(), url);
 
   ExecuteJavascriptAndWaitForOk(
       "twoGetUserMediaAndStop({video: true, audio: true});");
 }
 
@@ skipping 11 matching lines @@
 }
 
 // This test calls getUserMedia and checks for aspect ratio behavior.
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        TestGetUserMediaAspectRatio4To3) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   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, 20, 20);

[perkj_chrome, 2014/03/12 19:55:48]

Can we skip changing the maxFramerate and only change the minFramerate. Ie- Sett
it to max 30 min 10.

[mcasas, 2014/03/13 08:04:56]

Done.

 
   // TODO(mcasas): add more aspect ratios, in particular 16:10 crbug.com/275594.
 
   NavigateToURL(shell(), url);
   ASSERT_EQ("4:3 letterbox",
             ExecuteJavascriptAndReturnResult(constraints_4_3));
 }
 
 // This test calls getUserMedia and checks for aspect ratio behavior.
 // TODO(perkj): Enable this test as soon as crbug/349450 is fixed.
 // Currently the render pipeline doesn't support cropping where the new cropped
 // frame doesn't have the same top left coordinates as the original frame.
 IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
                        DISABLED_TestGetUserMediaAspectRatio16To9) {
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
   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, 20, 20);
 
   NavigateToURL(shell(), url);
   ASSERT_EQ("16:9 letterbox",
             ExecuteJavascriptAndReturnResult(constraints_16_9));
 }
 
 namespace {
 
 struct UserMediaSizes {
   int min_width;
@@ skipping 29 matching lines @@
                                               user_media().min_height,
                                               user_media().max_height,
                                               user_media().min_frame_rate,
                                               user_media().max_frame_rate);
   DVLOG(1) << "Calling getUserMedia: " << call;
   NavigateToURL(shell(), url);
   ExecuteJavascriptAndWaitForOk(call);
 }
 
 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, 20, 20},
+    {320, 320, 240, 240, 20, 20},
+    {640, 640, 360, 360, 20, 20},
+    {640, 640, 480, 480, 20, 20},
+    {960, 960, 720, 720, 20, 20},
+    {1280, 1280, 720, 720, 20, 20},
+    {1920, 1920, 1080, 1080, 20, 20}};
 
 INSTANTIATE_TEST_CASE_P(UserMedia,
                         WebRtcConstraintsBrowserTest,
                         testing::ValuesIn(kAllUserMediaSizes));
 
 }  // namespace content