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

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

Issue 612453002: Disable EncryptedMediaTests on Arm64 Android due to Timeouts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indentation Created 6 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "base/win/windows_version.h" 7 #include "base/win/windows_version.h"
8 #include "content/browser/media/media_browsertest.h" 8 #include "content/browser/media/media_browsertest.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 query_params.push_back(std::make_pair("runEncrypted", "1")); 85 query_params.push_back(std::make_pair("runEncrypted", "1"));
86 RunMediaTestPage("mse_config_change.html", query_params, kEnded, true); 86 RunMediaTestPage("mse_config_change.html", query_params, kEnded, true);
87 } 87 }
88 88
89 void RunEncryptedMediaTest(const std::string& html_page, 89 void RunEncryptedMediaTest(const std::string& html_page,
90 const std::string& media_file, 90 const std::string& media_file,
91 const std::string& media_type, 91 const std::string& media_type,
92 const std::string& key_system, 92 const std::string& key_system,
93 SrcType src_type, 93 SrcType src_type,
94 const std::string& expectation) { 94 const std::string& expectation) {
95 #if defined(OS_ANDROID) && defined(__aarch64__)
96 // Disable EME tests on arm64 due to timeouts: http://crbug.com/418039
97 return;
98 #endif
95 if (src_type == MSE && !IsMSESupported()) { 99 if (src_type == MSE && !IsMSESupported()) {
96 VLOG(0) << "Skipping test - MSE not supported."; 100 VLOG(0) << "Skipping test - MSE not supported.";
97 return; 101 return;
98 } 102 }
99 103
100 media::QueryParams query_params; 104 media::QueryParams query_params;
101 query_params.push_back(std::make_pair("mediaFile", media_file)); 105 query_params.push_back(std::make_pair("mediaFile", media_file));
102 query_params.push_back(std::make_pair("mediaType", media_type)); 106 query_params.push_back(std::make_pair("mediaType", media_type));
103 query_params.push_back(std::make_pair("keySystem", key_system)); 107 query_params.push_back(std::make_pair("keySystem", key_system));
104 if (src_type == MSE) 108 if (src_type == MSE)
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 172
169 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 173 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
170 TestConfigChange(); 174 TestConfigChange();
171 } 175 }
172 176
173 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { 177 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
174 // Times out on Windows XP. http://crbug.com/171937 178 // Times out on Windows XP. http://crbug.com/171937
175 #if defined(OS_WIN) 179 #if defined(OS_WIN)
176 if (base::win::GetVersion() < base::win::VERSION_VISTA) 180 if (base::win::GetVersion() < base::win::VERSION_VISTA)
177 return; 181 return;
178 #elif defined(__aarch64__)
179 // Times out on arm64 currently due to http://crbug.com/403308
180 return;
181 #endif 182 #endif
182 TestFrameSizeChange(); 183 TestFrameSizeChange();
183 } 184 }
184 185
185 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 186 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
186 RunEncryptedMediaTest(kDefaultEmePlayer, 187 RunEncryptedMediaTest(kDefaultEmePlayer,
187 "bear-a_enc-a.webm", 188 "bear-a_enc-a.webm",
188 kWebMAudioOnly, 189 kWebMAudioOnly,
189 "com.example.foo", 190 "com.example.foo",
190 MSE, 191 MSE,
191 kEmeNotSupportedError); 192 kEmeNotSupportedError);
192 } 193 }
193 194
194 } // namespace content 195 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698