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

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

Issue 25660014: Add alaw codec for .wav files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/audio_decoder_config.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 "content/browser/media/media_browsertest.h" 5 #include "content/browser/media/media_browsertest.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/common/url_constants.h" 10 #include "content/public/common/url_constants.h"
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 162
163 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) { 163 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBear3gpAmrnbMpeg4) {
164 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam()); 164 PlayVideo("bear_mpeg4_amrnb.3gp", GetParam());
165 } 165 }
166 166
167 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) { 167 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavGsmms) {
168 PlayAudio("bear_gsm_ms.wav", GetParam()); 168 PlayAudio("bear_gsm_ms.wav", GetParam());
169 } 169 }
170 170
171 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavAlaw) {
DaleCurtis 2013/11/05 01:50:18 Just realized these alaw and mulaw tests were in t
ilja 2013/11/05 02:26:52 Moved to general section as discussed.
172 PlayAudio("bear_alaw.wav", GetParam());
173 }
174
171 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) { 175 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavMulaw) {
172 PlayAudio("bear_mulaw.wav", GetParam()); 176 PlayAudio("bear_mulaw.wav", GetParam());
173 } 177 }
174 178
175 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { 179 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
176 PlayAudio("bear.flac", GetParam()); 180 PlayAudio("bear.flac", GetParam());
177 } 181 }
178 #endif 182 #endif
179 #endif 183 #endif
180 184
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 } 244 }
241 245
242 #if defined(OS_CHROMEOS) 246 #if defined(OS_CHROMEOS)
243 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) { 247 IN_PROC_BROWSER_TEST_F(MediaTest, Yuv420pMpeg4) {
244 RunColorFormatTest("yuv420p.avi", "ENDED"); 248 RunColorFormatTest("yuv420p.avi", "ENDED");
245 } 249 }
246 #endif // defined(OS_CHROMEOS) 250 #endif // defined(OS_CHROMEOS)
247 #endif // defined(USE_PROPRIETARY_CODECS) 251 #endif // defined(USE_PROPRIETARY_CODECS)
248 252
249 } // namespace content 253 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | media/base/audio_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698