From de2bc944caede0b997b99045aa9bda6fe9bb8afd Mon Sep 17 00:00:00 2001
From: Cedric T <cedric.tio@xperi.com>
Date: Sat, 20 Apr 2024 12:08:14 +0800
Subject: [PATCH 1/2] Fix ENCODING_DTS_UHD_P2 Issue

---
 .../java/androidx/media3/exoplayer/audio/DefaultAudioSink.java   | 1 +
 .../exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
index ad572d92c4..a6753232e4 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java
@@ -1779,6 +1779,7 @@ public final class DefaultAudioSink implements AudioSink {
         return AacUtil.AAC_LD_AUDIO_SAMPLE_COUNT;
       case C.ENCODING_DTS:
       case C.ENCODING_DTS_HD:
+      case C.ENCODING_DTS_UHD_P2:
         return DtsUtil.parseDtsAudioSampleCount(buffer);
       case C.ENCODING_AC3:
       case C.ENCODING_E_AC3:
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java
index d1a00a21a5..88a01d8aa8 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java
@@ -304,6 +304,7 @@ public class DefaultAudioTrackBufferSizeProvider
       case C.ENCODING_DTS:
         return DtsUtil.DTS_MAX_RATE_BYTES_PER_SECOND;
       case C.ENCODING_DTS_HD:
+      case C.ENCODING_DTS_UHD_P2:
         return DtsUtil.DTS_HD_MAX_RATE_BYTES_PER_SECOND;
       case C.ENCODING_DOLBY_TRUEHD:
         return Ac3Util.TRUEHD_MAX_RATE_BYTES_PER_SECOND;

From 6363017e886cd5f41288a48d8d8a967fd5342c82 Mon Sep 17 00:00:00 2001
From: microkatz <michaelkatz@google.com>
Date: Fri, 3 May 2024 14:32:30 +0000
Subject: [PATCH 2/2] Fix DTS:X Profile 2 encoding attributes for passthrough
 playback

---
 RELEASENOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6ad2ece252..546a454d21 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -31,6 +31,8 @@
         and H.262 HLS streams
         ([#1126](https://github.com/google/ExoPlayer/issues/1126)).
 *   Audio:
+    *   Fix DTS:X Profile 2 encoding attributes for passthrough playback
+        ([#1299](https://github.com/androidx/media/pull/1299)).
 *   Video:
 *   Text:
     *   Fix issue where subtitles starting before a seek position are skipped.