Add GSM_MS and PCM_ALAW codecs to CrOS FFMPEG.

content/browser/media_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 77 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(MediaTest, VideoBear3gpAacH264) {
   PlayVideo("bear_h264_aac.3gp");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaTest, VideoBear3gpAmrnbMpeg4) {
   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'm thinking we should enable
the be variants for all of chromium, not just ChromeOS.

[ilja, 2012/07/25 20:09:37]

FFmpeg refuses to encode into big endian wav files. I could not find any samples
online. Remember we encountered them inside of the skydiving video. But we
should check with rbultje.
The skydiving video was a video that did not play on Chrome but on CrOS. (The
link is dead unfortunately.) If there is a way to encounter this variant in
Chrome I agree we should enable it there.

+}
+
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearMovPcmS24be) {
+  PlayAudio("bear_pcm_s24be.mov");
+}
+
 IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearFlac) {
   PlayAudio("bear.flac");
 }
 #endif
 #endif
 
 IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavPcm) {
   PlayAudio("bear_pcm.wav");
 }
 
@@ skipping 30 matching lines @@
 }
 
 // TODO(dalecurtis): Disabled because loop is flaky.  http://crbug.com/134021
 // IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
 //   RunLayoutTest("video-loop.html");
 // }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }