| 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 "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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 } | 161 } |
| 162 | 162 |
| 163 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { | 163 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { |
| 164 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); | 164 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); |
| 165 } | 165 } |
| 166 | 166 |
| 167 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { | 167 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { |
| 168 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); | 168 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); |
| 169 } | 169 } |
| 170 | 170 |
| 171 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { |
| 172 // Opus is not supported on Android. http://crbug.com/318436 |
| 173 #if defined(OS_ANDROID) |
| 174 return; |
| 175 #endif |
| 176 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); |
| 177 } |
| 178 |
| 179 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { |
| 180 // Opus is not supported on Android. http://crbug.com/318436 |
| 181 #if defined(OS_ANDROID) |
| 182 return; |
| 183 #endif |
| 184 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); |
| 185 } |
| 186 |
| 187 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { |
| 188 // Opus is not supported on Android. http://crbug.com/318436 |
| 189 #if defined(OS_ANDROID) |
| 190 return; |
| 191 #endif |
| 192 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); |
| 193 } |
| 194 |
| 171 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { | 195 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { |
| 172 TestConfigChange(); | 196 TestConfigChange(); |
| 173 } | 197 } |
| 174 | 198 |
| 175 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { | 199 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { |
| 176 // Times out on Windows XP. http://crbug.com/171937 | 200 // Times out on Windows XP. http://crbug.com/171937 |
| 177 #if defined(OS_WIN) | 201 #if defined(OS_WIN) |
| 178 if (base::win::GetVersion() < base::win::VERSION_VISTA) | 202 if (base::win::GetVersion() < base::win::VERSION_VISTA) |
| 179 return; | 203 return; |
| 180 #endif | 204 #endif |
| 181 TestFrameSizeChange(); | 205 TestFrameSizeChange(); |
| 182 } | 206 } |
| 183 | 207 |
| 184 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 208 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
| 185 RunEncryptedMediaTest(kDefaultEmePlayer, | 209 RunEncryptedMediaTest(kDefaultEmePlayer, |
| 186 "bear-a_enc-a.webm", | 210 "bear-a_enc-a.webm", |
| 187 kWebMAudioOnly, | 211 kWebMAudioOnly, |
| 188 "com.example.foo", | 212 "com.example.foo", |
| 189 MSE, | 213 MSE, |
| 190 kEmeNotSupportedError); | 214 kEmeNotSupportedError); |
| 191 } | 215 } |
| 192 | 216 |
| 193 } // namespace content | 217 } // namespace content |
| OLD | NEW |