Re-add AC3/EAC3 audio demuxing support

media/filters/stream_parser_factory.cc

 // Copyright (c) 2013 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 "media/filters/stream_parser_factory.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
     HISTOGRAM_UNKNOWN,
     HISTOGRAM_VP8,
     HISTOGRAM_VP9,
     HISTOGRAM_VORBIS,
     HISTOGRAM_H264,
     HISTOGRAM_MPEG2AAC,
     HISTOGRAM_MPEG4AAC,
     HISTOGRAM_EAC3,
     HISTOGRAM_MP3,
     HISTOGRAM_OPUS,
-    HISTOGRAM_MAX = HISTOGRAM_OPUS  // Must be equal to largest logged entry.
+    HISTOGRAM_AC3,
+    HISTOGRAM_MAX = HISTOGRAM_AC3  // Must be equal to largest logged entry.
   };
 
   const char* pattern;
   Type type;
   CodecIDValidatorFunction validator;
   HistogramTag tag;
 };
 
 typedef StreamParser* (*ParserFactoryFunction)(
     const std::vector<std::string>& codecs,
@@ skipping 79 matching lines @@
 static const CodecInfo kH264AVC1CodecInfo = { "avc1.*", CodecInfo::VIDEO, NULL,
                                               CodecInfo::HISTOGRAM_H264 };
 static const CodecInfo kH264AVC3CodecInfo = { "avc3.*", CodecInfo::VIDEO, NULL,
                                               CodecInfo::HISTOGRAM_H264 };
 static const CodecInfo kMPEG4AACCodecInfo = { "mp4a.40.*", CodecInfo::AUDIO,
                                               &ValidateMP4ACodecID,
                                               CodecInfo::HISTOGRAM_MPEG4AAC };
 static const CodecInfo kMPEG2AACLCCodecInfo = { "mp4a.67", CodecInfo::AUDIO,
                                                 NULL,
                                                 CodecInfo::HISTOGRAM_MPEG2AAC };
+#if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+// The 'ac-3' and 'ec-3' are mime codec ids for AC3 and EAC3 according to
+// http://www.mp4ra.org/codecs.html
+// The object types for AC3 and EAC3 in MP4 container are 0xa5 and 0xa6, so
+// according to RFC 6381 this corresponds to codec ids 'mp4a.a5' and 'mp4a.a6'.
+// Different applications use different codec ids.
+static const CodecInfo kAC3CodecInfo1 =  { "ac-3", CodecInfo::AUDIO, NULL,
+                                          CodecInfo::HISTOGRAM_AC3 };
+static const CodecInfo kAC3CodecInfo2 =  { "mp4a.a5", CodecInfo::AUDIO, NULL,
+                                          CodecInfo::HISTOGRAM_AC3 };
+static const CodecInfo kEAC3CodecInfo1 = { "ec-3", CodecInfo::AUDIO, NULL,
+                                          CodecInfo::HISTOGRAM_EAC3 };
+static const CodecInfo kEAC3CodecInfo2 = { "mp4a.a6", CodecInfo::AUDIO, NULL,
+                                          CodecInfo::HISTOGRAM_EAC3 };
+#endif
 
 static const CodecInfo* kVideoMP4Codecs[] = {
   &kH264AVC1CodecInfo,
   &kH264AVC3CodecInfo,
   &kMPEG4AACCodecInfo,
   &kMPEG2AACLCCodecInfo,
   NULL
 };
 
 static const CodecInfo* kAudioMP4Codecs[] = {
   &kMPEG4AACCodecInfo,
   &kMPEG2AACLCCodecInfo,
+#if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+  &kAC3CodecInfo1,
+  &kAC3CodecInfo2,
+  &kEAC3CodecInfo1,
+  &kEAC3CodecInfo2,
+#endif
   NULL
 };
 
 static StreamParser* BuildMP4Parser(
     const std::vector<std::string>& codecs, const LogCB& log_cb) {
   std::set<int> audio_object_types;
 
   bool has_sbr = false;
   for (size_t i = 0; i < codecs.size(); ++i) {
     std::string codec_id = codecs[i];
     if (MatchPattern(codec_id, kMPEG2AACLCCodecInfo.pattern)) {
       audio_object_types.insert(mp4::kISO_13818_7_AAC_LC);
     } else if (MatchPattern(codec_id, kMPEG4AACCodecInfo.pattern)) {
       int audio_object_type = GetMP4AudioObjectType(codec_id, log_cb);
       DCHECK_GT(audio_object_type, 0);
 
       audio_object_types.insert(mp4::kISO_14496_3);
 
       if (audio_object_type == kAACSBRObjectType ||
           audio_object_type == kAACPSObjectType) {
         has_sbr = true;
         break;
       }
+#if defined(ENABLE_AC3_EAC3_AUDIO_DEMUXING)
+    } else if (MatchPattern(codec_id, kAC3CodecInfo1.pattern)
+               || MatchPattern(codec_id, kAC3CodecInfo2.pattern)) {

[DaleCurtis, 2015/01/14 23:36:33]

|| on above line. 

[servolk, 2015/01/15 00:06:45]

Done.

+      audio_object_types.insert(mp4::kAC3);
+    } else if (MatchPattern(codec_id, kEAC3CodecInfo1.pattern)
+               || MatchPattern(codec_id, kEAC3CodecInfo2.pattern)) {

[DaleCurtis, 2015/01/14 23:36:33]

Ditto.

[servolk, 2015/01/15 00:06:45]

Done.

+      audio_object_types.insert(mp4::kEAC3);
+#endif
     }
   }
 
   return new mp4::MP4StreamParser(audio_object_types, has_sbr);
 }
 
 static const CodecInfo kMP3CodecInfo = { NULL, CodecInfo::AUDIO, NULL,
                                          CodecInfo::HISTOGRAM_MP3 };
 
 static const CodecInfo* kAudioMP3Codecs[] = {
@@ skipping 214 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, log_cb));
   }
 
   return stream_parser.Pass();
 }
 
 }  // namespace media