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

Unified Diff: content/browser/media_browsertest.cc

Issue 10452004: Add GSM_MS and PCM_ALAW codecs to CrOS FFMPEG. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/media_browsertest.cc
===================================================================
--- content/browser/media_browsertest.cc (revision 147908)
+++ content/browser/media_browsertest.cc (working copy)
@@ -95,18 +95,22 @@
PlayVideo("bear_mpeg4_amrnb.3gp");
}
-// TODO(ihf): Enable these audio codecs for CrOS.
-// IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavAlaw) {
-// PlayVideo("bear_alaw.wav");
-// }
-// IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavGsmms) {
-// PlayVideo("bear_gsmms.wav");
-// }
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavGsmms) {
+ PlayVideo("bear_gsm_ms.wav");
DaleCurtis 2012/07/25 18:22:14 PlayAudio?
ilja 2012/07/25 20:09:37 Guilty of copy and pasting.
+}
IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavMulaw) {
PlayAudio("bear_mulaw.wav");
}
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearMovPcmS16be) {
+ PlayAudio("bear_pcm_s16be.mov");
DaleCurtis 2012/07/25 18:22:14 PlayVideo? Why .mov instead of .wav files? Also I'
ilja 2012/07/25 20:09:37 FFmpeg refuses to encode into big endian wav files
+}
+
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearMovPcmS24be) {
+ PlayAudio("bear_pcm_s24be.mov");
+}
+
IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearFlac) {
PlayAudio("bear.flac");
}

Powered by Google App Engine
This is Rietveld 408576698