OLD | NEW |
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 "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/media/media_browsertest.h" | 9 #include "content/browser/media/media_browsertest.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 if (!media::PlatformHasOpusSupport()) | 199 if (!media::PlatformHasOpusSupport()) |
200 return; | 200 return; |
201 #endif | 201 #endif |
202 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMOpusAudioVP9Video); | 202 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMOpusAudioVP9Video); |
203 } | 203 } |
204 | 204 |
205 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { | 205 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { |
206 TestConfigChange(); | 206 TestConfigChange(); |
207 } | 207 } |
208 | 208 |
209 #if defined(OS_ANDROID) | |
210 // Flaky on android: https://crbug.com/655630 | |
211 #define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo | |
212 #else | |
213 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo | 209 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo |
214 #endif | |
215 | 210 |
216 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) { | 211 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) { |
217 TestFrameSizeChange(); | 212 TestFrameSizeChange(); |
218 } | 213 } |
219 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS) | 214 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS) |
220 | 215 |
221 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 216 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
222 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", | 217 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", |
223 kWebMVorbisAudioOnly, "com.example.foo", MSE, | 218 kWebMVorbisAudioOnly, "com.example.foo", MSE, |
224 kEmeNotSupportedError); | 219 kEmeNotSupportedError); |
225 } | 220 } |
226 | 221 |
227 #if defined(OS_ANDROID) | 222 #if defined(OS_ANDROID) |
228 // On Android, External Clear Key is supported in //content/shell/ by using mojo | 223 // On Android, External Clear Key is supported in //content/shell/ by using mojo |
229 // CDM with AesDecryptor running in the GPU process. | 224 // CDM with AesDecryptor running in the GPU process. |
230 // On other platforms, External Clear Key is supported in chrome/, so it is | 225 // On other platforms, External Clear Key is supported in chrome/, so it is |
231 // tested in browser_tests. | 226 // tested in browser_tests. |
232 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ExternalClearKeyPlayback) { | 227 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ExternalClearKeyPlayback) { |
233 RunSimpleEncryptedMediaTest("bear-320x240-av_enc-av.webm", | 228 RunSimpleEncryptedMediaTest("bear-320x240-av_enc-av.webm", |
234 kWebMVorbisAudioVP8Video, | 229 kWebMVorbisAudioVP8Video, |
235 kExternalClearKeyKeySystem, MSE); | 230 kExternalClearKeyKeySystem, MSE); |
236 } | 231 } |
237 #endif | 232 #endif |
238 | 233 |
239 } // namespace content | 234 } // namespace content |
OLD | NEW |