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

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

Issue 1914923005: media: Enable FrameSizeChangeVideo test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 "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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 if (!media::PlatformHasOpusSupport()) 184 if (!media::PlatformHasOpusSupport())
185 return; 185 return;
186 #endif 186 #endif
187 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); 187 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
188 } 188 }
189 189
190 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 190 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
191 TestConfigChange(); 191 TestConfigChange();
192 } 192 }
193 193
194 // Playback of this video on Android w/ Spitzer enabled causes glitches. See
195 // http://crbug.com/598963.
196 #if !defined(OS_ANDROID)
197 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { 194 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
198 TestFrameSizeChange(); 195 TestFrameSizeChange();
199 } 196 }
200 #endif
201 197
202 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) { 198 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, UnknownKeySystemThrowsException) {
203 RunEncryptedMediaTest(kDefaultEmePlayer, 199 RunEncryptedMediaTest(kDefaultEmePlayer,
204 "bear-a_enc-a.webm", 200 "bear-a_enc-a.webm",
205 kWebMAudioOnly, 201 kWebMAudioOnly,
206 "com.example.foo", 202 "com.example.foo",
207 MSE, 203 MSE,
208 kEmeNotSupportedError); 204 kEmeNotSupportedError);
209 } 205 }
210 206
211 } // namespace content 207 } // 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