From 60e0546bea4254f25a23374dca64ee7c25c72e76 Mon Sep 17 00:00:00 2001 From: Rohit Singh Date: Thu, 16 Mar 2023 15:33:38 +0000 Subject: [PATCH] Merge pull request #11061 from cedricxperi:dts-udts-support PiperOrigin-RevId: 517067549 (cherry picked from commit 49d85d625c42177aaf0d6413ba7ee0ae7b4d580e) --- .../src/main/java/androidx/media3/extractor/mp4/Atom.java | 3 +++ .../main/java/androidx/media3/extractor/mp4/AtomParsers.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Atom.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Atom.java index 6256fa7f27..3f2cb72ad8 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Atom.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Atom.java @@ -176,6 +176,9 @@ import java.util.List; @SuppressWarnings("ConstantCaseForConstants") public static final int TYPE_ddts = 0x64647473; + @SuppressWarnings("ConstantCaseForConstants") + public static final int TYPE_udts = 0x75647473; + @SuppressWarnings("ConstantCaseForConstants") public static final int TYPE_tfdt = 0x74666474; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java index 5e290bc67d..d7b615538c 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java @@ -1560,7 +1560,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; // because these streams can carry simultaneously multiple representations of the same // audio. Use stereo by default. channelCount = 2; - } else if (childAtomType == Atom.TYPE_ddts) { + } else if (childAtomType == Atom.TYPE_ddts || childAtomType == Atom.TYPE_udts) { out.format = new Format.Builder() .setId(trackId)