Change MediaStreamVideoSource to output different resolutions to different tracks depending on the …

content/browser/media/webrtc_browsertest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/file_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/values.h"
 #include "content/browser/media/webrtc_internals.h"
@@ skipping 36 matching lines @@
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
 #if defined(OS_ANDROID)
     // TODO(phoglund): this is a ugly workaround to let the IO thread
     // finish its work. The reason we need this on Android is that
     // content_browsertests tearDown logic is broken with respect
     // to threading, which causes the IO thread to compete with the
     // teardown. See http://crbug.com/362852. I also tried with 2
     // seconds, but that isn't enough.
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(5));

[mcasas, 2014/05/09 07:46:24]

nit: justify paragraph (to 80col).

[perkj_chrome, 2014/05/13 11:05:56]

this does not belong to my cl. Its Phoglunds.. Not sure what you mean either?

 #endif
   }
 
   // Convenience function since most peerconnection-call.html tests just load
   // the page, kick off some javascript and wait for the title to change to OK.
   void MakeTypicalPeerConnectionCall(const std::string& javascript) {
     ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
 
     GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
     NavigateToURL(shell(), url);
@@ skipping 30 matching lines @@
       "callAndExpectResolution({video: true}, 640, 480);");
 }
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, CanSetupVideoCallWith1To1AspecRatio) {
   const std::string javascript =
       "callAndExpectResolution({video: {mandatory: {minWidth: 320,"
       " maxWidth: 320, minHeight: 320, maxHeight: 320}}}, 320, 320);";
   MakeTypicalPeerConnectionCall(javascript);
 }
 
+IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
+                       CanSetupVideoCallWith16To9AspecRatio) {
+  const std::string javascript =
+      "callAndExpectResolution({video: {mandatory: {minWidth: 640,"
+      " maxWidth: 640, minAspectRatio: 1.7777}}}, 640, 360);";
+  MakeTypicalPeerConnectionCall(javascript);
+}
+
+IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
+                       CanSetupVideoCallWith4To3AspecRatio) {
+  const std::string javascript =
+      "callAndExpectResolution({video: {mandatory: {minWidth: 960,"
+      "maxAspectRatio: 1.333}}}, 960, 720);";
+  MakeTypicalPeerConnectionCall(javascript);

[mcasas, 2014/05/09 07:46:24]

ultra-nit: Three decimals here and four for 16:9, intended?

[perkj_chrome, 2014/05/13 11:05:56]

done

+}
+
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
 // Timing out on ARM linux, see http://crbug.com/240376
 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall
 #else
 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall
 #endif
 
 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
   MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
 }
@@ skipping 305 matching lines @@
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;
   EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
   EXPECT_EQ(0, file_size);
 
   base::DeleteFile(dump_file, false);
 }
 
 }  // namespace content