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

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

Issue 2445533002: Don't suspend the pipeline before HaveFutureData while decoding progressing (Closed)
Patch Set: fix compiler error from rebase Created 4 years, 1 month 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 | content/renderer/media/android/webmediaplayer_android.h » ('j') | 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 "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
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) 209 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
210 // Flaky on android: https://crbug.com/655630
211 #define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
212 #else
213 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
214 #endif
215
216 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
217 TestFrameSizeChange(); 210 TestFrameSizeChange();
218 } 211 }
219 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS) 212 #endif // !defined(DISABLE_ENCRYPTED_MEDIA_PLAYBACK_TESTS)
220 213
221 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 214 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
222 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", 215 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm",
223 kWebMVorbisAudioOnly, "com.example.foo", MSE, 216 kWebMVorbisAudioOnly, "com.example.foo", MSE,
224 kEmeNotSupportedError); 217 kEmeNotSupportedError);
225 } 218 }
226 219
227 #if defined(OS_ANDROID) 220 #if defined(OS_ANDROID)
228 // On Android, External Clear Key is supported in //content/shell/ by using mojo 221 // On Android, External Clear Key is supported in //content/shell/ by using mojo
229 // CDM with AesDecryptor running in the GPU process. 222 // CDM with AesDecryptor running in the GPU process.
230 // On other platforms, External Clear Key is supported in chrome/, so it is 223 // On other platforms, External Clear Key is supported in chrome/, so it is
231 // tested in browser_tests. 224 // tested in browser_tests.
232 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ExternalClearKeyPlayback) { 225 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, ExternalClearKeyPlayback) {
233 RunSimpleEncryptedMediaTest("bear-320x240-av_enc-av.webm", 226 RunSimpleEncryptedMediaTest("bear-320x240-av_enc-av.webm",
234 kWebMVorbisAudioVP8Video, 227 kWebMVorbisAudioVP8Video,
235 kExternalClearKeyKeySystem, MSE); 228 kExternalClearKeyKeySystem, MSE);
236 } 229 }
237 #endif 230 #endif
238 231
239 } // namespace content 232 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698