Re-add AC3/EAC3 audio demuxing support

content/browser/media/media_canplaytype_browsertest.cc

 // Copyright 2014 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 <string>
 
 #include "content/browser/media/media_browsertest.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
@@ skipping 154 matching lines @@
               CanPlay("'" + mime + "; codecs=\", AVC3.64001F, MP4.40.02\"'"));
 
     // Unknown codecs.
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc2\"'"));
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc4\"'"));
 
     EXPECT_EQ(kNot, CanPlay("'" + mime + "; codecs=\"avc1x\"'"));
     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\"'"));
   }
 
   void TestOGGUnacceptableCombinations(const std::string& mime) {
     // Codecs not belonging to OGG container.
     EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8\"'"));
     EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8.0\"'"));
     EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8, opus\"'"));
     EXPECT_EQ(kNot, CanPlay("'" + mime +"; codecs=\"vp8, vorbis\"'"));
 
@@ skipping 849 matching lines @@
   EXPECT_EQ(maybeCanPlayHLS,
       CanPlay("'application/vnd.apple.mpegurl; "
               "codecs=\"avc1.42E01E, mp4a.40\"'"));
   EXPECT_EQ(maybeCanPlayHLS,
       CanPlay("'application/vnd.apple.mpegurl; "
               "codecs=\"avc3.42E01E, mp4a.40\"'"));
 
   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