Fall back from DTS HD to DTS

#minor-release PiperOrigin-RevId: 360384540
google · Mar 2, 2021 · 292700e · 292700e
1 parent 3f17f5d
commit 292700e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -11,6 +11,7 @@
         ([#6384](https://github.com/google/ExoPlayer/issues/6384)).
     *   Allow forcing offload for gapless content even if gapless playback is
         not supported.
+    *   Allow fall back from DTS-HD to DTS when playing via passthrough.
 *   Analytics:
     *   Add `onAudioCodecError` and `onVideoCodecError` to `AnalyticsListener`.
 *   Downloads and caching:

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -1505,6 +1505,10 @@ private static Pair<Integer, Integer> getEncodingAndChannelConfigForPassthrough(
         && !audioCapabilities.supportsEncoding(C.ENCODING_E_AC3_JOC)) {
       // E-AC3 receivers support E-AC3 JOC streams (but decode only the base layer).
       encoding = C.ENCODING_E_AC3;
+    } else if (encoding == C.ENCODING_DTS_HD
+        && !audioCapabilities.supportsEncoding(C.ENCODING_DTS_HD)) {
+      // DTS receivers support DTS-HD streams (but decode only the core layer).
+      encoding = C.ENCODING_DTS;
     }
     if (!audioCapabilities.supportsEncoding(encoding)) {
       return null;