Allow mp3 audio codec for mpeg2ts containers in MSE

media/formats/mp2t/mp2t_stream_parser.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 "media/formats/mp2t/mp2t_stream_parser.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
 // TODO(dougsteed). Consider adding support for the following:
 // const int64_t kSampleAESPrivateDataIndicatorAC3 = 0x61633364;
 // const int64_t kSampleAESPrivateDataIndicatorEAC3 = 0x65633364;
 #endif
 
 }  // namespace
 
 enum StreamType {
   // ISO-13818.1 / ITU H.222 Table 2.34 "Stream type assignments"
   kStreamTypeMpeg1Audio = 0x3,
+  // ISO/IEC 13818-3 Audio (MPEG-2)
+  kStreamTypeMpeg2Audio = 0x4,
   kStreamTypeAAC = 0xf,
   kStreamTypeAVC = 0x1b,
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
   kStreamTypeAACWithSampleAES = 0xcf,
   kStreamTypeAVCWithSampleAES = 0xdb,
 // TODO(dougsteed). Consider adding support for the following:
 //  kStreamTypeAC3WithSampleAES = 0xc1,
 //  kStreamTypeEAC3WithSampleAES = 0xc2,
 #endif
 };
@@ skipping 353 matching lines @@
     es_parser.reset(
         new EsParserAdts(
             base::Bind(&Mp2tStreamParser::OnAudioConfigChanged,
                        base::Unretained(this),
                        pes_pid),
             base::Bind(&Mp2tStreamParser::OnEmitAudioBuffer,
                        base::Unretained(this),
                        pes_pid),
             sbr_in_mimetype_));
     is_audio = true;
-  } else if (stream_type == kStreamTypeMpeg1Audio) {
+  } else if (stream_type == kStreamTypeMpeg1Audio ||
+             stream_type == kStreamTypeMpeg2Audio) {
     es_parser.reset(new EsParserMpeg1Audio(
         base::Bind(&Mp2tStreamParser::OnAudioConfigChanged,
                    base::Unretained(this), pes_pid),
         base::Bind(&Mp2tStreamParser::OnEmitAudioBuffer, base::Unretained(this),
                    pes_pid),
         media_log_));
     is_audio = true;
 #if BUILDFLAG(ENABLE_HLS_SAMPLE_AES)
   } else if (stream_type == kStreamTypeAVCWithSampleAES &&
              descriptors.HasPrivateDataIndicator(
@@ skipping 372 matching lines @@
 
 void Mp2tStreamParser::RegisterPsshBoxes(
     const std::vector<uint8_t>& init_data) {
   encrypted_media_init_data_cb_.Run(EmeInitDataType::CENC, init_data);
 }
 
 #endif
 
 }  // namespace mp2t
 }  // namespace media