From 09a5ef505ba26ba5341383d32ece6e4f0327260d Mon Sep 17 00:00:00 2001 From: michaelkatz Date: Thu, 26 Sep 2024 07:00:22 -0700 Subject: [PATCH] Assign the `C.TRACK_TYPE_METADATA` type to icy or vnd.dvb.ait tracks The MetadataRenderer by default supports icy and vnd.dvb.ait content. Those tracks should therefore be set with the `C.TrackType` `TRACK_TYPE_METADATA` rather than `TRACK_TYPE_UNKNOWN`. PiperOrigin-RevId: 679132680 --- RELEASENOTES.md | 2 ++ .../src/main/java/androidx/media3/common/MimeTypes.java | 4 +++- .../src/test/java/androidx/media3/common/MimeTypesTest.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index bb663b186b..df6e763e39 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -69,6 +69,8 @@ ([#1619](https://github.com/androidx/media/issues/1619)). * Text: * Metadata: + * Assign the `C.TRACK_TYPE_METADATA` type to tracks containing icy or + vnd.dvb.ait content. * Image: * DataSource: * DRM: diff --git a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java index fc69c0bd31..bd35e90d2c 100644 --- a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java +++ b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java @@ -601,7 +601,9 @@ public final class MimeTypes { return C.TRACK_TYPE_IMAGE; } else if (APPLICATION_ID3.equals(mimeType) || APPLICATION_EMSG.equals(mimeType) - || APPLICATION_SCTE35.equals(mimeType)) { + || APPLICATION_SCTE35.equals(mimeType) + || APPLICATION_ICY.equals(mimeType) + || APPLICATION_AIT.equals(mimeType)) { return C.TRACK_TYPE_METADATA; } else if (APPLICATION_CAMERA_MOTION.equals(mimeType)) { return C.TRACK_TYPE_CAMERA_MOTION; diff --git a/libraries/common/src/test/java/androidx/media3/common/MimeTypesTest.java b/libraries/common/src/test/java/androidx/media3/common/MimeTypesTest.java index 7c2ec51e2a..6f3e703ced 100644 --- a/libraries/common/src/test/java/androidx/media3/common/MimeTypesTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/MimeTypesTest.java @@ -148,6 +148,7 @@ public final class MimeTypesTest { assertThat(MimeTypes.getTrackType(MimeTypes.APPLICATION_CEA608)).isEqualTo(C.TRACK_TYPE_TEXT); assertThat(MimeTypes.getTrackType(MimeTypes.APPLICATION_EMSG)).isEqualTo(C.TRACK_TYPE_METADATA); + assertThat(MimeTypes.getTrackType(MimeTypes.APPLICATION_AIT)).isEqualTo(C.TRACK_TYPE_METADATA); assertThat(MimeTypes.getTrackType(MimeTypes.APPLICATION_CAMERA_MOTION)) .isEqualTo(C.TRACK_TYPE_CAMERA_MOTION); assertThat(MimeTypes.getTrackType("application/custom")).isEqualTo(C.TRACK_TYPE_UNKNOWN);