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

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

Issue 2681683004: Report support for the flac codec in ogg containers. (Closed)
Patch Set: Add playback test. Created 3 years, 10 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 | content/browser/media/media_canplaytype_browsertest.cc » ('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 "content/browser/media/media_browsertest.h" 5 #include "content/browser/media/media_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { 227 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
228 PlayAudio("bear_gsm_ms.wav", GetParam()); 228 PlayAudio("bear_gsm_ms.wav", GetParam());
229 } 229 }
230 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 230 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
231 #endif // defined(OS_CHROMEOS) 231 #endif // defined(OS_CHROMEOS)
232 232
233 IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) { 233 IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlac) {
234 PlayAudio("bear.flac", GetParam()); 234 PlayAudio("bear.flac", GetParam());
235 } 235 }
236 236
237 IN_PROC_BROWSER_TEST_P(MediaTest, AudioBearFlacOgg) {
238 PlayVideo("bear-flac.ogg", GetParam());
239 }
240
237 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) { 241 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) {
238 PlayAudio("bear_alaw.wav", GetParam()); 242 PlayAudio("bear_alaw.wav", GetParam());
239 } 243 }
240 244
241 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { 245 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
242 PlayAudio("bear_mulaw.wav", GetParam()); 246 PlayAudio("bear_mulaw.wav", GetParam());
243 } 247 }
244 248
245 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { 249 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
246 PlayAudio("bear_pcm.wav", GetParam()); 250 PlayAudio("bear_pcm.wav", GetParam());
(...skipping 15 matching lines...) Expand all
262 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) { 266 IN_PROC_BROWSER_TEST_F(MediaTest, Navigate) {
263 PlayVideo("bear.webm", false); 267 PlayVideo("bear.webm", false);
264 NavigateToURL(shell(), GURL(url::kAboutBlankURL)); 268 NavigateToURL(shell(), GURL(url::kAboutBlankURL));
265 EXPECT_FALSE(shell()->web_contents()->IsCrashed()); 269 EXPECT_FALSE(shell()->web_contents()->IsCrashed());
266 } 270 }
267 271
268 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); 272 INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false));
269 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); 273 INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true));
270 274
271 } // namespace content 275 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/media_canplaytype_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698