diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0ccde8e702..4b08366d42 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,6 +3,7 @@ ### Unreleased changes * Common Library: + * Add `Format.labels` to allow localized or other alternatives labels. * ExoPlayer: * Fix issue where `PreloadMediaPeriod` cannot retain the streams when it is preloaded again. @@ -100,6 +101,8 @@ * RTMP Extension: * HLS Extension: * DASH Extension: + * Populate all `Label` elements from the manifest into `Format.labels` + ([#1054](https://github.com/androidx/media/pull/1054)). * Smooth Streaming Extension: * RTSP Extension: * Skip empty session information values (i-tags) in SDP parsing diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java index 28e19abed5..cda7ac23e9 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Format.java +++ b/libraries/common/src/main/java/androidx/media3/common/Format.java @@ -15,6 +15,7 @@ */ package androidx.media3.common; +import static androidx.media3.common.util.Assertions.checkState; import static java.lang.annotation.ElementType.TYPE_USE; import android.os.Bundle; @@ -140,7 +141,7 @@ public static final class Builder { @Nullable private String id; @Nullable private String label; - @Nullable private List