From 716cbceaa4705cb4de8be1b09a4e1d7cbc5d991d Mon Sep 17 00:00:00 2001
From: Scott <scott@protostream.io>
Date: Thu, 8 Jul 2021 11:07:56 +0100
Subject: [PATCH] Updates to mp4 atom extractor/parser for dtsx support.

---
 .../java/com/google/android/exoplayer2/extractor/mp4/Atom.java | 3 +++
 .../google/android/exoplayer2/extractor/mp4/AtomParsers.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
index 1cb554151f..ffdab2f6e8 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java
@@ -162,6 +162,9 @@ import java.util.List;
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_dtse = 0x64747365;
 
+  @SuppressWarnings("ConstantCaseForConstants")
+  public static final int TYPE_dtsx = 0x64747378;
+
   @SuppressWarnings("ConstantCaseForConstants")
   public static final int TYPE_ddts = 0x64647473;
 
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
index 5da35527a5..7156be96af 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
@@ -964,6 +964,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
           || childAtomType == Atom.TYPE_dtse
           || childAtomType == Atom.TYPE_dtsh
           || childAtomType == Atom.TYPE_dtsl
+          || childAtomType == Atom.TYPE_dtsx
           || childAtomType == Atom.TYPE_samr
           || childAtomType == Atom.TYPE_sawb
           || childAtomType == Atom.TYPE_lpcm
@@ -1368,6 +1369,8 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       mimeType = MimeTypes.AUDIO_DTS_HD;
     } else if (atomType == Atom.TYPE_dtse) {
       mimeType = MimeTypes.AUDIO_DTS_EXPRESS;
+    } else if (atomType == Atom.TYPE_dtsx) {
+      mimeType = MimeTypes.AUDIO_DTS_X;
     } else if (atomType == Atom.TYPE_samr) {
       mimeType = MimeTypes.AUDIO_AMR_NB;
     } else if (atomType == Atom.TYPE_sawb) {