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

Unified Diff: content/browser/media/media_canplaytype_browsertest.cc

Issue 812643005: Re-add AC3/EAC3 audio demuxing support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added browser tests for AC3/EAC3 Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | 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/media_canplaytype_browsertest.cc
diff --git a/content/browser/media/media_canplaytype_browsertest.cc b/content/browser/media/media_canplaytype_browsertest.cc
index b44a3a1f752a71eb1916f6e7d20322aa81c55a92..9cbf595039d4f38c4bfd0e85e2451e00b98accee 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -1041,4 +1041,20 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
}
+#if defined(ENABLE_AC3_EAC3_DEMUXING)
ddorwin 2015/02/27 01:44:13 We should always run the tests, but the expected r
servolk 2015/02/27 02:19:07 Done.
+IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_ac3_eac3) {
+ // AC3
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"ac-3\"'"));
ddorwin 2015/02/27 01:44:13 Please also test invalid variants, such as: ac-2 a
servolk 2015/02/27 02:19:07 Ok, I've added a few variants, should be enough fo
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"ac-3\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.a5\"'"));
+ // EAC3 aka DD+ aka Dolby Digital Plus
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"ec-3\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"ec-3\"'"));
+ EXPECT_EQ(kPropProbably, CanPlay("'video/mp4; codecs=\"mp4a.a6\"'"));
ddorwin 2015/02/27 01:44:13 There are many more test scenarios. For example, x
servolk 2015/02/27 02:19:07 What do you mean? I've basically taken one of the
ddorwin 2015/03/02 19:35:38 The tests are broken up by container, not codec. I
+}
+#endif
+}
+
} // namespace content
« no previous file with comments | « build/common.gypi ('k') | media/base/audio_decoder_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698