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

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
« no previous file with comments | « no previous file | media/base/audio_decoder_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media_browsertest.cc
===================================================================
--- content/browser/media_browsertest.cc (revision 148920)
+++ content/browser/media_browsertest.cc (working copy)
@@ -91,18 +91,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) {
+ PlayAudio("bear_gsm_ms.wav");
+}
IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearWavMulaw) {
PlayAudio("bear_mulaw.wav");
}
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearMovPcmS16be) {
+ PlayVideo("bear_pcm_s16be.mov");
+}
+
+IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearMovPcmS24be) {
+ PlayVideo("bear_pcm_s24be.mov");
+}
+
IN_PROC_BROWSER_TEST_F(MediaTest, VideoBearFlac) {
PlayAudio("bear.flac");
}
« 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