Add DTS Express Audio Enumerations and Definitions under

ENABLE_PLATFORM_DTS_AUDIO build flag.

DTS Express will become an additional supported audio type, enabled only
under the existing ENABLE_PLATFORM_DTS_AUDIO build flag.  There will be
no change in behavior when this build flag is not enabled.

Bug: 1413791
Change-Id: Ib24ccc70fb3c89e0ed026dc8a43c39a4eaafc89e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4228514
Reviewed-by: Mark Foltz <mfoltz@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Will Cassella <cassew@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1104039}

chrome/renderer/media/chrome_key_systems.cc

@@ -177,6 +177,7 @@ SupportedCodecs GetSupportedCodecs(const media::CdmCapability& capability,
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
       case media::AudioCodec::kDTS:
         supported_codecs |= media::EME_CODEC_DTS;
+        supported_codecs |= media::EME_CODEC_DTSE;
         supported_codecs |= media::EME_CODEC_DTSXP2;
         break;
 #endif  // BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)

chromecast/media/base/media_codec_support.cc

@@ -33,6 +33,8 @@ AudioCodec ToCastAudioCodec(const ::media::AudioCodec codec) {
       return kCodecDTS;
     case ::media::AudioCodec::kDTSXP2:
       return kCodecDTSXP2;
+    case ::media::AudioCodec::kDTSE:
+      return kCodecDTSE;
     case ::media::AudioCodec::kFLAC:
       return kCodecFLAC;
     case ::media::AudioCodec::kMpegHAudio:

chromecast/media/cma/base/decoder_config_adapter.cc

@@ -45,6 +45,8 @@ AudioCodec ToAudioCodec(const ::media::AudioCodec audio_codec) {
       return kCodecDTS;
     case ::media::AudioCodec::kDTSXP2:
       return kCodecDTSXP2;
+    case ::media::AudioCodec::kDTSE:
+      return kCodecDTSE;
     default:
       LOG(ERROR) << "Unsupported audio codec " << audio_codec;
   }
@@ -60,6 +62,7 @@ SampleFormat ToSampleFormat(const ::media::SampleFormat sample_format) {
     case ::media::kSampleFormatDtsxP2:
     case ::media::kSampleFormatMpegHAudio:
     case ::media::kSampleFormatIECDts:
+    case ::media::kSampleFormatDtse:
       return kUnknownSampleFormat;
     case ::media::kSampleFormatU8:
       return kSampleFormatU8;
@@ -141,6 +144,8 @@ ::media::AudioCodec ToMediaAudioCodec(
       return ::media::AudioCodec::kDTS;
     case kCodecDTSXP2:
       return ::media::AudioCodec::kDTSXP2;
+    case kCodecDTSE:
+      return ::media::AudioCodec::kDTSE;
     default:
       return ::media::AudioCodec::kUnknown;
   }

chromecast/media/common/base/decoder_config_logging.cc

@@ -31,6 +31,8 @@ std::ostream& operator<<(std::ostream& stream,
       return stream << "DTS";
     case ::chromecast::media::kCodecDTSXP2:
       return stream << "DTS:X Profile 2";
+    case ::chromecast::media::kCodecDTSE:
+      return stream << "DTS Express";
     case ::chromecast::media::kCodecFLAC:
       return stream << "FLAC";
     case ::chromecast::media::kCodecMpegHAudio:

chromecast/media/mojom/decoder_config_mojom_traits.h

@@ -38,6 +38,8 @@ struct mojo::EnumTraits<chromecast::media::mojom::AudioCodec,
         return chromecast::media::mojom::AudioCodec::kCodecDTS;
       case (chromecast::media::AudioCodec::kCodecDTSXP2):
         return chromecast::media::mojom::AudioCodec::kCodecDTSXP2;
+      case (chromecast::media::AudioCodec::kCodecDTSE):
+        return chromecast::media::mojom::AudioCodec::kCodecDTSE;
       case (chromecast::media::AudioCodec::kCodecFLAC):
         return chromecast::media::mojom::AudioCodec::kCodecFLAC;
       case (chromecast::media::AudioCodec::kCodecMpegHAudio):
@@ -83,6 +85,9 @@ struct mojo::EnumTraits<chromecast::media::mojom::AudioCodec,
       case (chromecast::media::mojom::AudioCodec::kCodecDTSXP2):
         *output = chromecast::media::AudioCodec::kCodecDTSXP2;
         return true;
+      case (chromecast::media::mojom::AudioCodec::kCodecDTSE):
+        *output = chromecast::media::AudioCodec::kCodecDTSE;
+        return true;
       case (chromecast::media::mojom::AudioCodec::kCodecFLAC):
         *output = chromecast::media::AudioCodec::kCodecFLAC;
         return true;

chromecast/media/mojom/media_types.mojom

@@ -16,6 +16,7 @@ enum AudioCodec {
   kCodecAC3,
   kCodecDTS,
   kCodecDTSXP2,
+  kCodecDTSE,
   kCodecFLAC,
   kCodecMpegHAudio,
 };

chromecast/public/media/decoder_config.h

@@ -35,9 +35,10 @@ enum AudioCodec : int {
   kCodecFLAC,
   kCodecMpegHAudio,
   kCodecDTSXP2,
+  kCodecDTSE,
 
   kAudioCodecMin = kAudioCodecUnknown,
-  kAudioCodecMax = kCodecDTSXP2,
+  kAudioCodecMax = kCodecDTSE,
 };
 
 enum class ChannelLayout {

chromecast/renderer/media/key_systems_cast.cc

@@ -151,7 +151,8 @@ SupportedCodecs GetCastEmeSupportedCodecs() {
 #endif  // BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
 
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
-  codecs |= ::media::EME_CODEC_DTS | ::media::EME_CODEC_DTSXP2;
+  codecs |= ::media::EME_CODEC_DTS | ::media::EME_CODEC_DTSE |
+            ::media::EME_CODEC_DTSXP2;
 #endif  // BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
 
 #if BUILDFLAG(ENABLE_PLATFORM_MPEG_H_AUDIO)

components/cdm/browser/cdm_message_filter_android.cc

@@ -80,6 +80,7 @@ const CodecInfo<media::AudioCodec> kMP4AudioCodecsToQuery[] = {
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
     {media::EME_CODEC_DTS, media::AudioCodec::kDTS},
     {media::EME_CODEC_DTSXP2, media::AudioCodec::kDTSXP2},
+    {media::EME_CODEC_DTSE, media::AudioCodec::kDTSE},
 #endif
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };

media/base/android/media_codec_util.cc

@@ -48,6 +48,7 @@ const char kVp8MimeType[] = "video/x-vnd.on2.vp8";
 const char kVp9MimeType[] = "video/x-vnd.on2.vp9";
 const char kAv1MimeType[] = "video/av01";
 const char kDtsMimeType[] = "audio/vnd.dts";
+const char kDtseMimeType[] = "audio/vnd.dts;profile=lbr";
 const char kDtsxP2MimeType[] = "audio/vnd.dts.uhd;profile=p2";
 }  // namespace
 
@@ -139,6 +140,8 @@ std::string MediaCodecUtil::CodecToAndroidMimeType(AudioCodec codec,
       return kEac3MimeType;
     case AudioCodec::kDTS:
       return kDtsMimeType;
+    case AudioCodec::kDTSE:
+      return kDtseMimeType;
     case AudioCodec::kDTSXP2:
       return kDtsxP2MimeType;
     default:
@@ -272,6 +275,8 @@ bool MediaCodecUtil::IsPassthroughAudioFormat(AudioCodec codec) {
   switch (codec) {
     case AudioCodec::kAC3:
     case AudioCodec::kEAC3:
+    case AudioCodec::kDTS:
+    case AudioCodec::kDTSXP2:
     case AudioCodec::kMpegHAudio:
       return true;
     default:

media/base/audio_buffer.cc

@@ -532,6 +532,7 @@ void AudioBuffer::TrimRange(int start, int end) {
       case kSampleFormatDts:
       case kSampleFormatDtsxP2:
       case kSampleFormatIECDts:
+      case kSampleFormatDtse:
         NOTREACHED() << "Invalid sample format!";
     }
   } else {

media/base/audio_codecs.cc

@@ -51,6 +51,8 @@ std::string GetCodecName(AudioCodec codec) {
       return "dts";
     case AudioCodec::kDTSXP2:
       return "dtsx-p2";
+    case AudioCodec::kDTSE:
+      return "dtse";
   }
 }
 
@@ -70,10 +72,15 @@ AudioCodec StringToAudioCodec(const std::string& codec_id) {
     return AudioCodec::kAC3;
   if (codec_id == "ec-3" || codec_id == "mp4a.A6" || codec_id == "mp4a.a6")
     return AudioCodec::kEAC3;
-  if (codec_id == "dtsc")
+  if (codec_id == "dtsc" || codec_id == "mp4a.A9" || codec_id == "mp4a.a9") {
     return AudioCodec::kDTS;
-  if (codec_id == "dtsx")
+  }
+  if (codec_id == "dtse" || codec_id == "mp4a.AC" || codec_id == "mp4a.ac") {
+    return AudioCodec::kDTSE;
+  }
+  if (codec_id == "dtsx" || codec_id == "mp4a.B2" || codec_id == "mp4a.b2") {
     return AudioCodec::kDTSXP2;
+  }
   if (codec_id == "mp3" || codec_id == "mp4a.69" || codec_id == "mp4a.6B")
     return AudioCodec::kMP3;
   if (codec_id == "alac")

media/base/audio_codecs.h

@@ -35,13 +35,14 @@ enum class AudioCodec {
   kMpegHAudio = 17,
   kDTS = 18,
   kDTSXP2 = 19,
+  kDTSE = 20,
   // DO NOT ADD RANDOM AUDIO CODECS!
   //
   // The only acceptable time to add a new codec is if there is production code
   // that uses said codec in the same CL.
 
   // Must always be equal to the largest entry ever logged.
-  kMaxValue = kDTSXP2,
+  kMaxValue = kDTSE,
 };
 
 enum class AudioCodecProfile {

media/base/demuxer_memory_limit_cast.cc

@@ -21,6 +21,7 @@ size_t GetDemuxerStreamAudioMemoryLimit(
     case AudioCodec::kAC3:
     case AudioCodec::kDTS:
     case AudioCodec::kDTSXP2:
+    case AudioCodec::kDTSE:
     case AudioCodec::kMpegHAudio:
       return internal::kDemuxerStreamAudioMemoryLimitMedium;
     case AudioCodec::kAAC:

media/base/eme_constants.h

@@ -48,6 +48,7 @@ enum EmeCodec : uint32_t {
   EME_CODEC_HEVC_PROFILE_MAIN10 = 1 << 19,
   EME_CODEC_DTS = 1 << 20,
   EME_CODEC_DTSXP2 = 1 << 21,
+  EME_CODEC_DTSE = 1 << 22,
 };
 
 // *_ALL values should only be used for masking, do not use them to specify
@@ -73,7 +74,7 @@ constexpr SupportedCodecs GetMp4AudioCodecs() {
   codecs |= EME_CODEC_AC3 | EME_CODEC_EAC3;
 #endif  // BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
-  codecs |= EME_CODEC_DTS | EME_CODEC_DTSXP2;
+  codecs |= EME_CODEC_DTS | EME_CODEC_DTSXP2 | EME_CODEC_DTSE;
 #endif  // BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
 #if BUILDFLAG(ENABLE_PLATFORM_MPEG_H_AUDIO)
   codecs |= EME_CODEC_MPEG_H_AUDIO;

media/base/key_systems.cc

@@ -87,6 +87,8 @@ EmeCodec ToAudioEmeCodec(AudioCodec codec) {
       return EME_CODEC_DTS;
     case AudioCodec::kDTSXP2:
       return EME_CODEC_DTSXP2;
+    case AudioCodec::kDTSE:
+      return EME_CODEC_DTSE;
     default:
       DVLOG(1) << "Unsupported AudioCodec " << codec;
       return EME_CODEC_NONE;

media/base/mime_util_internal.cc

@@ -96,6 +96,9 @@ const StringToCodecMap& GetStringToCodecMap() {
       {"dtsc", MimeUtil::DTS},
       {"mp4a.a9", MimeUtil::DTS},
       {"mp4a.A9", MimeUtil::DTS},
+      {"dtse", MimeUtil::DTSE},
+      {"mp4a.ac", MimeUtil::DTSE},
+      {"mp4a.AC", MimeUtil::DTSE},
       {"dtsx", MimeUtil::DTSXP2},
       {"mp4a.b2", MimeUtil::DTSXP2},
       {"mp4a.B2", MimeUtil::DTSXP2},
@@ -192,6 +195,8 @@ AudioCodec MimeUtilToAudioCodec(MimeUtil::Codec codec) {
       return AudioCodec::kDTS;
     case MimeUtil::DTSXP2:
       return AudioCodec::kDTSXP2;
+    case MimeUtil::DTSE:
+      return AudioCodec::kDTSE;
     default:
       break;
   }
@@ -353,6 +358,7 @@ void MimeUtil::AddSupportedMediaFormats() {
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
   mp4_audio_codecs.emplace(DTS);
   mp4_audio_codecs.emplace(DTSXP2);
+  mp4_audio_codecs.emplace(DTSE);
 #endif  // BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
 
   CodecSet mp4_codecs(mp4_audio_codecs);
@@ -665,6 +671,7 @@ bool MimeUtil::IsCodecSupportedOnAndroid(Codec codec,
 
     case DTS:
     case DTSXP2:
+    case DTSE:
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
       return true;
 #else

media/base/mime_util_internal.h

@@ -52,7 +52,8 @@ class MEDIA_EXPORT MimeUtil {
     MPEG_H_AUDIO,
     DTS,
     DTSXP2,
-    LAST_CODEC = DTSXP2
+    DTSE,
+    LAST_CODEC = DTSE
   };
 
   // Platform configuration structure.  Controls which codecs are supported at

media/base/mime_util_unittest.cc

@@ -593,6 +593,7 @@ TEST(IsCodecSupportedOnAndroidTest, EncryptedCodecBehavior) {
 
           case MimeUtil::DTS:
           case MimeUtil::DTSXP2:
+          case MimeUtil::DTSE:
             EXPECT_EQ(BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO), result);
             break;
         }
@@ -659,6 +660,7 @@ TEST(IsCodecSupportedOnAndroidTest, ClearCodecBehavior) {
 
           case MimeUtil::DTS:
           case MimeUtil::DTSXP2:
+          case MimeUtil::DTSE:
             EXPECT_EQ(BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO), result);
             break;
         }

media/base/sample_format.cc

@@ -21,6 +21,7 @@ int SampleFormatToBytesPerChannel(SampleFormat sample_format) {
     case kSampleFormatMpegHAudio:
     case kSampleFormatDts:
     case kSampleFormatDtsxP2:
+    case kSampleFormatDtse:
       return 1;
     case kSampleFormatS16:
     case kSampleFormatPlanarS16:
@@ -76,6 +77,8 @@ const char* SampleFormatToString(SampleFormat sample_format) {
       return "Compressed DTSXP2 bitstream";
     case kSampleFormatIECDts:
       return "IEC-61937 encapsulated DTS bitstream";
+    case kSampleFormatDtse:
+      return "Compressed DTS Express bitstream";
   }
   NOTREACHED() << "Invalid sample format provided: " << sample_format;
   return "";
@@ -100,6 +103,7 @@ bool IsPlanar(SampleFormat sample_format) {
     case kSampleFormatDts:
     case kSampleFormatDtsxP2:
     case kSampleFormatIECDts:
+    case kSampleFormatDtse:
       return false;
   }
 
@@ -120,6 +124,7 @@ bool IsInterleaved(SampleFormat sample_format) {
     case kSampleFormatDts:
     case kSampleFormatDtsxP2:
     case kSampleFormatIECDts:
+    case kSampleFormatDtse:
       return true;
     case kUnknownSampleFormat:
     case kSampleFormatPlanarU8:
@@ -156,6 +161,7 @@ bool IsBitstream(SampleFormat sample_format) {
     case kSampleFormatPlanarS16:
     case kSampleFormatPlanarF32:
     case kSampleFormatPlanarS32:
+    case kSampleFormatDtse:
       return false;
   }
 

media/base/sample_format.h

@@ -30,9 +30,10 @@ enum SampleFormat {
   kSampleFormatDts,         // Compressed DTS audio bitstream.
   kSampleFormatDtsxP2,      // Compressed DTSX audio bitstream.
   kSampleFormatIECDts,      // IEC-61937 encapsulated DTS audio bitstream.
+  kSampleFormatDtse,        // Compressed DTS Express audio bitstream.
 
   // Must always be equal to largest value ever logged.
-  kSampleFormatMax = kSampleFormatIECDts,
+  kSampleFormatMax = kSampleFormatDtse,
 };
 
 // Returns the number of bytes used per channel for the specified

media/base/supported_types.cc

@@ -186,6 +186,7 @@ bool IsAudioCodecProprietary(AudioCodec codec) {
     case AudioCodec::kMpegHAudio:
     case AudioCodec::kDTS:
     case AudioCodec::kDTSXP2:
+    case AudioCodec::kDTSE:
       return true;
 
     case AudioCodec::kFLAC:
@@ -384,6 +385,7 @@ bool IsDefaultSupportedAudioType(const AudioType& type) {
       return false;
     case AudioCodec::kDTS:
     case AudioCodec::kDTSXP2:
+    case AudioCodec::kDTSE:
 #if BUILDFLAG(ENABLE_PLATFORM_DTS_AUDIO)
       return true;
 #else

media/filters/android/media_codec_audio_decoder.cc

@@ -108,6 +108,7 @@ void MediaCodecAudioDecoder::Initialize(const AudioDecoderConfig& config,
     case AudioCodec::kEAC3:
     case AudioCodec::kDTS:
     case AudioCodec::kDTSXP2:
+    case AudioCodec::kDTSE:
     case AudioCodec::kMpegHAudio:
       is_passthrough_ = sample_format_ != kUnknownSampleFormat;
       // Check if MediaCodec Library supports decoding of the sample format.

media/filters/audio_renderer_algorithm_unittest.cc

@@ -163,6 +163,7 @@ class AudioRendererAlgorithmTest : public testing::Test {
             1, 1, frame_size, kNoTimestamp);
         break;
       case kSampleFormatDts:
+      case kSampleFormatDtse:
       case kSampleFormatDtsxP2:
         buffer = MakeBitstreamAudioBuffer(
             sample_format_, channel_layout_,