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 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); |
| 173 } |
| 174 |
| 175 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { |
| 176 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); |
| 177 } |
| 178 |
| 179 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { |
| 180 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); |
| 181 } |
| 182 |
171 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { | 183 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { |
172 TestConfigChange(); | 184 TestConfigChange(); |
173 } | 185 } |
174 | 186 |
175 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { | 187 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { |
176 // Times out on Windows XP. http://crbug.com/171937 | 188 // Times out on Windows XP. http://crbug.com/171937 |
177 #if defined(OS_WIN) | 189 #if defined(OS_WIN) |
178 if (base::win::GetVersion() < base::win::VERSION_VISTA) | 190 if (base::win::GetVersion() < base::win::VERSION_VISTA) |
179 return; | 191 return; |
180 #endif | 192 #endif |
181 TestFrameSizeChange(); | 193 TestFrameSizeChange(); |
182 } | 194 } |
183 | 195 |
184 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { | 196 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { |
185 RunEncryptedMediaTest(kDefaultEmePlayer, | 197 RunEncryptedMediaTest(kDefaultEmePlayer, |
186 "bear-a_enc-a.webm", | 198 "bear-a_enc-a.webm", |
187 kWebMAudioOnly, | 199 kWebMAudioOnly, |
188 "com.example.foo", | 200 "com.example.foo", |
189 MSE, | 201 MSE, |
190 kEmeNotSupportedError); | 202 kEmeNotSupportedError); |
191 } | 203 } |
192 | 204 |
193 } // namespace content | 205 } // namespace content |
OLD | NEW |