From 79711ebd3f8626d9ec31f7ac18434625caeac28f Mon Sep 17 00:00:00 2001 From: tianyifeng Date: Mon, 13 Nov 2023 03:57:27 -0800 Subject: [PATCH] Parse "f800" as channel count of 5 for Dolby in DASH manifest Issue: androidx/media#688 PiperOrigin-RevId: 581908905 --- RELEASENOTES.md | 2 ++ .../media3/exoplayer/dash/manifest/DashManifestParser.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 637009d4b6..4bfefb5fb0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -63,6 +63,8 @@ * Extend experimental support for parsing subtitles during extraction to work with standalone text files (previously it only worked with subtitles muxed into MP4 segments). + * Parse "f800" as channel count of 5 for Dolby in DASH manifest + ([#688](https://github.com/androidx/media/issues/688)). * Smooth Streaming Extension: * RTSP Extension: * Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.): diff --git a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/DashManifestParser.java b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/DashManifestParser.java index 18424128d3..a15c28d923 100644 --- a/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/DashManifestParser.java +++ b/libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/DashManifestParser.java @@ -2020,6 +2020,8 @@ public class DashManifestParser extends DefaultHandler return 1; case "a000": return 2; + case "f800": + return 5; case "f801": return 6; case "fa01":