Re-add AC3/EAC3 audio demuxing support

content/browser/media/media_canplaytype_browsertest.cc

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..441f719f234a702943eeda8dff2a3ed56f3d66b8 100644
--- a/content/browser/media/media_canplaytype_browsertest.cc
+++ b/content/browser/media/media_canplaytype_browsertest.cc
@@ -172,6 +172,13 @@ class MediaCanPlayTypeTest : public MediaBrowserTest {
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc3x\"'"));
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4ax\"'"));
 
+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"ac-2\"'"));
+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"ec-2\"'"));
+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"ac-4\"'"));

[ddorwin, 2015/03/02 19:35:38]

nit: add ec-4 for completeness/consistency

[servolk, 2015/11/24 19:45:17]

Done.

+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.a4\"'"));
+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.a7\"'"));
+    EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"mp4a.a5.1\"'"));

[ddorwin, 2015/03/02 19:35:38]

Add: mp4a.a5. (ends in period)

[servolk, 2015/11/24 19:45:17]

Done.

+
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"unknown\"'"));
   }
 
@@ -1041,4 +1048,21 @@ IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_HLS) {
   TestMPEGUnacceptableCombinations("application/vnd.apple.mpegurl");
 }
 
+IN_PROC_BROWSER_TEST_F(MediaCanPlayTypeTest, CodecSupportTest_ac3_eac3) {
+  const char* expected_result = kNot;

[ddorwin, 2015/03/02 19:35:38]

You'll probably need to move this up to line 20.

[servolk, 2015/11/24 19:45:17]

Done.

+#if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+  expected_result = kProbably;
+#endif
+  // AC3
+  EXPECT_EQ(expected_result, CanPlay("'audio/mp4; codecs=\"ac-3\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'audio/mp4; codecs=\"mp4a.a5\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'video/mp4; codecs=\"ac-3\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'video/mp4; codecs=\"mp4a.a5\"'"));
+  // EAC3 aka DD+ aka Dolby Digital Plus
+  EXPECT_EQ(expected_result, CanPlay("'audio/mp4; codecs=\"ec-3\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'audio/mp4; codecs=\"mp4a.a6\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'video/mp4; codecs=\"ec-3\"'"));
+  EXPECT_EQ(expected_result, CanPlay("'video/mp4; codecs=\"mp4a.a6\"'"));
+}
+
 }  // namespace content