Allow mp3 audio codec for mpeg2ts containers in MSE

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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 280 matching lines @@
   &kADTSCodecInfo,
   NULL
 };
 
 static StreamParser* BuildADTSParser(const std::vector<std::string>& codecs,
                                      const scoped_refptr<MediaLog>& media_log) {
   return new ADTSStreamParser();
 }
 
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
-static const CodecInfo* kVideoMP2TCodecs[] = {
-  &kH264AVC1CodecInfo,
-  &kH264AVC3CodecInfo,
-  &kMPEG4AACCodecInfo,
-  &kMPEG2AACLCCodecInfo,
-  NULL
-};
+// These codec ids correspond to object types registered with MP4RA and are the
+// same as MP3 audio codec ids in media/base/mime_util_internal.cc.
+// From http://www.mp4ra.org/object.html:
+// 69   Audio ISO/IEC 13818-3
+// 6B   Audio ISO/IEC 11172-3
+static const CodecInfo kMPEG2TS_MP3CodecInfo1 = {
+    "mp4a.69", CodecInfo::AUDIO, NULL, CodecInfo::HISTOGRAM_MP3};
+static const CodecInfo kMPEG2TS_MP3CodecInfo2 = {
+    "mp4a.6B", CodecInfo::AUDIO, NULL, CodecInfo::HISTOGRAM_MP3};
+
+static const CodecInfo* kVideoMP2TCodecs[] = {&kH264AVC1CodecInfo,
+                                              &kH264AVC3CodecInfo,
+                                              &kMPEG2TS_MP3CodecInfo1,
+                                              &kMPEG2TS_MP3CodecInfo2,
+                                              &kMPEG4AACCodecInfo,
+                                              &kMPEG2AACLCCodecInfo,
+                                              NULL};
 
 static StreamParser* BuildMP2TParser(const std::vector<std::string>& codecs,
                                      const scoped_refptr<MediaLog>& media_log) {
   bool has_sbr = false;
   for (size_t i = 0; i < codecs.size(); ++i) {
     std::string codec_id = codecs[i];
     if (base::MatchPattern(codec_id, kMPEG4AACCodecInfo.pattern)) {
       int audio_object_type = GetMP4AudioObjectType(codec_id, media_log);
       if (audio_object_type == kAACSBRObjectType ||
           audio_object_type == kAACPSObjectType) {
@@ skipping 164 matching lines @@
                                 CodecInfo::HISTOGRAM_MAX + 1);
     }
 
     stream_parser.reset(factory_function(codecs, media_log));
   }
 
   return stream_parser;
 }
 
 }  // namespace media