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

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 246433006: Change MediaStreamVideoSource to output different resolutions to different tracks depending on the … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed missed comments. Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "content/browser/media/webrtc_internals.h" 10 #include "content/browser/media/webrtc_internals.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 "callAndExpectResolution({video: true}, 640, 480);"); 98 "callAndExpectResolution({video: true}, 640, 480);");
99 } 99 }
100 100
101 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, CanSetupVideoCallWith1To1AspecRatio) { 101 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, CanSetupVideoCallWith1To1AspecRatio) {
102 const std::string javascript = 102 const std::string javascript =
103 "callAndExpectResolution({video: {mandatory: {minWidth: 320," 103 "callAndExpectResolution({video: {mandatory: {minWidth: 320,"
104 " maxWidth: 320, minHeight: 320, maxHeight: 320}}}, 320, 320);"; 104 " maxWidth: 320, minHeight: 320, maxHeight: 320}}}, 320, 320);";
105 MakeTypicalPeerConnectionCall(javascript); 105 MakeTypicalPeerConnectionCall(javascript);
106 } 106 }
107 107
108 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
109 CanSetupVideoCallWith16To9AspecRatio) {
110 const std::string javascript =
111 "callAndExpectResolution({video: {mandatory: {minWidth: 640,"
112 " maxWidth: 640, minAspectRatio: 1.777}}}, 640, 360);";
113 MakeTypicalPeerConnectionCall(javascript);
114 }
115
116 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest,
117 CanSetupVideoCallWith4To3AspecRatio) {
118 const std::string javascript =
119 "callAndExpectResolution({video: {mandatory: {minWidth: 960,"
120 "maxAspectRatio: 1.333}}}, 960, 720);";
121 MakeTypicalPeerConnectionCall(javascript);
122 }
123
108 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) 124 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY)
109 // Timing out on ARM linux, see http://crbug.com/240376 125 // Timing out on ARM linux, see http://crbug.com/240376
110 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall 126 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall
111 #else 127 #else
112 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall 128 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall
113 #endif 129 #endif
114 130
115 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { 131 IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) {
116 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); 132 MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
117 } 133 }
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 439
424 EXPECT_TRUE(base::PathExists(dump_file)); 440 EXPECT_TRUE(base::PathExists(dump_file));
425 int64 file_size = 0; 441 int64 file_size = 0;
426 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); 442 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
427 EXPECT_EQ(0, file_size); 443 EXPECT_EQ(0, file_size);
428 444
429 base::DeleteFile(dump_file, false); 445 base::DeleteFile(dump_file, false);
430 } 446 }
431 447
432 } // namespace content 448 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698