From df763220c838267d5775c5964008a52256fd5f27 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Tue, 30 Jan 2024 14:06:43 -0700
Subject: [PATCH 1/8] Replacing label with a list of Label elements in Format.

---
 gradle/wrapper/gradle-wrapper.properties      |  3 +-
 .../java/androidx/media3/common/Format.java   | 58 ++++++++-----
 .../java/androidx/media3/common/Label.java    | 82 +++++++++++++++++++
 .../androidx/media3/common/FormatTest.java    |  4 +-
 .../exoplayer/audio/DecoderAudioRenderer.java |  2 +-
 .../audio/MediaCodecAudioRenderer.java        |  2 +-
 .../source/DefaultMediaSourceFactory.java     | 12 ++-
 .../source/SingleSampleMediaSource.java       | 12 ++-
 .../mediaparser/OutputConsumerAdapterV30.java |  2 +-
 .../exoplayer/source/SampleQueueTest.java     |  2 +-
 .../dash/manifest/DashManifestParser.java     | 25 ++++--
 .../dash/manifest/DashManifestParserTest.java | 41 ++++++++--
 .../media3/exoplayer/hls/HlsMediaPeriod.java  | 11 +--
 .../exoplayer/hls/HlsSampleStreamWrapper.java |  2 +-
 .../hls/playlist/HlsPlaylistParser.java       |  5 +-
 .../manifest/SsManifestParser.java            | 10 ++-
 .../manifest/SsManifestParserTest.java        |  2 +-
 .../media3/extractor/avi/AviExtractor.java    |  6 +-
 .../extractor/mkv/MatroskaExtractor.java      |  5 +-
 .../media3/test/utils/DumpableFormat.java     |  2 +-
 .../media3/ui/DefaultTrackNameProvider.java   | 17 +++-
 21 files changed, 249 insertions(+), 56 deletions(-)
 create mode 100644 libraries/common/src/main/java/androidx/media3/common/Label.java

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3a02907943..dfc1cb3616 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jan 30 08:51:00 MST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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 1a9a77a214..0ee4413f08 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -49,7 +49,7 @@ import java.util.UUID;
  *
  * <ul>
  *   <li>{@link #id}
- *   <li>{@link #label}
+ *   <li>{@link #labels}
  *   <li>{@link #language}
  *   <li>{@link #selectionFlags}
  *   <li>{@link #roleFlags}
@@ -136,7 +136,7 @@ public final class Format implements Bundleable {
   public static final class Builder {
 
     @Nullable private String id;
-    @Nullable private String label;
+    @Nullable private List<Label> labels;
     @Nullable private String language;
     private @C.SelectionFlags int selectionFlags;
     private @C.RoleFlags int roleFlags;
@@ -224,7 +224,7 @@ public final class Format implements Bundleable {
      */
     private Builder(Format format) {
       this.id = format.id;
-      this.label = format.label;
+      this.labels = format.labels;
       this.language = format.language;
       this.selectionFlags = format.selectionFlags;
       this.roleFlags = format.roleFlags;
@@ -291,14 +291,14 @@ public final class Format implements Bundleable {
     }
 
     /**
-     * Sets {@link Format#label}. The default value is {@code null}.
+     * Sets {@link Format#labels}. The default value is {@code null}.
      *
-     * @param label The {@link Format#label}.
+     * @param labels The {@link Format#labels}.
      * @return The builder.
      */
     @CanIgnoreReturnValue
-    public Builder setLabel(@Nullable String label) {
-      this.label = label;
+    public Builder setLabels(@Nullable List<Label> labels) {
+      this.labels = labels;
       return this;
     }
 
@@ -741,7 +741,7 @@ public final class Format implements Bundleable {
   @Nullable public final String id;
 
   /** The human readable label, or null if unknown or not applicable. */
-  @Nullable public final String label;
+  @Nullable public final List<Label> labels;
 
   /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
   @Nullable public final String language;
@@ -931,7 +931,7 @@ public final class Format implements Bundleable {
 
   private Format(Builder builder) {
     id = builder.id;
-    label = builder.label;
+    labels = builder.labels;
     language = Util.normalizeLanguageCode(builder.language);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
@@ -1002,7 +1002,8 @@ public final class Format implements Bundleable {
     int tileCountVertical = manifestFormat.tileCountVertical;
 
     // Prefer manifest values, but fill in from sample format if missing.
-    @Nullable String label = manifestFormat.label != null ? manifestFormat.label : this.label;
+    @Nullable
+    List<Label> labels = manifestFormat.labels != null ? manifestFormat.labels : this.labels;
     @Nullable String language = this.language;
     if ((trackType == C.TRACK_TYPE_TEXT || trackType == C.TRACK_TYPE_AUDIO)
         && manifestFormat.language != null) {
@@ -1043,7 +1044,7 @@ public final class Format implements Bundleable {
 
     return buildUpon()
         .setId(id)
-        .setLabel(label)
+        .setLabels(labels)
         .setLanguage(language)
         .setSelectionFlags(selectionFlags)
         .setRoleFlags(roleFlags)
@@ -1078,7 +1079,7 @@ public final class Format implements Bundleable {
     return "Format("
         + id
         + ", "
-        + label
+        + labels
         + ", "
         + containerMimeType
         + ", "
@@ -1111,7 +1112,7 @@ public final class Format implements Bundleable {
       // Some fields for which hashing is expensive are deliberately omitted.
       int result = 17;
       result = 31 * result + (id == null ? 0 : id.hashCode());
-      result = 31 * result + (label != null ? label.hashCode() : 0);
+      result = 31 * result + (labels != null ? labels.hashCode() : 0);
       result = 31 * result + (language == null ? 0 : language.hashCode());
       result = 31 * result + selectionFlags;
       result = 31 * result + roleFlags;
@@ -1189,7 +1190,7 @@ public final class Format implements Bundleable {
         && Float.compare(frameRate, other.frameRate) == 0
         && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
         && Util.areEqual(id, other.id)
-        && Util.areEqual(label, other.label)
+        && Util.areEqual(labels, other.labels)
         && Util.areEqual(codecs, other.codecs)
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
@@ -1281,8 +1282,8 @@ public final class Format implements Bundleable {
     if (format.language != null) {
       builder.append(", language=").append(format.language);
     }
-    if (format.label != null) {
-      builder.append(", label=").append(format.label);
+    if (format.labels != null) {
+      builder.append(", label=").append(format.labels);
     }
     if (format.selectionFlags != 0) {
       builder.append(", selectionFlags=[");
@@ -1300,7 +1301,7 @@ public final class Format implements Bundleable {
   // Bundleable implementation.
 
   private static final String FIELD_ID = Util.intToStringMaxRadix(0);
-  private static final String FIELD_LABEL = Util.intToStringMaxRadix(1);
+  private static final String FIELD_LABELS = Util.intToStringMaxRadix(1);
   private static final String FIELD_LANGUAGE = Util.intToStringMaxRadix(2);
   private static final String FIELD_SELECTION_FLAGS = Util.intToStringMaxRadix(3);
   private static final String FIELD_ROLE_FLAGS = Util.intToStringMaxRadix(4);
@@ -1346,7 +1347,11 @@ public final class Format implements Bundleable {
   public Bundle toBundle(boolean excludeMetadata) {
     Bundle bundle = new Bundle();
     bundle.putString(FIELD_ID, id);
-    bundle.putString(FIELD_LABEL, label);
+    if (labels != null) {
+      for (int i = 0; i < labels.size(); i++) {
+        bundle.putParcelable(keyForLabel(i), labels.get(i));
+      }
+    }
     bundle.putString(FIELD_LANGUAGE, language);
     bundle.putInt(FIELD_SELECTION_FLAGS, selectionFlags);
     bundle.putInt(FIELD_ROLE_FLAGS, roleFlags);
@@ -1411,9 +1416,18 @@ public final class Format implements Bundleable {
   public static Format fromBundle(Bundle bundle) {
     Builder builder = new Builder();
     BundleCollectionUtil.ensureClassLoader(bundle);
+    builder.setId(defaultIfNull(bundle.getString(FIELD_ID), DEFAULT.id));
+
+    List<Label> labels = new ArrayList<>();
+    for (int i = 0; ; i++) {
+      @Nullable Label label = bundle.getParcelable(keyForLabel(i));
+      if (label == null) {
+        break;
+      }
+      labels.add(label);
+    }
     builder
-        .setId(defaultIfNull(bundle.getString(FIELD_ID), DEFAULT.id))
-        .setLabel(defaultIfNull(bundle.getString(FIELD_LABEL), DEFAULT.label))
+        .setLabels(labels)
         .setLanguage(defaultIfNull(bundle.getString(FIELD_LANGUAGE), DEFAULT.language))
         .setSelectionFlags(bundle.getInt(FIELD_SELECTION_FLAGS, DEFAULT.selectionFlags))
         .setRoleFlags(bundle.getInt(FIELD_ROLE_FLAGS, DEFAULT.roleFlags))
@@ -1480,6 +1494,10 @@ public final class Format implements Bundleable {
         + Integer.toString(initialisationDataIndex, Character.MAX_RADIX);
   }
 
+  private static String keyForLabel(int labelIndex) {
+    return FIELD_LABELS + "_" + Integer.toString(labelIndex, Character.MAX_RADIX);
+  }
+
   /**
    * Utility method to get {@code defaultValue} if {@code value} is {@code null}. {@code
    * defaultValue} can be {@code null}.
diff --git a/libraries/common/src/main/java/androidx/media3/common/Label.java b/libraries/common/src/main/java/androidx/media3/common/Label.java
new file mode 100644
index 0000000000..c0550a8bf3
--- /dev/null
+++ b/libraries/common/src/main/java/androidx/media3/common/Label.java
@@ -0,0 +1,82 @@
+package androidx.media3.common;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.media3.common.util.UnstableApi;
+import androidx.media3.common.util.Util;
+
+/** A Label, as defined by ISO 23009-1, 4th edition, 5.3.7.2. */
+@UnstableApi
+public class Label implements Parcelable {
+  /** The Label identifier, if one exists. */
+  @Nullable public final String id;
+
+  /** Declares the language code(s) for this Label. */
+  @Nullable public final String lang;
+
+  /** The value for this Label. */
+  public final String value;
+
+  /**
+   * @param id The id.
+   * @param lang The lang code.
+   * @param value The value.
+   */
+  public Label(@Nullable String id, @Nullable String lang, String value) {
+    this.id = id;
+    this.lang = lang;
+    this.value = value;
+  }
+
+  /* package */ Label(Parcel in) {
+    id = in.readString();
+    lang = in.readString();
+    value = in.readString();
+  }
+
+  @Override
+  public boolean equals(@Nullable Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Label label = (Label) o;
+    return Util.areEqual(id, label.id)
+        && Util.areEqual(lang, label.lang)
+        && Util.areEqual(value, label.value);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = value.hashCode();
+    result = 31 * result + (id != null ? id.hashCode() : 0);
+    result = 31 * result + (lang != null ? lang.hashCode() : 0);
+    return result;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(@NonNull Parcel dest, int flags) {
+    dest.writeString(id);
+    dest.writeString(lang);
+    dest.writeString(value);
+  }
+
+  public static final Parcelable.Creator<Label> CREATOR =
+      new Parcelable.Creator<Label>() {
+
+        @Override
+        public Label createFromParcel(Parcel in) {
+          return new Label(in);
+        }
+
+        @Override
+        public Label[] newArray(int size) {
+          return new Label[size];
+        }
+      };
+}
diff --git a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
index 42cfb2f53c..60ac24a18e 100644
--- a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
@@ -83,9 +83,11 @@ public final class FormatTest {
             .setChromaBitdepth(11)
             .build();
 
+    List<Label> labels = new ArrayList<>();
+    labels.add(new Label("id", "en", "label"));
     return new Format.Builder()
         .setId("id")
-        .setLabel("label")
+        .setLabels(labels)
         .setLanguage("language")
         .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
         .setRoleFlags(C.ROLE_FLAG_MAIN)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
index bc895f6846..3b6b508de0 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
@@ -450,7 +450,7 @@ public abstract class DecoderAudioRenderer<
               .setEncoderPadding(encoderPadding)
               .setMetadata(inputFormat.metadata)
               .setId(inputFormat.id)
-              .setLabel(inputFormat.label)
+              .setLabels(inputFormat.labels)
               .setLanguage(inputFormat.language)
               .setSelectionFlags(inputFormat.selectionFlags)
               .setRoleFlags(inputFormat.roleFlags)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
index ddf7164cd1..d4557bbf29 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
@@ -551,7 +551,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
               .setEncoderPadding(format.encoderPadding)
               .setMetadata(format.metadata)
               .setId(format.id)
-              .setLabel(format.label)
+              .setLabels(format.labels)
               .setLanguage(format.language)
               .setSelectionFlags(format.selectionFlags)
               .setRoleFlags(format.roleFlags)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
index c582e9977a..a7df895702 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
@@ -26,6 +26,7 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.AdViewProvider;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
@@ -58,6 +59,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -513,13 +515,21 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
       mediaSources[0] = mediaSource;
       for (int i = 0; i < subtitleConfigurations.size(); i++) {
         if (parseSubtitlesDuringExtraction) {
+          List<Label> labels = new ArrayList<>();
+          String label = subtitleConfigurations.get(i).label;
+          if (label != null) {
+            labels.add(new Label(null, null, label));
+          } else {
+            labels = null;
+          }
+
           Format format =
               new Format.Builder()
                   .setSampleMimeType(subtitleConfigurations.get(i).mimeType)
                   .setLanguage(subtitleConfigurations.get(i).language)
                   .setSelectionFlags(subtitleConfigurations.get(i).selectionFlags)
                   .setRoleFlags(subtitleConfigurations.get(i).roleFlags)
-                  .setLabel(subtitleConfigurations.get(i).label)
+                  .setLabels(labels)
                   .setId(subtitleConfigurations.get(i).id)
                   .build();
           ExtractorsFactory extractorsFactory =
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
index 47b5655452..8d29b2a0ee 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
@@ -21,6 +21,7 @@ import static com.google.common.base.MoreObjects.firstNonNull;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.Timeline;
@@ -33,6 +34,8 @@ import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy;
 import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Loads data at a given {@link Uri} as a single sample belonging to a single {@link MediaPeriod}.
@@ -170,13 +173,20 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
             .setSubtitleConfigurations(ImmutableList.of(subtitleConfiguration))
             .setTag(tag)
             .build();
+    List<Label> labels = new ArrayList<>();
+    String label = subtitleConfiguration.label;
+    if (label != null) {
+      labels.add(new Label(null, null, label));
+    } else {
+      labels = null;
+    }
     this.format =
         new Format.Builder()
             .setSampleMimeType(firstNonNull(subtitleConfiguration.mimeType, MimeTypes.TEXT_UNKNOWN))
             .setLanguage(subtitleConfiguration.language)
             .setSelectionFlags(subtitleConfiguration.selectionFlags)
             .setRoleFlags(subtitleConfiguration.roleFlags)
-            .setLabel(subtitleConfiguration.label)
+            .setLabels(labels)
             .setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
             .build();
     this.dataSpec =
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
index 8d2116897c..7436116852 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
@@ -517,7 +517,7 @@ public final class OutputConsumerAdapterV30 implements MediaParser.OutputConsume
             .setLanguage(muxedCaptionFormat.language)
             .setRoleFlags(muxedCaptionFormat.roleFlags)
             .setSelectionFlags(muxedCaptionFormat.selectionFlags)
-            .setLabel(muxedCaptionFormat.label)
+            .setLabels(muxedCaptionFormat.labels)
             .setMetadata(muxedCaptionFormat.metadata);
         break;
       }
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
index b990923b73..e32ce5f221 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
@@ -2058,7 +2058,7 @@ public final class SampleQueueTest {
   }
 
   private static Format copyWithLabel(Format format, String label) {
-    return format.buildUpon().setLabel(label).build();
+    return format.buildUpon().setLabels(label).build();
   }
 
   private static final class MockDrmSessionManager implements DrmSessionManager {
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 6ce3993665..c65a55baa2 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
@@ -29,6 +29,7 @@ import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
@@ -404,7 +405,8 @@ public class DashManifestParser extends DefaultHandler
     int audioChannels = Format.NO_VALUE;
     int audioSamplingRate = parseInt(xpp, "audioSamplingRate", Format.NO_VALUE);
     String language = xpp.getAttributeValue(null, "lang");
-    String label = xpp.getAttributeValue(null, "label");
+    String adaptationSetLabel = xpp.getAttributeValue(null, "label");
+    List<Label> labels = new ArrayList<>();
     String drmSchemeType = null;
     ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
     ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
@@ -504,19 +506,23 @@ public class DashManifestParser extends DefaultHandler
       } else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
         inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Label")) {
-        label = parseLabel(xpp);
+        labels.add(parseLabel(xpp));
       } else if (XmlPullParserUtil.isStartTag(xpp)) {
         parseAdaptationSetChild(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "AdaptationSet"));
 
+    if (labels.size() == 0 && adaptationSetLabel != null) {
+      labels.add(new Label(null, null, adaptationSetLabel));
+    }
+
     // Build the representations.
     List<Representation> representations = new ArrayList<>(representationInfos.size());
     for (int i = 0; i < representationInfos.size(); i++) {
       representations.add(
           buildRepresentation(
               representationInfos.get(i),
-              label,
+              labels.isEmpty() ? null : labels,
               drmSchemeType,
               drmSchemeDatas,
               inbandEventStreams));
@@ -855,14 +861,12 @@ public class DashManifestParser extends DefaultHandler
 
   protected Representation buildRepresentation(
       RepresentationInfo representationInfo,
-      @Nullable String label,
+      @Nullable List<Label> labels,
       @Nullable String extraDrmSchemeType,
       ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
     Format.Builder formatBuilder = representationInfo.format.buildUpon();
-    if (label != null) {
-      formatBuilder.setLabel(label);
-    }
+    formatBuilder.setLabels(labels);
     @Nullable String drmSchemeType = representationInfo.drmSchemeType;
     if (drmSchemeType == null) {
       drmSchemeType = extraDrmSchemeType;
@@ -1405,8 +1409,11 @@ public class DashManifestParser extends DefaultHandler
    * @throws IOException If an error occurs reading the element.
    * @return The parsed label.
    */
-  protected String parseLabel(XmlPullParser xpp) throws XmlPullParserException, IOException {
-    return parseText(xpp, "Label");
+  protected Label parseLabel(XmlPullParser xpp) throws XmlPullParserException, IOException {
+    String id = xpp.getAttributeValue(null, "id");
+    String lang = xpp.getAttributeValue(null, "lang");
+    String value = parseText(xpp, "Label");
+    return new Label(id, lang, value);
   }
 
   /**
diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
index 29510717d7..b6e2bd188d 100644
--- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
+++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
@@ -22,6 +22,7 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Util;
 import androidx.media3.exoplayer.dash.manifest.Representation.MultiSegmentRepresentation;
@@ -278,8 +279,10 @@ public class DashManifestParserTest {
 
     List<AdaptationSet> adaptationSets = manifest.getPeriod(0).adaptationSets;
 
-    assertThat(adaptationSets.get(0).representations.get(0).format.label).isEqualTo("audio label");
-    assertThat(adaptationSets.get(1).representations.get(0).format.label).isEqualTo("video label");
+    assertThat(adaptationSets.get(0).representations.get(0).format.labels.get(0).value)
+        .isEqualTo("audio label");
+    assertThat(adaptationSets.get(1).representations.get(0).format.labels.get(0).value)
+        .isEqualTo("video label");
   }
 
   @Test
@@ -431,13 +434,39 @@ public class DashManifestParserTest {
 
   @Test
   public void parseLabel() throws Exception {
+    DashManifestParser parser = new DashManifestParser();
+    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
+    xpp.setInput(new StringReader("<Label id=\"1\" lang=\"en\">test label</Label>" + NEXT_TAG));
+    xpp.next();
+
+    Label label = parser.parseLabel(xpp);
+    assertThat(label.id).isEqualTo("1");
+    assertThat(label.lang).isEqualTo("en");
+    assertThat(label.value).isEqualTo("test label");
+    assertNextTag(xpp);
+  }
+
+  @Test
+  public void parseLabel_noId() throws Exception {
+    DashManifestParser parser = new DashManifestParser();
+    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
+    xpp.setInput(new StringReader("<Label lang=\"en\">test label</Label>" + NEXT_TAG));
+    xpp.next();
+
+    Label label = parser.parseLabel(xpp);
+    assertThat(label.id).isEqualTo(null);
+    assertNextTag(xpp);
+  }
+
+  @Test
+  public void parseLabel_noLang() throws Exception {
     DashManifestParser parser = new DashManifestParser();
     XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
     xpp.setInput(new StringReader("<Label>test label</Label>" + NEXT_TAG));
     xpp.next();
 
-    String label = parser.parseLabel(xpp);
-    assertThat(label).isEqualTo("test label");
+    Label label = parser.parseLabel(xpp);
+    assertThat(label.lang).isEqualTo(null);
     assertNextTag(xpp);
   }
 
@@ -448,8 +477,8 @@ public class DashManifestParserTest {
     xpp.setInput(new StringReader("<Label/>" + NEXT_TAG));
     xpp.next();
 
-    String label = parser.parseLabel(xpp);
-    assertThat(label).isEqualTo("");
+    Label label = parser.parseLabel(xpp);
+    assertThat(label.value).isEqualTo("");
     assertNextTag(xpp);
   }
 
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
index d43cea69d5..019ed4bc6e 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
@@ -21,6 +21,7 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.StreamKey;
@@ -851,7 +852,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     @Nullable String sampleMimeType = MimeTypes.getMediaMimeType(codecs);
     return new Format.Builder()
         .setId(variantFormat.id)
-        .setLabel(variantFormat.label)
+        .setLabels(variantFormat.labels)
         .setContainerMimeType(variantFormat.containerMimeType)
         .setSampleMimeType(sampleMimeType)
         .setCodecs(codecs)
@@ -874,7 +875,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     int selectionFlags = 0;
     int roleFlags = 0;
     @Nullable String language = null;
-    @Nullable String label = null;
+    @Nullable List<Label> labels = null;
     if (mediaTagFormat != null) {
       codecs = mediaTagFormat.codecs;
       metadata = mediaTagFormat.metadata;
@@ -882,7 +883,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       selectionFlags = mediaTagFormat.selectionFlags;
       roleFlags = mediaTagFormat.roleFlags;
       language = mediaTagFormat.language;
-      label = mediaTagFormat.label;
+      labels = mediaTagFormat.labels;
     } else {
       codecs = Util.getCodecsOfType(variantFormat.codecs, C.TRACK_TYPE_AUDIO);
       metadata = variantFormat.metadata;
@@ -891,7 +892,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         selectionFlags = variantFormat.selectionFlags;
         roleFlags = variantFormat.roleFlags;
         language = variantFormat.language;
-        label = variantFormat.label;
+        labels = variantFormat.labels;
       }
     }
     @Nullable String sampleMimeType = MimeTypes.getMediaMimeType(codecs);
@@ -899,7 +900,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     int peakBitrate = isPrimaryTrackInVariant ? variantFormat.peakBitrate : Format.NO_VALUE;
     return new Format.Builder()
         .setId(variantFormat.id)
-        .setLabel(label)
+        .setLabels(labels)
         .setContainerMimeType(variantFormat.containerMimeType)
         .setSampleMimeType(sampleMimeType)
         .setCodecs(codecs)
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
index ede8575201..1676bd1a79 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
@@ -1583,7 +1583,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
         sampleFormat
             .buildUpon()
             .setId(playlistFormat.id)
-            .setLabel(playlistFormat.label)
+            .setLabels(playlistFormat.labels)
             .setLanguage(playlistFormat.language)
             .setSelectionFlags(playlistFormat.selectionFlags)
             .setRoleFlags(playlistFormat.roleFlags)
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
index 8dc60984f2..670876049a 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
@@ -27,6 +27,7 @@ import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
@@ -471,10 +472,12 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       line = mediaTags.get(i);
       String groupId = parseStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
+      List<Label> labels = new ArrayList<>();
+      labels.add(new Label(null, null, name));
       Format.Builder formatBuilder =
           new Format.Builder()
               .setId(groupId + ":" + name)
-              .setLabel(name)
+              .setLabels(labels)
               .setContainerMimeType(MimeTypes.APPLICATION_M3U8)
               .setSelectionFlags(parseSelectionFlags(line))
               .setRoleFlags(parseRoleFlags(line, variableDefinitions))
diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
index 225569786b..325401e6d5 100644
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
@@ -24,6 +24,7 @@ import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
@@ -740,10 +741,17 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
         formatBuilder.setContainerMimeType(MimeTypes.APPLICATION_MP4);
       }
 
+      List<Label> labels = new ArrayList<>();
+      String label = (String) getNormalizedAttribute(KEY_NAME);
+      if (label != null) {
+        labels.add(new Label(null, null, label));
+      } else {
+        labels = null;
+      }
       format =
           formatBuilder
               .setId(parser.getAttributeValue(null, KEY_INDEX))
-              .setLabel((String) getNormalizedAttribute(KEY_NAME))
+              .setLabels(labels)
               .setSampleMimeType(sampleMimeType)
               .setAverageBitrate(parseRequiredInt(parser, KEY_BITRATE))
               .setLanguage((String) getNormalizedAttribute(KEY_LANGUAGE))
diff --git a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
index 61e921293b..e399d70c38 100644
--- a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
+++ b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
@@ -51,6 +51,6 @@ public final class SsManifestParserTest {
             Uri.parse("https://example.com/test.ismc"),
             TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_ISMC_1));
 
-    assertThat(ssManifest.streamElements[0].formats[0].label).isEqualTo("video");
+    assertThat(ssManifest.streamElements[0].formats[0].labels).isEqualTo("video");
   }
 }
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
index 1373b17a5e..10472f6bd6 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
@@ -21,6 +21,7 @@ import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
@@ -42,6 +43,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
+import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
@@ -514,7 +516,9 @@ public final class AviExtractor implements Extractor {
     }
     StreamNameChunk streamName = streamList.getChild(StreamNameChunk.class);
     if (streamName != null) {
-      builder.setLabel(streamName.name);
+      List<Label> labels = new ArrayList<>();
+      labels.add(new Label(null, null, streamName.name));
+      builder.setLabels(labels);
     }
     int trackType = MimeTypes.getTrackType(streamFormat.sampleMimeType);
     if (trackType == C.TRACK_TYPE_AUDIO || trackType == C.TRACK_TYPE_VIDEO) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index 34bafec956..92c6a12a85 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -33,6 +33,7 @@ import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
@@ -2423,7 +2424,9 @@ public class MatroskaExtractor implements Extractor {
       }
 
       if (name != null && !TRACK_NAME_TO_ROTATION_DEGREES.containsKey(name)) {
-        formatBuilder.setLabel(name);
+        List<Label> labels = new ArrayList<>();
+        labels.add(new Label(null, null, name));
+        formatBuilder.setLabels(labels);
       }
 
       Format format =
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index 13f4453d4d..00180ea5d8 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -100,7 +100,7 @@ public final class DumpableFormat implements Dumper.Dumpable {
         DEFAULT_FORMAT,
         format -> Util.getRoleFlagStrings(format.roleFlags));
     addIfNonDefault(dumper, "language", format, DEFAULT_FORMAT, format -> format.language);
-    addIfNonDefault(dumper, "label", format, DEFAULT_FORMAT, format -> format.label);
+    addIfNonDefault(dumper, "label", format, DEFAULT_FORMAT, format -> format.labels);
     if (format.drmInitData != null) {
       dumper.add("drmInitData", format.drmInitData.hashCode());
     }
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
index d83fc54195..e3bf3d48f0 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
@@ -20,11 +20,14 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
+import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
+import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 /** A default {@link TrackNameProvider}. */
 @UnstableApi
@@ -107,7 +110,19 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
   }
 
   private String buildLabelString(Format format) {
-    return TextUtils.isEmpty(format.label) ? "" : format.label;
+    if (format.labels == null || format.labels.isEmpty()) {
+      return "";
+    }
+    if (!TextUtils.isEmpty(format.language)) {
+      List<Label> labelsByLanguage =
+          format.labels.stream()
+              .filter(label -> format.language.equals(label.lang))
+              .collect(Collectors.toList());
+      if (!labelsByLanguage.isEmpty()) {
+        return labelsByLanguage.get(0).value;
+      }
+    }
+    return TextUtils.isEmpty(format.labels.get(0).value) ? "" : format.labels.get(0).value;
   }
 
   private String buildLanguageString(Format format) {

From 63fb68e99e87f52fa6d7313619bfd9ce93d3b9c2 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Wed, 31 Jan 2024 12:35:44 -0700
Subject: [PATCH 2/8] Reverting breaking changes by keeping label and adding
 labels.

---
 .../java/androidx/media3/common/Format.java   | 147 +++++++++++++-----
 .../androidx/media3/common/FormatTest.java    |   1 +
 .../exoplayer/audio/DecoderAudioRenderer.java |   1 +
 .../audio/MediaCodecAudioRenderer.java        |   1 +
 .../source/DefaultMediaSourceFactory.java     |   3 +-
 .../source/SingleSampleMediaSource.java       |   3 +-
 .../mediaparser/OutputConsumerAdapterV30.java |   1 +
 .../exoplayer/source/SampleQueueTest.java     |   2 +-
 .../dash/manifest/DashManifestParser.java     |  17 +-
 .../dash/manifest/DashManifestParserTest.java |   5 +-
 .../media3/exoplayer/hls/HlsMediaPeriod.java  |   5 +
 .../exoplayer/hls/HlsSampleStreamWrapper.java |   1 +
 .../hls/playlist/HlsPlaylistParser.java       |   1 +
 .../manifest/SsManifestParser.java            |   3 +-
 .../manifest/SsManifestParserTest.java        |   3 +-
 .../media3/extractor/avi/AviExtractor.java    |   5 +-
 .../extractor/mkv/MatroskaExtractor.java      |   2 +
 ...sample_with_null_terminated_srt.mkv.0.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.1.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.2.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.3.dump |   2 +
 ...ull_terminated_srt.mkv.unknown_length.dump |   2 +
 .../mkv/sample_with_srt.mkv.0.dump            |   2 +
 .../mkv/sample_with_srt.mkv.1.dump            |   2 +
 .../mkv/sample_with_srt.mkv.2.dump            |   2 +
 .../mkv/sample_with_srt.mkv.3.dump            |   2 +
 .../sample_with_srt.mkv.unknown_length.dump   |   2 +
 ...sample_with_null_terminated_srt.mkv.0.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.1.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.2.dump |   2 +
 ...sample_with_null_terminated_srt.mkv.3.dump |   2 +
 ...ull_terminated_srt.mkv.unknown_length.dump |   2 +
 .../sample_with_srt.mkv.0.dump                |   2 +
 .../sample_with_srt.mkv.1.dump                |   2 +
 .../sample_with_srt.mkv.2.dump                |   2 +
 .../sample_with_srt.mkv.3.dump                |   2 +
 .../sample_with_srt.mkv.unknown_length.dump   |   2 +
 .../media3/test/utils/DumpableFormat.java     |  17 +-
 .../media3/ui/DefaultTrackNameProvider.java   |   4 +-
 39 files changed, 198 insertions(+), 64 deletions(-)

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 0ee4413f08..7e6d659b9c 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -49,6 +49,7 @@ import java.util.UUID;
  *
  * <ul>
  *   <li>{@link #id}
+ *   <li>{@link #label}
  *   <li>{@link #labels}
  *   <li>{@link #language}
  *   <li>{@link #selectionFlags}
@@ -136,6 +137,8 @@ public final class Format implements Bundleable {
   public static final class Builder {
 
     @Nullable private String id;
+
+    @Nullable private String label;
     @Nullable private List<Label> labels;
     @Nullable private String language;
     private @C.SelectionFlags int selectionFlags;
@@ -224,6 +227,7 @@ public final class Format implements Bundleable {
      */
     private Builder(Format format) {
       this.id = format.id;
+      this.label = format.label;
       this.labels = format.labels;
       this.language = format.language;
       this.selectionFlags = format.selectionFlags;
@@ -290,6 +294,18 @@ public final class Format implements Bundleable {
       return this;
     }
 
+    /**
+     * Sets {@link Format#label}. The default value is {@code null}.
+     *
+     * @param label The {@link Format#label}.
+     * @return The builder.
+     */
+    @CanIgnoreReturnValue
+    public Builder setLabel(@Nullable String label) {
+      this.label = label;
+      return this;
+    }
+
     /**
      * Sets {@link Format#labels}. The default value is {@code null}.
      *
@@ -740,8 +756,15 @@ public final class Format implements Bundleable {
   /** An identifier for the format, or null if unknown or not applicable. */
   @Nullable public final String id;
 
-  /** The human readable label, or null if unknown or not applicable. */
-  @Nullable public final List<Label> labels;
+  /**
+   * The human readable label, or null if unknown or not applicable.
+   *
+   * @deprecated Use {@link #labels} instead.
+   */
+  @Deprecated @Nullable public final String label;
+
+  /** The human readable list of labels, or null if unknown or not applicable. */
+  @UnstableApi public final List<Label> labels;
 
   /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
   @Nullable public final String language;
@@ -931,7 +954,8 @@ public final class Format implements Bundleable {
 
   private Format(Builder builder) {
     id = builder.id;
-    labels = builder.labels;
+    label = builder.label;
+    labels = builder.labels == null ? Collections.emptyList() : builder.labels;
     language = Util.normalizeLanguageCode(builder.language);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
@@ -1002,8 +1026,8 @@ public final class Format implements Bundleable {
     int tileCountVertical = manifestFormat.tileCountVertical;
 
     // Prefer manifest values, but fill in from sample format if missing.
-    @Nullable
-    List<Label> labels = manifestFormat.labels != null ? manifestFormat.labels : this.labels;
+    @Nullable String label = manifestFormat.label != null ? manifestFormat.label : this.label;
+    List<Label> labels = manifestFormat.labels;
     @Nullable String language = this.language;
     if ((trackType == C.TRACK_TYPE_TEXT || trackType == C.TRACK_TYPE_AUDIO)
         && manifestFormat.language != null) {
@@ -1044,6 +1068,7 @@ public final class Format implements Bundleable {
 
     return buildUpon()
         .setId(id)
+        .setLabel(label)
         .setLabels(labels)
         .setLanguage(language)
         .setSelectionFlags(selectionFlags)
@@ -1079,7 +1104,7 @@ public final class Format implements Bundleable {
     return "Format("
         + id
         + ", "
-        + labels
+        + label
         + ", "
         + containerMimeType
         + ", "
@@ -1112,7 +1137,8 @@ public final class Format implements Bundleable {
       // Some fields for which hashing is expensive are deliberately omitted.
       int result = 17;
       result = 31 * result + (id == null ? 0 : id.hashCode());
-      result = 31 * result + (labels != null ? labels.hashCode() : 0);
+      result = 31 * result + (label == null ? 0 : label.hashCode());
+      // [Omitted] labels.
       result = 31 * result + (language == null ? 0 : language.hashCode());
       result = 31 * result + selectionFlags;
       result = 31 * result + roleFlags;
@@ -1190,7 +1216,7 @@ public final class Format implements Bundleable {
         && Float.compare(frameRate, other.frameRate) == 0
         && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
         && Util.areEqual(id, other.id)
-        && Util.areEqual(labels, other.labels)
+        && Util.areEqual(label, other.label)
         && Util.areEqual(codecs, other.codecs)
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
@@ -1199,7 +1225,8 @@ public final class Format implements Bundleable {
         && Util.areEqual(metadata, other.metadata)
         && Util.areEqual(colorInfo, other.colorInfo)
         && Util.areEqual(drmInitData, other.drmInitData)
-        && initializationDataEquals(other);
+        && initializationDataEquals(other)
+        && labelsEquals(other);
   }
 
   /**
@@ -1223,6 +1250,32 @@ public final class Format implements Bundleable {
     return true;
   }
 
+  /**
+   * Returns whether the {@link #labels}s belonging to this format and {@code other} are equal.
+   *
+   * @param other The other format whose {@link #labels} is being compared.
+   * @return Whether the {@link #labels} belonging to this format and {@code other} are equal.
+   */
+  @UnstableApi
+  public boolean labelsEquals(Format other) {
+    if ((labels == null && other.labels != null) || (labels != null && other.labels == null)) {
+      return false;
+    }
+    if (labels == null && other.labels == null) {
+      return true;
+    }
+
+    if (labels.size() != other.labels.size()) {
+      return false;
+    }
+    for (int i = 0; i < labels.size(); i++) {
+      if (!Util.areEqual(labels.get(i), other.labels.get(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   // Utility methods
 
   /** Returns a prettier {@link String} than {@link #toString()}, intended for logging. */
@@ -1282,8 +1335,13 @@ public final class Format implements Bundleable {
     if (format.language != null) {
       builder.append(", language=").append(format.language);
     }
+    if (format.label != null) {
+      builder.append(", label=").append(format.label);
+    }
     if (format.labels != null) {
-      builder.append(", label=").append(format.labels);
+      builder.append(", labels=[");
+      Joiner.on(',').appendTo(builder, format.labels);
+      builder.append("]");
     }
     if (format.selectionFlags != 0) {
       builder.append(", selectionFlags=[");
@@ -1301,37 +1359,38 @@ public final class Format implements Bundleable {
   // Bundleable implementation.
 
   private static final String FIELD_ID = Util.intToStringMaxRadix(0);
-  private static final String FIELD_LABELS = Util.intToStringMaxRadix(1);
-  private static final String FIELD_LANGUAGE = Util.intToStringMaxRadix(2);
-  private static final String FIELD_SELECTION_FLAGS = Util.intToStringMaxRadix(3);
-  private static final String FIELD_ROLE_FLAGS = Util.intToStringMaxRadix(4);
-  private static final String FIELD_AVERAGE_BITRATE = Util.intToStringMaxRadix(5);
-  private static final String FIELD_PEAK_BITRATE = Util.intToStringMaxRadix(6);
-  private static final String FIELD_CODECS = Util.intToStringMaxRadix(7);
-  private static final String FIELD_METADATA = Util.intToStringMaxRadix(8);
-  private static final String FIELD_CONTAINER_MIME_TYPE = Util.intToStringMaxRadix(9);
-  private static final String FIELD_SAMPLE_MIME_TYPE = Util.intToStringMaxRadix(10);
-  private static final String FIELD_MAX_INPUT_SIZE = Util.intToStringMaxRadix(11);
-  private static final String FIELD_INITIALIZATION_DATA = Util.intToStringMaxRadix(12);
-  private static final String FIELD_DRM_INIT_DATA = Util.intToStringMaxRadix(13);
-  private static final String FIELD_SUBSAMPLE_OFFSET_US = Util.intToStringMaxRadix(14);
-  private static final String FIELD_WIDTH = Util.intToStringMaxRadix(15);
-  private static final String FIELD_HEIGHT = Util.intToStringMaxRadix(16);
-  private static final String FIELD_FRAME_RATE = Util.intToStringMaxRadix(17);
-  private static final String FIELD_ROTATION_DEGREES = Util.intToStringMaxRadix(18);
-  private static final String FIELD_PIXEL_WIDTH_HEIGHT_RATIO = Util.intToStringMaxRadix(19);
-  private static final String FIELD_PROJECTION_DATA = Util.intToStringMaxRadix(20);
-  private static final String FIELD_STEREO_MODE = Util.intToStringMaxRadix(21);
-  private static final String FIELD_COLOR_INFO = Util.intToStringMaxRadix(22);
-  private static final String FIELD_CHANNEL_COUNT = Util.intToStringMaxRadix(23);
-  private static final String FIELD_SAMPLE_RATE = Util.intToStringMaxRadix(24);
-  private static final String FIELD_PCM_ENCODING = Util.intToStringMaxRadix(25);
-  private static final String FIELD_ENCODER_DELAY = Util.intToStringMaxRadix(26);
-  private static final String FIELD_ENCODER_PADDING = Util.intToStringMaxRadix(27);
-  private static final String FIELD_ACCESSIBILITY_CHANNEL = Util.intToStringMaxRadix(28);
-  private static final String FIELD_CRYPTO_TYPE = Util.intToStringMaxRadix(29);
-  private static final String FIELD_TILE_COUNT_HORIZONTAL = Util.intToStringMaxRadix(30);
-  private static final String FIELD_TILE_COUNT_VERTICAL = Util.intToStringMaxRadix(31);
+  private static final String FIELD_LABEL = Util.intToStringMaxRadix(1);
+  private static final String FIELD_LABELS = Util.intToStringMaxRadix(2);
+  private static final String FIELD_LANGUAGE = Util.intToStringMaxRadix(3);
+  private static final String FIELD_SELECTION_FLAGS = Util.intToStringMaxRadix(4);
+  private static final String FIELD_ROLE_FLAGS = Util.intToStringMaxRadix(5);
+  private static final String FIELD_AVERAGE_BITRATE = Util.intToStringMaxRadix(6);
+  private static final String FIELD_PEAK_BITRATE = Util.intToStringMaxRadix(7);
+  private static final String FIELD_CODECS = Util.intToStringMaxRadix(8);
+  private static final String FIELD_METADATA = Util.intToStringMaxRadix(9);
+  private static final String FIELD_CONTAINER_MIME_TYPE = Util.intToStringMaxRadix(10);
+  private static final String FIELD_SAMPLE_MIME_TYPE = Util.intToStringMaxRadix(11);
+  private static final String FIELD_MAX_INPUT_SIZE = Util.intToStringMaxRadix(12);
+  private static final String FIELD_INITIALIZATION_DATA = Util.intToStringMaxRadix(13);
+  private static final String FIELD_DRM_INIT_DATA = Util.intToStringMaxRadix(14);
+  private static final String FIELD_SUBSAMPLE_OFFSET_US = Util.intToStringMaxRadix(15);
+  private static final String FIELD_WIDTH = Util.intToStringMaxRadix(16);
+  private static final String FIELD_HEIGHT = Util.intToStringMaxRadix(17);
+  private static final String FIELD_FRAME_RATE = Util.intToStringMaxRadix(18);
+  private static final String FIELD_ROTATION_DEGREES = Util.intToStringMaxRadix(19);
+  private static final String FIELD_PIXEL_WIDTH_HEIGHT_RATIO = Util.intToStringMaxRadix(20);
+  private static final String FIELD_PROJECTION_DATA = Util.intToStringMaxRadix(21);
+  private static final String FIELD_STEREO_MODE = Util.intToStringMaxRadix(22);
+  private static final String FIELD_COLOR_INFO = Util.intToStringMaxRadix(23);
+  private static final String FIELD_CHANNEL_COUNT = Util.intToStringMaxRadix(24);
+  private static final String FIELD_SAMPLE_RATE = Util.intToStringMaxRadix(25);
+  private static final String FIELD_PCM_ENCODING = Util.intToStringMaxRadix(26);
+  private static final String FIELD_ENCODER_DELAY = Util.intToStringMaxRadix(27);
+  private static final String FIELD_ENCODER_PADDING = Util.intToStringMaxRadix(28);
+  private static final String FIELD_ACCESSIBILITY_CHANNEL = Util.intToStringMaxRadix(29);
+  private static final String FIELD_CRYPTO_TYPE = Util.intToStringMaxRadix(30);
+  private static final String FIELD_TILE_COUNT_HORIZONTAL = Util.intToStringMaxRadix(31);
+  private static final String FIELD_TILE_COUNT_VERTICAL = Util.intToStringMaxRadix(32);
 
   @UnstableApi
   @Override
@@ -1347,6 +1406,7 @@ public final class Format implements Bundleable {
   public Bundle toBundle(boolean excludeMetadata) {
     Bundle bundle = new Bundle();
     bundle.putString(FIELD_ID, id);
+    bundle.putString(FIELD_LABEL, label);
     if (labels != null) {
       for (int i = 0; i < labels.size(); i++) {
         bundle.putParcelable(keyForLabel(i), labels.get(i));
@@ -1416,8 +1476,9 @@ public final class Format implements Bundleable {
   public static Format fromBundle(Bundle bundle) {
     Builder builder = new Builder();
     BundleCollectionUtil.ensureClassLoader(bundle);
-    builder.setId(defaultIfNull(bundle.getString(FIELD_ID), DEFAULT.id));
-
+    builder
+        .setId(defaultIfNull(bundle.getString(FIELD_ID), DEFAULT.id))
+        .setLabel(defaultIfNull(bundle.getString(FIELD_LABEL), DEFAULT.label));
     List<Label> labels = new ArrayList<>();
     for (int i = 0; ; i++) {
       @Nullable Label label = bundle.getParcelable(keyForLabel(i));
diff --git a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
index 60ac24a18e..06e58b3bde 100644
--- a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
@@ -87,6 +87,7 @@ public final class FormatTest {
     labels.add(new Label("id", "en", "label"));
     return new Format.Builder()
         .setId("id")
+        .setLabel("label")
         .setLabels(labels)
         .setLanguage("language")
         .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
index 3b6b508de0..5f10a0bfbd 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DecoderAudioRenderer.java
@@ -450,6 +450,7 @@ public abstract class DecoderAudioRenderer<
               .setEncoderPadding(encoderPadding)
               .setMetadata(inputFormat.metadata)
               .setId(inputFormat.id)
+              .setLabel(inputFormat.label)
               .setLabels(inputFormat.labels)
               .setLanguage(inputFormat.language)
               .setSelectionFlags(inputFormat.selectionFlags)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
index d4557bbf29..c4468563d8 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
@@ -551,6 +551,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
               .setEncoderPadding(format.encoderPadding)
               .setMetadata(format.metadata)
               .setId(format.id)
+              .setLabel(format.label)
               .setLabels(format.labels)
               .setLanguage(format.language)
               .setSelectionFlags(format.selectionFlags)
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
index a7df895702..3b3dd89d3f 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
@@ -519,8 +519,6 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
           String label = subtitleConfigurations.get(i).label;
           if (label != null) {
             labels.add(new Label(null, null, label));
-          } else {
-            labels = null;
           }
 
           Format format =
@@ -529,6 +527,7 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
                   .setLanguage(subtitleConfigurations.get(i).language)
                   .setSelectionFlags(subtitleConfigurations.get(i).selectionFlags)
                   .setRoleFlags(subtitleConfigurations.get(i).roleFlags)
+                  .setLabel(label)
                   .setLabels(labels)
                   .setId(subtitleConfigurations.get(i).id)
                   .build();
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
index 8d29b2a0ee..189871a35d 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
@@ -177,8 +177,6 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
     String label = subtitleConfiguration.label;
     if (label != null) {
       labels.add(new Label(null, null, label));
-    } else {
-      labels = null;
     }
     this.format =
         new Format.Builder()
@@ -186,6 +184,7 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
             .setLanguage(subtitleConfiguration.language)
             .setSelectionFlags(subtitleConfiguration.selectionFlags)
             .setRoleFlags(subtitleConfiguration.roleFlags)
+            .setLabel(label)
             .setLabels(labels)
             .setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
             .build();
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
index 7436116852..ab15bba669 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java
@@ -517,6 +517,7 @@ public final class OutputConsumerAdapterV30 implements MediaParser.OutputConsume
             .setLanguage(muxedCaptionFormat.language)
             .setRoleFlags(muxedCaptionFormat.roleFlags)
             .setSelectionFlags(muxedCaptionFormat.selectionFlags)
+            .setLabel(muxedCaptionFormat.label)
             .setLabels(muxedCaptionFormat.labels)
             .setMetadata(muxedCaptionFormat.metadata);
         break;
diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
index e32ce5f221..b990923b73 100644
--- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
+++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SampleQueueTest.java
@@ -2058,7 +2058,7 @@ public final class SampleQueueTest {
   }
 
   private static Format copyWithLabel(Format format, String label) {
-    return format.buildUpon().setLabels(label).build();
+    return format.buildUpon().setLabel(label).build();
   }
 
   private static final class MockDrmSessionManager implements DrmSessionManager {
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 c65a55baa2..1ffd6dec87 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
@@ -405,7 +405,7 @@ public class DashManifestParser extends DefaultHandler
     int audioChannels = Format.NO_VALUE;
     int audioSamplingRate = parseInt(xpp, "audioSamplingRate", Format.NO_VALUE);
     String language = xpp.getAttributeValue(null, "lang");
-    String adaptationSetLabel = xpp.getAttributeValue(null, "label");
+    String label = xpp.getAttributeValue(null, "label");
     List<Label> labels = new ArrayList<>();
     String drmSchemeType = null;
     ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
@@ -506,23 +506,22 @@ public class DashManifestParser extends DefaultHandler
       } else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
         inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Label")) {
-        labels.add(parseLabel(xpp));
+        Label parsedLabel = parseLabel(xpp);
+        label = parsedLabel.value;
+        labels.add(parsedLabel);
       } else if (XmlPullParserUtil.isStartTag(xpp)) {
         parseAdaptationSetChild(xpp);
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "AdaptationSet"));
 
-    if (labels.size() == 0 && adaptationSetLabel != null) {
-      labels.add(new Label(null, null, adaptationSetLabel));
-    }
-
     // Build the representations.
     List<Representation> representations = new ArrayList<>(representationInfos.size());
     for (int i = 0; i < representationInfos.size(); i++) {
       representations.add(
           buildRepresentation(
               representationInfos.get(i),
-              labels.isEmpty() ? null : labels,
+              label,
+              labels,
               drmSchemeType,
               drmSchemeDatas,
               inbandEventStreams));
@@ -861,11 +860,15 @@ public class DashManifestParser extends DefaultHandler
 
   protected Representation buildRepresentation(
       RepresentationInfo representationInfo,
+      @Nullable String label,
       @Nullable List<Label> labels,
       @Nullable String extraDrmSchemeType,
       ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
     Format.Builder formatBuilder = representationInfo.format.buildUpon();
+    if (label != null) {
+      formatBuilder.setLabel(label);
+    }
     formatBuilder.setLabels(labels);
     @Nullable String drmSchemeType = representationInfo.drmSchemeType;
     if (drmSchemeType == null) {
diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
index b6e2bd188d..f6b1a7ef4b 100644
--- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
+++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
@@ -279,8 +279,9 @@ public class DashManifestParserTest {
 
     List<AdaptationSet> adaptationSets = manifest.getPeriod(0).adaptationSets;
 
-    assertThat(adaptationSets.get(0).representations.get(0).format.labels.get(0).value)
-        .isEqualTo("audio label");
+    assertThat(adaptationSets.get(0).representations.get(0).format.label).isEqualTo("audio label");
+    assertThat(adaptationSets.get(1).representations.get(0).format.label).isEqualTo("video label");
+    assertThat(adaptationSets.get(0).representations.get(0).format.labels.size()).isEqualTo(0);
     assertThat(adaptationSets.get(1).representations.get(0).format.labels.get(0).value)
         .isEqualTo("video label");
   }
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
index 019ed4bc6e..6ef59444ac 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
@@ -852,6 +852,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     @Nullable String sampleMimeType = MimeTypes.getMediaMimeType(codecs);
     return new Format.Builder()
         .setId(variantFormat.id)
+        .setLabel(variantFormat.label)
         .setLabels(variantFormat.labels)
         .setContainerMimeType(variantFormat.containerMimeType)
         .setSampleMimeType(sampleMimeType)
@@ -875,6 +876,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     int selectionFlags = 0;
     int roleFlags = 0;
     @Nullable String language = null;
+    @Nullable String label = null;
     @Nullable List<Label> labels = null;
     if (mediaTagFormat != null) {
       codecs = mediaTagFormat.codecs;
@@ -883,6 +885,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
       selectionFlags = mediaTagFormat.selectionFlags;
       roleFlags = mediaTagFormat.roleFlags;
       language = mediaTagFormat.language;
+      label = mediaTagFormat.label;
       labels = mediaTagFormat.labels;
     } else {
       codecs = Util.getCodecsOfType(variantFormat.codecs, C.TRACK_TYPE_AUDIO);
@@ -892,6 +895,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
         selectionFlags = variantFormat.selectionFlags;
         roleFlags = variantFormat.roleFlags;
         language = variantFormat.language;
+        label = variantFormat.label;
         labels = variantFormat.labels;
       }
     }
@@ -900,6 +904,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     int peakBitrate = isPrimaryTrackInVariant ? variantFormat.peakBitrate : Format.NO_VALUE;
     return new Format.Builder()
         .setId(variantFormat.id)
+        .setLabel(label)
         .setLabels(labels)
         .setContainerMimeType(variantFormat.containerMimeType)
         .setSampleMimeType(sampleMimeType)
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
index 1676bd1a79..aebff9592d 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java
@@ -1583,6 +1583,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
         sampleFormat
             .buildUpon()
             .setId(playlistFormat.id)
+            .setLabel(playlistFormat.label)
             .setLabels(playlistFormat.labels)
             .setLanguage(playlistFormat.language)
             .setSelectionFlags(playlistFormat.selectionFlags)
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
index 670876049a..b6915166e4 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
@@ -477,6 +477,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       Format.Builder formatBuilder =
           new Format.Builder()
               .setId(groupId + ":" + name)
+              .setLabel(name)
               .setLabels(labels)
               .setContainerMimeType(MimeTypes.APPLICATION_M3U8)
               .setSelectionFlags(parseSelectionFlags(line))
diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
index 325401e6d5..c5d624f8fa 100644
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
@@ -745,12 +745,11 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
       String label = (String) getNormalizedAttribute(KEY_NAME);
       if (label != null) {
         labels.add(new Label(null, null, label));
-      } else {
-        labels = null;
       }
       format =
           formatBuilder
               .setId(parser.getAttributeValue(null, KEY_INDEX))
+              .setLabel(label)
               .setLabels(labels)
               .setSampleMimeType(sampleMimeType)
               .setAverageBitrate(parseRequiredInt(parser, KEY_BITRATE))
diff --git a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
index e399d70c38..9f45a58d56 100644
--- a/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
+++ b/libraries/exoplayer_smoothstreaming/src/test/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParserTest.java
@@ -51,6 +51,7 @@ public final class SsManifestParserTest {
             Uri.parse("https://example.com/test.ismc"),
             TestUtil.getInputStream(ApplicationProvider.getApplicationContext(), SAMPLE_ISMC_1));
 
-    assertThat(ssManifest.streamElements[0].formats[0].labels).isEqualTo("video");
+    assertThat(ssManifest.streamElements[0].formats[0].label).isEqualTo("video");
+    assertThat(ssManifest.streamElements[0].formats[0].labels.get(0).value).isEqualTo("video");
   }
 }
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
index 10472f6bd6..d7f60793af 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
@@ -516,8 +516,11 @@ public final class AviExtractor implements Extractor {
     }
     StreamNameChunk streamName = streamList.getChild(StreamNameChunk.class);
     if (streamName != null) {
+      String label = streamName.name;
+      builder.setLabel(label);
+
       List<Label> labels = new ArrayList<>();
-      labels.add(new Label(null, null, streamName.name));
+      labels.add(new Label(null, null, label));
       builder.setLabels(labels);
     }
     int trackType = MimeTypes.getTrackType(streamFormat.sampleMimeType);
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index 92c6a12a85..bc40bb0123 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -2424,6 +2424,8 @@ public class MatroskaExtractor implements Extractor {
       }
 
       if (name != null && !TRACK_NAME_TO_ROTATION_DEGREES.containsKey(name)) {
+        formatBuilder.setLabel(name);
+
         List<Label> labels = new ArrayList<>();
         labels.add(new Label(null, null, name));
         formatBuilder.setLabels(labels);
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
index 3c09609d18..3fafd2e32a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
index 3c09609d18..3fafd2e32a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
index 3c09609d18..3fafd2e32a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
index 3c09609d18..3fafd2e32a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
index 3c09609d18..3fafd2e32a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
index e2c047c404..5e14171dd3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
index e2c047c404..5e14171dd3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
index e2c047c404..5e14171dd3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
index e2c047c404..5e14171dd3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
index e2c047c404..5e14171dd3 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
@@ -275,6 +275,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
index 5470deb7aa..a249352b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
index 5470deb7aa..a249352b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
index 5470deb7aa..a249352b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
index 5470deb7aa..a249352b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
index 5470deb7aa..a249352b0d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
index 69069591f0..856df23144 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
index 69069591f0..856df23144 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
index 69069591f0..856df23144 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
index 69069591f0..856df23144 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
index 69069591f0..856df23144 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
@@ -276,6 +276,8 @@ track 3:
     selectionFlags = [default]
     language = en
     label = Subs Label
+    labels:
+      value = Subs Label
   sample 0:
     time = 0
     flags = 1
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index 00180ea5d8..6aabd4145d 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -100,7 +100,22 @@ public final class DumpableFormat implements Dumper.Dumpable {
         DEFAULT_FORMAT,
         format -> Util.getRoleFlagStrings(format.roleFlags));
     addIfNonDefault(dumper, "language", format, DEFAULT_FORMAT, format -> format.language);
-    addIfNonDefault(dumper, "label", format, DEFAULT_FORMAT, format -> format.labels);
+    addIfNonDefault(dumper, "label", format, DEFAULT_FORMAT, format -> format.label);
+    if (!format.labels.isEmpty()) {
+      dumper.startBlock("labels");
+      for (int i = 0; i < format.labels.size(); i++) {
+        String id = format.labels.get(i).id;
+        String lang = format.labels.get(i).lang;
+        if (id != null) {
+          dumper.add("id", id);
+        }
+        if (lang != null) {
+          dumper.add("lang", lang);
+        }
+        dumper.add("value", format.labels.get(i).value);
+      }
+      dumper.endBlock();
+    }
     if (format.drmInitData != null) {
       dumper.add("drmInitData", format.drmInitData.hashCode());
     }
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
index e3bf3d48f0..b574657f38 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
@@ -110,8 +110,8 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
   }
 
   private String buildLabelString(Format format) {
-    if (format.labels == null || format.labels.isEmpty()) {
-      return "";
+    if (format.labels.isEmpty()) {
+      return TextUtils.isEmpty(format.label) ? "" : format.label;
     }
     if (!TextUtils.isEmpty(format.language)) {
       List<Label> labelsByLanguage =

From e9e47f4fe694613f82c56b1c3fae48367867c271 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Tue, 12 Mar 2024 15:23:32 -0600
Subject: [PATCH 3/8] Removing id from Label and ensuring label/labels
 consistency in Format.Builder.

---
 .../java/androidx/media3/common/Format.java   | 32 +++++++++++++------
 .../java/androidx/media3/common/Label.java    | 13 ++------
 .../androidx/media3/common/FormatTest.java    |  2 +-
 .../source/DefaultMediaSourceFactory.java     | 11 +------
 .../source/SingleSampleMediaSource.java       | 11 +------
 .../dash/manifest/DashManifestParser.java     |  9 ++----
 .../dash/manifest/DashManifestParserTest.java | 17 ++--------
 .../hls/playlist/HlsPlaylistParser.java       |  4 ---
 .../manifest/SsManifestParser.java            |  9 +-----
 .../media3/extractor/avi/AviExtractor.java    |  9 +-----
 .../extractor/mkv/MatroskaExtractor.java      |  5 ---
 ...sample_with_null_terminated_srt.mkv.0.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.1.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.2.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.3.dump |  1 +
 ...ull_terminated_srt.mkv.unknown_length.dump |  1 +
 .../mkv/sample_with_srt.mkv.0.dump            |  1 +
 .../mkv/sample_with_srt.mkv.1.dump            |  1 +
 .../mkv/sample_with_srt.mkv.2.dump            |  1 +
 .../mkv/sample_with_srt.mkv.3.dump            |  1 +
 .../sample_with_srt.mkv.unknown_length.dump   |  1 +
 ...sample_with_null_terminated_srt.mkv.0.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.1.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.2.dump |  1 +
 ...sample_with_null_terminated_srt.mkv.3.dump |  1 +
 ...ull_terminated_srt.mkv.unknown_length.dump |  1 +
 .../sample_with_srt.mkv.0.dump                |  1 +
 .../sample_with_srt.mkv.1.dump                |  1 +
 .../sample_with_srt.mkv.2.dump                |  1 +
 .../sample_with_srt.mkv.3.dump                |  1 +
 .../sample_with_srt.mkv.unknown_length.dump   |  1 +
 .../media3/test/utils/DumpableFormat.java     |  4 ---
 .../media3/ui/DefaultTrackNameProvider.java   | 17 +---------
 33 files changed, 56 insertions(+), 107 deletions(-)

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 7e6d659b9c..e54ec79246 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -18,6 +18,7 @@ package androidx.media3.common;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.BundleCollectionUtil;
@@ -137,7 +138,6 @@ public final class Format implements Bundleable {
   public static final class Builder {
 
     @Nullable private String id;
-
     @Nullable private String label;
     @Nullable private List<Label> labels;
     @Nullable private String language;
@@ -756,12 +756,8 @@ public final class Format implements Bundleable {
   /** An identifier for the format, or null if unknown or not applicable. */
   @Nullable public final String id;
 
-  /**
-   * The human readable label, or null if unknown or not applicable.
-   *
-   * @deprecated Use {@link #labels} instead.
-   */
-  @Deprecated @Nullable public final String label;
+  /** The human readable label, or null if unknown or not applicable. */
+  @Nullable public final String label;
 
   /** The human readable list of labels, or null if unknown or not applicable. */
   @UnstableApi public final List<Label> labels;
@@ -954,9 +950,13 @@ public final class Format implements Bundleable {
 
   private Format(Builder builder) {
     id = builder.id;
-    label = builder.label;
-    labels = builder.labels == null ? Collections.emptyList() : builder.labels;
     language = Util.normalizeLanguageCode(builder.language);
+    @Nullable String tmpLabel = builder.label;
+    labels = builder.labels == null ? new ArrayList<>() : builder.labels;
+    if (labels.isEmpty() && tmpLabel != null && !tmpLabel.isEmpty()) {
+      labels.add(new Label(language, tmpLabel));
+    }
+    label = makeLabelIfNeeded(tmpLabel, labels);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
     averageBitrate = builder.averageBitrate;
@@ -1004,6 +1004,20 @@ public final class Format implements Bundleable {
     }
   }
 
+  private @Nullable String makeLabelIfNeeded(@Nullable String label, List<Label> labels) {
+    if (label == null || label.isEmpty()) {
+      for (Label l : labels) {
+        if (TextUtils.equals(l.lang, language)) {
+          return l.value;
+        }
+      }
+      if (!labels.isEmpty()) {
+        return labels.get(0).value;
+      }
+    }
+    return label;
+  }
+
   /** Returns a {@link Format.Builder} initialized with the values of this instance. */
   @UnstableApi
   public Builder buildUpon() {
diff --git a/libraries/common/src/main/java/androidx/media3/common/Label.java b/libraries/common/src/main/java/androidx/media3/common/Label.java
index c0550a8bf3..68bb45b897 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Label.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Label.java
@@ -10,9 +10,6 @@ import androidx.media3.common.util.Util;
 /** A Label, as defined by ISO 23009-1, 4th edition, 5.3.7.2. */
 @UnstableApi
 public class Label implements Parcelable {
-  /** The Label identifier, if one exists. */
-  @Nullable public final String id;
-
   /** Declares the language code(s) for this Label. */
   @Nullable public final String lang;
 
@@ -20,18 +17,15 @@ public class Label implements Parcelable {
   public final String value;
 
   /**
-   * @param id The id.
    * @param lang The lang code.
    * @param value The value.
    */
-  public Label(@Nullable String id, @Nullable String lang, String value) {
-    this.id = id;
+  public Label(@Nullable String lang, String value) {
     this.lang = lang;
     this.value = value;
   }
 
   /* package */ Label(Parcel in) {
-    id = in.readString();
     lang = in.readString();
     value = in.readString();
   }
@@ -41,15 +35,13 @@ public class Label implements Parcelable {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     Label label = (Label) o;
-    return Util.areEqual(id, label.id)
-        && Util.areEqual(lang, label.lang)
+    return Util.areEqual(lang, label.lang)
         && Util.areEqual(value, label.value);
   }
 
   @Override
   public int hashCode() {
     int result = value.hashCode();
-    result = 31 * result + (id != null ? id.hashCode() : 0);
     result = 31 * result + (lang != null ? lang.hashCode() : 0);
     return result;
   }
@@ -61,7 +53,6 @@ public class Label implements Parcelable {
 
   @Override
   public void writeToParcel(@NonNull Parcel dest, int flags) {
-    dest.writeString(id);
     dest.writeString(lang);
     dest.writeString(value);
   }
diff --git a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
index 06e58b3bde..1fb71abb7c 100644
--- a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
@@ -84,7 +84,7 @@ public final class FormatTest {
             .build();
 
     List<Label> labels = new ArrayList<>();
-    labels.add(new Label("id", "en", "label"));
+    labels.add(new Label("en", "label"));
     return new Format.Builder()
         .setId("id")
         .setLabel("label")
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
index 3b3dd89d3f..c582e9977a 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/DefaultMediaSourceFactory.java
@@ -26,7 +26,6 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.AdViewProvider;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
@@ -59,7 +58,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -515,20 +513,13 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
       mediaSources[0] = mediaSource;
       for (int i = 0; i < subtitleConfigurations.size(); i++) {
         if (parseSubtitlesDuringExtraction) {
-          List<Label> labels = new ArrayList<>();
-          String label = subtitleConfigurations.get(i).label;
-          if (label != null) {
-            labels.add(new Label(null, null, label));
-          }
-
           Format format =
               new Format.Builder()
                   .setSampleMimeType(subtitleConfigurations.get(i).mimeType)
                   .setLanguage(subtitleConfigurations.get(i).language)
                   .setSelectionFlags(subtitleConfigurations.get(i).selectionFlags)
                   .setRoleFlags(subtitleConfigurations.get(i).roleFlags)
-                  .setLabel(label)
-                  .setLabels(labels)
+                  .setLabel(subtitleConfigurations.get(i).label)
                   .setId(subtitleConfigurations.get(i).id)
                   .build();
           ExtractorsFactory extractorsFactory =
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
index 189871a35d..47b5655452 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SingleSampleMediaSource.java
@@ -21,7 +21,6 @@ import static com.google.common.base.MoreObjects.firstNonNull;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MediaItem;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.Timeline;
@@ -34,8 +33,6 @@ import androidx.media3.exoplayer.upstream.DefaultLoadErrorHandlingPolicy;
 import androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy;
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * Loads data at a given {@link Uri} as a single sample belonging to a single {@link MediaPeriod}.
@@ -173,19 +170,13 @@ public final class SingleSampleMediaSource extends BaseMediaSource {
             .setSubtitleConfigurations(ImmutableList.of(subtitleConfiguration))
             .setTag(tag)
             .build();
-    List<Label> labels = new ArrayList<>();
-    String label = subtitleConfiguration.label;
-    if (label != null) {
-      labels.add(new Label(null, null, label));
-    }
     this.format =
         new Format.Builder()
             .setSampleMimeType(firstNonNull(subtitleConfiguration.mimeType, MimeTypes.TEXT_UNKNOWN))
             .setLanguage(subtitleConfiguration.language)
             .setSelectionFlags(subtitleConfiguration.selectionFlags)
             .setRoleFlags(subtitleConfiguration.roleFlags)
-            .setLabel(label)
-            .setLabels(labels)
+            .setLabel(subtitleConfiguration.label)
             .setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
             .build();
     this.dataSpec =
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 1ffd6dec87..9e011d6bae 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
@@ -506,9 +506,7 @@ public class DashManifestParser extends DefaultHandler
       } else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
         inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
       } else if (XmlPullParserUtil.isStartTag(xpp, "Label")) {
-        Label parsedLabel = parseLabel(xpp);
-        label = parsedLabel.value;
-        labels.add(parsedLabel);
+        labels.add(parseLabel(xpp));
       } else if (XmlPullParserUtil.isStartTag(xpp)) {
         parseAdaptationSetChild(xpp);
       }
@@ -861,7 +859,7 @@ public class DashManifestParser extends DefaultHandler
   protected Representation buildRepresentation(
       RepresentationInfo representationInfo,
       @Nullable String label,
-      @Nullable List<Label> labels,
+      List<Label> labels,
       @Nullable String extraDrmSchemeType,
       ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
@@ -1413,10 +1411,9 @@ public class DashManifestParser extends DefaultHandler
    * @return The parsed label.
    */
   protected Label parseLabel(XmlPullParser xpp) throws XmlPullParserException, IOException {
-    String id = xpp.getAttributeValue(null, "id");
     String lang = xpp.getAttributeValue(null, "lang");
     String value = parseText(xpp, "Label");
-    return new Label(id, lang, value);
+    return new Label(lang, value);
   }
 
   /**
diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
index f6b1a7ef4b..3d2c806882 100644
--- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
+++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
@@ -435,27 +435,14 @@ public class DashManifestParserTest {
 
   @Test
   public void parseLabel() throws Exception {
-    DashManifestParser parser = new DashManifestParser();
-    XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
-    xpp.setInput(new StringReader("<Label id=\"1\" lang=\"en\">test label</Label>" + NEXT_TAG));
-    xpp.next();
-
-    Label label = parser.parseLabel(xpp);
-    assertThat(label.id).isEqualTo("1");
-    assertThat(label.lang).isEqualTo("en");
-    assertThat(label.value).isEqualTo("test label");
-    assertNextTag(xpp);
-  }
-
-  @Test
-  public void parseLabel_noId() throws Exception {
     DashManifestParser parser = new DashManifestParser();
     XmlPullParser xpp = XmlPullParserFactory.newInstance().newPullParser();
     xpp.setInput(new StringReader("<Label lang=\"en\">test label</Label>" + NEXT_TAG));
     xpp.next();
 
     Label label = parser.parseLabel(xpp);
-    assertThat(label.id).isEqualTo(null);
+    assertThat(label.lang).isEqualTo("en");
+    assertThat(label.value).isEqualTo("test label");
     assertNextTag(xpp);
   }
 
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
index b6915166e4..8dc60984f2 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/playlist/HlsPlaylistParser.java
@@ -27,7 +27,6 @@ import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.Metadata;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
@@ -472,13 +471,10 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
       line = mediaTags.get(i);
       String groupId = parseStringAttr(line, REGEX_GROUP_ID, variableDefinitions);
       String name = parseStringAttr(line, REGEX_NAME, variableDefinitions);
-      List<Label> labels = new ArrayList<>();
-      labels.add(new Label(null, null, name));
       Format.Builder formatBuilder =
           new Format.Builder()
               .setId(groupId + ":" + name)
               .setLabel(name)
-              .setLabels(labels)
               .setContainerMimeType(MimeTypes.APPLICATION_M3U8)
               .setSelectionFlags(parseSelectionFlags(line))
               .setRoleFlags(parseRoleFlags(line, variableDefinitions))
diff --git a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
index c5d624f8fa..225569786b 100644
--- a/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
+++ b/libraries/exoplayer_smoothstreaming/src/main/java/androidx/media3/exoplayer/smoothstreaming/manifest/SsManifestParser.java
@@ -24,7 +24,6 @@ import androidx.media3.common.C;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
@@ -741,16 +740,10 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
         formatBuilder.setContainerMimeType(MimeTypes.APPLICATION_MP4);
       }
 
-      List<Label> labels = new ArrayList<>();
-      String label = (String) getNormalizedAttribute(KEY_NAME);
-      if (label != null) {
-        labels.add(new Label(null, null, label));
-      }
       format =
           formatBuilder
               .setId(parser.getAttributeValue(null, KEY_INDEX))
-              .setLabel(label)
-              .setLabels(labels)
+              .setLabel((String) getNormalizedAttribute(KEY_NAME))
               .setSampleMimeType(sampleMimeType)
               .setAverageBitrate(parseRequiredInt(parser, KEY_BITRATE))
               .setLanguage((String) getNormalizedAttribute(KEY_LANGUAGE))
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
index d7f60793af..1373b17a5e 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/avi/AviExtractor.java
@@ -21,7 +21,6 @@ import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Assertions;
@@ -43,7 +42,6 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.util.ArrayList;
-import java.util.List;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
 /**
@@ -516,12 +514,7 @@ public final class AviExtractor implements Extractor {
     }
     StreamNameChunk streamName = streamList.getChild(StreamNameChunk.class);
     if (streamName != null) {
-      String label = streamName.name;
-      builder.setLabel(label);
-
-      List<Label> labels = new ArrayList<>();
-      labels.add(new Label(null, null, label));
-      builder.setLabels(labels);
+      builder.setLabel(streamName.name);
     }
     int trackType = MimeTypes.getTrackType(streamFormat.sampleMimeType);
     if (trackType == C.TRACK_TYPE_AUDIO || trackType == C.TRACK_TYPE_VIDEO) {
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index bc40bb0123..34bafec956 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -33,7 +33,6 @@ import androidx.media3.common.ColorInfo;
 import androidx.media3.common.DrmInitData;
 import androidx.media3.common.DrmInitData.SchemeData;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.ParserException;
 import androidx.media3.common.util.Log;
@@ -2425,10 +2424,6 @@ public class MatroskaExtractor implements Extractor {
 
       if (name != null && !TRACK_NAME_TO_ROTATION_DEGREES.containsKey(name)) {
         formatBuilder.setLabel(name);
-
-        List<Label> labels = new ArrayList<>();
-        labels.add(new Label(null, null, name));
-        formatBuilder.setLabels(labels);
       }
 
       Format format =
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
index 3fafd2e32a..c4adbf92c2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
index 3fafd2e32a..c4adbf92c2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
index 3fafd2e32a..c4adbf92c2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
index 3fafd2e32a..c4adbf92c2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
index 3fafd2e32a..c4adbf92c2 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
index 5e14171dd3..5bbcc39d9d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
index 5e14171dd3..5bbcc39d9d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
index 5e14171dd3..5bbcc39d9d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
index 5e14171dd3..5bbcc39d9d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
index 5e14171dd3..5bbcc39d9d 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump
@@ -276,6 +276,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
index a249352b0d..c70250ab63 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
index a249352b0d..c70250ab63 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
index a249352b0d..c70250ab63 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
index a249352b0d..c70250ab63 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
index a249352b0d..c70250ab63 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
index 856df23144..c300df088a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
index 856df23144..c300df088a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
index 856df23144..c300df088a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
index 856df23144..c300df088a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
index 856df23144..c300df088a 100644
--- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
+++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump
@@ -277,6 +277,7 @@ track 3:
     language = en
     label = Subs Label
     labels:
+      lang = en
       value = Subs Label
   sample 0:
     time = 0
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index 6aabd4145d..f546e67e62 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -104,11 +104,7 @@ public final class DumpableFormat implements Dumper.Dumpable {
     if (!format.labels.isEmpty()) {
       dumper.startBlock("labels");
       for (int i = 0; i < format.labels.size(); i++) {
-        String id = format.labels.get(i).id;
         String lang = format.labels.get(i).lang;
-        if (id != null) {
-          dumper.add("id", id);
-        }
         if (lang != null) {
           dumper.add("lang", lang);
         }
diff --git a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
index b574657f38..d83fc54195 100644
--- a/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
+++ b/libraries/ui/src/main/java/androidx/media3/ui/DefaultTrackNameProvider.java
@@ -20,14 +20,11 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
-import androidx.media3.common.Label;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
-import java.util.List;
 import java.util.Locale;
-import java.util.stream.Collectors;
 
 /** A default {@link TrackNameProvider}. */
 @UnstableApi
@@ -110,19 +107,7 @@ public class DefaultTrackNameProvider implements TrackNameProvider {
   }
 
   private String buildLabelString(Format format) {
-    if (format.labels.isEmpty()) {
-      return TextUtils.isEmpty(format.label) ? "" : format.label;
-    }
-    if (!TextUtils.isEmpty(format.language)) {
-      List<Label> labelsByLanguage =
-          format.labels.stream()
-              .filter(label -> format.language.equals(label.lang))
-              .collect(Collectors.toList());
-      if (!labelsByLanguage.isEmpty()) {
-        return labelsByLanguage.get(0).value;
-      }
-    }
-    return TextUtils.isEmpty(format.labels.get(0).value) ? "" : format.labels.get(0).value;
+    return TextUtils.isEmpty(format.label) ? "" : format.label;
   }
 
   private String buildLanguageString(Format format) {

From 591020065a1e64705b2fd163085ffa55f3c02598 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Wed, 13 Mar 2024 11:52:23 -0600
Subject: [PATCH 4/8] Adding IllegalStateException to Format build and unit
 tests.

---
 .../java/androidx/media3/common/Format.java   | 14 ++++++-
 .../androidx/media3/common/FormatTest.java    | 42 +++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

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 e54ec79246..3db7583314 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -953,10 +953,11 @@ public final class Format implements Bundleable {
     language = Util.normalizeLanguageCode(builder.language);
     @Nullable String tmpLabel = builder.label;
     labels = builder.labels == null ? new ArrayList<>() : builder.labels;
-    if (labels.isEmpty() && tmpLabel != null && !tmpLabel.isEmpty()) {
+    if (labels.isEmpty() && !TextUtils.isEmpty(tmpLabel)) {
       labels.add(new Label(language, tmpLabel));
     }
     label = makeLabelIfNeeded(tmpLabel, labels);
+    checkLabels(label, labels);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
     averageBitrate = builder.averageBitrate;
@@ -1005,7 +1006,7 @@ public final class Format implements Bundleable {
   }
 
   private @Nullable String makeLabelIfNeeded(@Nullable String label, List<Label> labels) {
-    if (label == null || label.isEmpty()) {
+    if (TextUtils.isEmpty(label)) {
       for (Label l : labels) {
         if (TextUtils.equals(l.lang, language)) {
           return l.value;
@@ -1018,6 +1019,15 @@ public final class Format implements Bundleable {
     return label;
   }
 
+  private void checkLabels(@Nullable String label, List<Label> labels)
+      throws IllegalStateException {
+    if (!TextUtils.isEmpty(label)
+        && !labels.isEmpty()
+        && labels.stream().noneMatch(l -> TextUtils.equals(l.value, label))) {
+      throw new IllegalStateException();
+    }
+  }
+
   /** Returns a {@link Format.Builder} initialized with the values of this instance. */
   @UnstableApi
   public Builder buildUpon() {
diff --git a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
index 1fb71abb7c..40ab4fc560 100644
--- a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
@@ -57,6 +57,48 @@ public final class FormatTest {
     assertThat(formatWithMetadataExcluded).isEqualTo(format.buildUpon().setMetadata(null).build());
   }
 
+  @Test
+  public void formatBuild_withLabelAndWithoutLabels_labelIsInLabels() {
+    Format format = createTestFormat();
+    format = format.buildUpon().setLabels(null).build();
+
+    assertThat(format.labels.size()).isEqualTo(1);
+    assertThat(format.labels.get(0).value).isEqualTo(format.label);
+  }
+
+  @Test
+  public void formatBuild_withLabelsAndLanguageMatchingAndWithoutLabel_theLanguageMatchIsInLabel() {
+    Format format = createTestFormat();
+    format.labels.add(new Label("language", "matchingLabel"));
+    format = format.buildUpon().setLabel(null).build();
+
+    assertThat(format.label).isEqualTo("matchingLabel");
+  }
+
+  @Test
+  public void formatBuild_withLabelsAndNoLanguageMatchingAndWithoutLabel_theFirstIsInLabel() {
+    Format format = createTestFormat();
+    format.labels.add(new Label("otherLanguage", "otherLabel"));
+    format = format.buildUpon().setLabel(null).build();
+
+    assertThat(format.label).isEqualTo("label");
+  }
+
+  @Test
+  public void formatBuild_withoutLabelsOrLabel_theyAreEmpty() {
+    Format format = createTestFormat();
+    format = format.buildUpon().setLabel(null).setLabels(null).build();
+
+    assertThat(format.label).isEqualTo(null);
+    assertThat(format.labels.size()).isEqualTo(0);
+  }
+
+  @Test(expected = IllegalStateException.class)
+  public void formatBuild_withLabelAndLabelsSetButNotMatching_throwsException() {
+    Format format = createTestFormat();
+    format.buildUpon().setLabel("otherLabel").build();
+  }
+
   private static Format createTestFormat() {
     byte[] initData1 = new byte[] {1, 2, 3};
     byte[] initData2 = new byte[] {4, 5, 6};

From 0a04e7908b6aa8e6e464e19ddefed3d6b90ce222 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Thu, 14 Mar 2024 09:53:53 -0600
Subject: [PATCH 5/8] Addressing PR feedback.

---
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../java/androidx/media3/common/Format.java   | 127 +++++++-----------
 .../java/androidx/media3/common/Label.java    |  27 +++-
 3 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dfc1cb3616..0e37bbe43d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 30 08:51:00 MST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
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 3db7583314..27fec2dea6 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -25,6 +25,7 @@ import androidx.media3.common.util.BundleCollectionUtil;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -955,8 +956,12 @@ public final class Format implements Bundleable {
     labels = builder.labels == null ? new ArrayList<>() : builder.labels;
     if (labels.isEmpty() && !TextUtils.isEmpty(tmpLabel)) {
       labels.add(new Label(language, tmpLabel));
+      label = tmpLabel;
+    } else if (!labels.isEmpty() && TextUtils.isEmpty(tmpLabel)) {
+      label = getDefaultLabel(tmpLabel, labels);
+    } else {
+      label = tmpLabel;
     }
-    label = makeLabelIfNeeded(tmpLabel, labels);
     checkLabels(label, labels);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
@@ -1005,7 +1010,7 @@ public final class Format implements Bundleable {
     }
   }
 
-  private @Nullable String makeLabelIfNeeded(@Nullable String label, List<Label> labels) {
+  private @Nullable String getDefaultLabel(@Nullable String label, List<Label> labels) {
     if (TextUtils.isEmpty(label)) {
       for (Label l : labels) {
         if (TextUtils.equals(l.lang, language)) {
@@ -1162,7 +1167,7 @@ public final class Format implements Bundleable {
       int result = 17;
       result = 31 * result + (id == null ? 0 : id.hashCode());
       result = 31 * result + (label == null ? 0 : label.hashCode());
-      // [Omitted] labels.
+      result = 31 * result + labels.hashCode();
       result = 31 * result + (language == null ? 0 : language.hashCode());
       result = 31 * result + selectionFlags;
       result = 31 * result + roleFlags;
@@ -1250,7 +1255,7 @@ public final class Format implements Bundleable {
         && Util.areEqual(colorInfo, other.colorInfo)
         && Util.areEqual(drmInitData, other.drmInitData)
         && initializationDataEquals(other)
-        && labelsEquals(other);
+        && labels.equals(other.labels);
   }
 
   /**
@@ -1274,32 +1279,6 @@ public final class Format implements Bundleable {
     return true;
   }
 
-  /**
-   * Returns whether the {@link #labels}s belonging to this format and {@code other} are equal.
-   *
-   * @param other The other format whose {@link #labels} is being compared.
-   * @return Whether the {@link #labels} belonging to this format and {@code other} are equal.
-   */
-  @UnstableApi
-  public boolean labelsEquals(Format other) {
-    if ((labels == null && other.labels != null) || (labels != null && other.labels == null)) {
-      return false;
-    }
-    if (labels == null && other.labels == null) {
-      return true;
-    }
-
-    if (labels.size() != other.labels.size()) {
-      return false;
-    }
-    for (int i = 0; i < labels.size(); i++) {
-      if (!Util.areEqual(labels.get(i), other.labels.get(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
   // Utility methods
 
   /** Returns a prettier {@link String} than {@link #toString()}, intended for logging. */
@@ -1362,7 +1341,7 @@ public final class Format implements Bundleable {
     if (format.label != null) {
       builder.append(", label=").append(format.label);
     }
-    if (format.labels != null) {
+    if (format.labels.size() > 0) {
       builder.append(", labels=[");
       Joiner.on(',').appendTo(builder, format.labels);
       builder.append("]");
@@ -1384,37 +1363,37 @@ public final class Format implements Bundleable {
 
   private static final String FIELD_ID = Util.intToStringMaxRadix(0);
   private static final String FIELD_LABEL = Util.intToStringMaxRadix(1);
-  private static final String FIELD_LABELS = Util.intToStringMaxRadix(2);
-  private static final String FIELD_LANGUAGE = Util.intToStringMaxRadix(3);
-  private static final String FIELD_SELECTION_FLAGS = Util.intToStringMaxRadix(4);
-  private static final String FIELD_ROLE_FLAGS = Util.intToStringMaxRadix(5);
-  private static final String FIELD_AVERAGE_BITRATE = Util.intToStringMaxRadix(6);
-  private static final String FIELD_PEAK_BITRATE = Util.intToStringMaxRadix(7);
-  private static final String FIELD_CODECS = Util.intToStringMaxRadix(8);
-  private static final String FIELD_METADATA = Util.intToStringMaxRadix(9);
-  private static final String FIELD_CONTAINER_MIME_TYPE = Util.intToStringMaxRadix(10);
-  private static final String FIELD_SAMPLE_MIME_TYPE = Util.intToStringMaxRadix(11);
-  private static final String FIELD_MAX_INPUT_SIZE = Util.intToStringMaxRadix(12);
-  private static final String FIELD_INITIALIZATION_DATA = Util.intToStringMaxRadix(13);
-  private static final String FIELD_DRM_INIT_DATA = Util.intToStringMaxRadix(14);
-  private static final String FIELD_SUBSAMPLE_OFFSET_US = Util.intToStringMaxRadix(15);
-  private static final String FIELD_WIDTH = Util.intToStringMaxRadix(16);
-  private static final String FIELD_HEIGHT = Util.intToStringMaxRadix(17);
-  private static final String FIELD_FRAME_RATE = Util.intToStringMaxRadix(18);
-  private static final String FIELD_ROTATION_DEGREES = Util.intToStringMaxRadix(19);
-  private static final String FIELD_PIXEL_WIDTH_HEIGHT_RATIO = Util.intToStringMaxRadix(20);
-  private static final String FIELD_PROJECTION_DATA = Util.intToStringMaxRadix(21);
-  private static final String FIELD_STEREO_MODE = Util.intToStringMaxRadix(22);
-  private static final String FIELD_COLOR_INFO = Util.intToStringMaxRadix(23);
-  private static final String FIELD_CHANNEL_COUNT = Util.intToStringMaxRadix(24);
-  private static final String FIELD_SAMPLE_RATE = Util.intToStringMaxRadix(25);
-  private static final String FIELD_PCM_ENCODING = Util.intToStringMaxRadix(26);
-  private static final String FIELD_ENCODER_DELAY = Util.intToStringMaxRadix(27);
-  private static final String FIELD_ENCODER_PADDING = Util.intToStringMaxRadix(28);
-  private static final String FIELD_ACCESSIBILITY_CHANNEL = Util.intToStringMaxRadix(29);
-  private static final String FIELD_CRYPTO_TYPE = Util.intToStringMaxRadix(30);
-  private static final String FIELD_TILE_COUNT_HORIZONTAL = Util.intToStringMaxRadix(31);
-  private static final String FIELD_TILE_COUNT_VERTICAL = Util.intToStringMaxRadix(32);
+  private static final String FIELD_LANGUAGE = Util.intToStringMaxRadix(2);
+  private static final String FIELD_SELECTION_FLAGS = Util.intToStringMaxRadix(3);
+  private static final String FIELD_ROLE_FLAGS = Util.intToStringMaxRadix(4);
+  private static final String FIELD_AVERAGE_BITRATE = Util.intToStringMaxRadix(5);
+  private static final String FIELD_PEAK_BITRATE = Util.intToStringMaxRadix(6);
+  private static final String FIELD_CODECS = Util.intToStringMaxRadix(7);
+  private static final String FIELD_METADATA = Util.intToStringMaxRadix(8);
+  private static final String FIELD_CONTAINER_MIME_TYPE = Util.intToStringMaxRadix(9);
+  private static final String FIELD_SAMPLE_MIME_TYPE = Util.intToStringMaxRadix(10);
+  private static final String FIELD_MAX_INPUT_SIZE = Util.intToStringMaxRadix(11);
+  private static final String FIELD_INITIALIZATION_DATA = Util.intToStringMaxRadix(12);
+  private static final String FIELD_DRM_INIT_DATA = Util.intToStringMaxRadix(13);
+  private static final String FIELD_SUBSAMPLE_OFFSET_US = Util.intToStringMaxRadix(14);
+  private static final String FIELD_WIDTH = Util.intToStringMaxRadix(15);
+  private static final String FIELD_HEIGHT = Util.intToStringMaxRadix(16);
+  private static final String FIELD_FRAME_RATE = Util.intToStringMaxRadix(17);
+  private static final String FIELD_ROTATION_DEGREES = Util.intToStringMaxRadix(18);
+  private static final String FIELD_PIXEL_WIDTH_HEIGHT_RATIO = Util.intToStringMaxRadix(19);
+  private static final String FIELD_PROJECTION_DATA = Util.intToStringMaxRadix(20);
+  private static final String FIELD_STEREO_MODE = Util.intToStringMaxRadix(21);
+  private static final String FIELD_COLOR_INFO = Util.intToStringMaxRadix(22);
+  private static final String FIELD_CHANNEL_COUNT = Util.intToStringMaxRadix(23);
+  private static final String FIELD_SAMPLE_RATE = Util.intToStringMaxRadix(24);
+  private static final String FIELD_PCM_ENCODING = Util.intToStringMaxRadix(25);
+  private static final String FIELD_ENCODER_DELAY = Util.intToStringMaxRadix(26);
+  private static final String FIELD_ENCODER_PADDING = Util.intToStringMaxRadix(27);
+  private static final String FIELD_ACCESSIBILITY_CHANNEL = Util.intToStringMaxRadix(28);
+  private static final String FIELD_CRYPTO_TYPE = Util.intToStringMaxRadix(29);
+  private static final String FIELD_TILE_COUNT_HORIZONTAL = Util.intToStringMaxRadix(30);
+  private static final String FIELD_TILE_COUNT_VERTICAL = Util.intToStringMaxRadix(31);
+  private static final String FIELD_LABELS = Util.intToStringMaxRadix(32);
 
   @UnstableApi
   @Override
@@ -1431,11 +1410,8 @@ public final class Format implements Bundleable {
     Bundle bundle = new Bundle();
     bundle.putString(FIELD_ID, id);
     bundle.putString(FIELD_LABEL, label);
-    if (labels != null) {
-      for (int i = 0; i < labels.size(); i++) {
-        bundle.putParcelable(keyForLabel(i), labels.get(i));
-      }
-    }
+    bundle.putParcelableArrayList(
+        FIELD_LABELS, BundleCollectionUtil.toBundleArrayList(labels, Label::toBundle));
     bundle.putString(FIELD_LANGUAGE, language);
     bundle.putInt(FIELD_SELECTION_FLAGS, selectionFlags);
     bundle.putInt(FIELD_ROLE_FLAGS, roleFlags);
@@ -1503,14 +1479,11 @@ public final class Format implements Bundleable {
     builder
         .setId(defaultIfNull(bundle.getString(FIELD_ID), DEFAULT.id))
         .setLabel(defaultIfNull(bundle.getString(FIELD_LABEL), DEFAULT.label));
-    List<Label> labels = new ArrayList<>();
-    for (int i = 0; ; i++) {
-      @Nullable Label label = bundle.getParcelable(keyForLabel(i));
-      if (label == null) {
-        break;
-      }
-      labels.add(label);
-    }
+    @Nullable List<Bundle> labelsBundles = bundle.getParcelableArrayList(FIELD_LABELS);
+    List<Label> labels =
+        labelsBundles == null
+            ? ImmutableList.of()
+            : BundleCollectionUtil.fromBundleList(Label::fromBundle, labelsBundles);
     builder
         .setLabels(labels)
         .setLanguage(defaultIfNull(bundle.getString(FIELD_LANGUAGE), DEFAULT.language))
@@ -1579,10 +1552,6 @@ public final class Format implements Bundleable {
         + Integer.toString(initialisationDataIndex, Character.MAX_RADIX);
   }
 
-  private static String keyForLabel(int labelIndex) {
-    return FIELD_LABELS + "_" + Integer.toString(labelIndex, Character.MAX_RADIX);
-  }
-
   /**
    * Utility method to get {@code defaultValue} if {@code value} is {@code null}. {@code
    * defaultValue} can be {@code null}.
diff --git a/libraries/common/src/main/java/androidx/media3/common/Label.java b/libraries/common/src/main/java/androidx/media3/common/Label.java
index 68bb45b897..63e6c94501 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Label.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Label.java
@@ -1,5 +1,8 @@
 package androidx.media3.common;
 
+import static androidx.media3.common.util.Assertions.checkNotNull;
+
+import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
@@ -9,7 +12,7 @@ import androidx.media3.common.util.Util;
 
 /** A Label, as defined by ISO 23009-1, 4th edition, 5.3.7.2. */
 @UnstableApi
-public class Label implements Parcelable {
+public class Label implements Parcelable, Bundleable {
   /** Declares the language code(s) for this Label. */
   @Nullable public final String lang;
 
@@ -35,8 +38,7 @@ public class Label implements Parcelable {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     Label label = (Label) o;
-    return Util.areEqual(lang, label.lang)
-        && Util.areEqual(value, label.value);
+    return Util.areEqual(lang, label.lang) && Util.areEqual(value, label.value);
   }
 
   @Override
@@ -70,4 +72,23 @@ public class Label implements Parcelable {
           return new Label[size];
         }
       };
+
+  private static final String FIELD_LANG_INDEX = Util.intToStringMaxRadix(0);
+  private static final String FIELD_VALUE_INDEX = Util.intToStringMaxRadix(1);
+
+  @Override
+  public Bundle toBundle() {
+    Bundle bundle = new Bundle();
+    bundle.putString(FIELD_LANG_INDEX, lang);
+    bundle.putString(FIELD_VALUE_INDEX, value);
+    return bundle;
+  }
+
+  /**
+   * Constructs an instance of {@link Label} from a {@link Bundle} produced by {@link #toBundle()}.
+   */
+  public static Label fromBundle(Bundle bundle) {
+    return new Label(
+        bundle.getString(FIELD_LANG_INDEX), checkNotNull(bundle.getString(FIELD_VALUE_INDEX)));
+  }
 }

From 54c23e28567788245e6b38da4c35b3f7b8b90ba1 Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Thu, 14 Mar 2024 10:00:25 -0600
Subject: [PATCH 6/8] Reverting changes in gradle-wrapper.properties

---
 gradle/wrapper/gradle-wrapper.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e37bbe43d..3a02907943 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,3 @@
-#Tue Jan 30 08:51:00 MST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

From 8673e6d39ad28b019d51966e1cf3ca2870e739cd Mon Sep 17 00:00:00 2001
From: Juan Carlos Penalver <jekopena@gmail.com>
Date: Mon, 18 Mar 2024 05:26:49 -0600
Subject: [PATCH 7/8] Removing label from toLogString.

---
 .../common/src/main/java/androidx/media3/common/Format.java    | 3 ---
 1 file changed, 3 deletions(-)

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 27fec2dea6..28e19abed5 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Format.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Format.java
@@ -1338,9 +1338,6 @@ public final class Format implements Bundleable {
     if (format.language != null) {
       builder.append(", language=").append(format.language);
     }
-    if (format.label != null) {
-      builder.append(", label=").append(format.label);
-    }
     if (format.labels.size() > 0) {
       builder.append(", labels=[");
       Joiner.on(',').appendTo(builder, format.labels);

From 73c0ebb2143680b6290fe1e1bd33c594e18b934e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 25 Mar 2024 11:59:35 +0000
Subject: [PATCH 8/8] Additional clean-up and formatting

---
 RELEASENOTES.md                               |  3 +
 .../java/androidx/media3/common/Format.java   | 90 +++++++++--------
 .../java/androidx/media3/common/Label.java    | 98 +++++++++----------
 .../androidx/media3/common/FormatTest.java    | 58 ++++++-----
 .../dash/manifest/DashManifestParser.java     |  5 +-
 .../dash/manifest/DashManifestParserTest.java | 12 ++-
 .../media3/exoplayer/hls/HlsMediaPeriod.java  |  2 +-
 .../media3/test/utils/DumpableFormat.java     |  2 +-
 8 files changed, 145 insertions(+), 125 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 0ccde8e702..fc4a0204e6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -3,6 +3,7 @@
 ### Unreleased changes
 
 *   Common Library:
+    *   Add `Format.labels` to allow localized or other alternative 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 final class Format implements Bundleable {
 
     @Nullable private String id;
     @Nullable private String label;
-    @Nullable private List<Label> labels;
+    private List<Label> labels;
     @Nullable private String language;
     private @C.SelectionFlags int selectionFlags;
     private @C.RoleFlags int roleFlags;
@@ -196,6 +197,7 @@ public final class Format implements Bundleable {
 
     /** Creates a new instance with default values. */
     public Builder() {
+      labels = ImmutableList.of();
       averageBitrate = NO_VALUE;
       peakBitrate = NO_VALUE;
       // Sample specific.
@@ -298,6 +300,9 @@ public final class Format implements Bundleable {
     /**
      * Sets {@link Format#label}. The default value is {@code null}.
      *
+     * <p>If both this default label and a list of {@link #setLabels labels} are set, this default
+     * label must be part of label list.
+     *
      * @param label The {@link Format#label}.
      * @return The builder.
      */
@@ -308,14 +313,17 @@ public final class Format implements Bundleable {
     }
 
     /**
-     * Sets {@link Format#labels}. The default value is {@code null}.
+     * Sets {@link Format#labels}. The default value is an empty list.
+     *
+     * <p>If both the default {@linkplain #setLabel label} and this list are set, the default label
+     * must be part of this list of labels.
      *
      * @param labels The {@link Format#labels}.
      * @return The builder.
      */
     @CanIgnoreReturnValue
-    public Builder setLabels(@Nullable List<Label> labels) {
-      this.labels = labels;
+    public Builder setLabels(List<Label> labels) {
+      this.labels = ImmutableList.copyOf(labels);
       return this;
     }
 
@@ -757,10 +765,20 @@ public final class Format implements Bundleable {
   /** An identifier for the format, or null if unknown or not applicable. */
   @Nullable public final String id;
 
-  /** The human readable label, or null if unknown or not applicable. */
+  /**
+   * The default human readable label, or null if unknown or not applicable.
+   *
+   * <p>If non-null, the same label will be part of {@link #labels} too. If null, {@link #labels}
+   * will be empty.
+   */
   @Nullable public final String label;
 
-  /** The human readable list of labels, or null if unknown or not applicable. */
+  /**
+   * The human readable list of labels, or an empty list if unknown or not applicable.
+   *
+   * <p>If non-empty, the default {@link #label} will be part of this list. If empty, the default
+   * {@link #label} will be null.
+   */
   @UnstableApi public final List<Label> labels;
 
   /** The language as an IETF BCP 47 conformant tag, or null if unknown or not applicable. */
@@ -952,17 +970,19 @@ public final class Format implements Bundleable {
   private Format(Builder builder) {
     id = builder.id;
     language = Util.normalizeLanguageCode(builder.language);
-    @Nullable String tmpLabel = builder.label;
-    labels = builder.labels == null ? new ArrayList<>() : builder.labels;
-    if (labels.isEmpty() && !TextUtils.isEmpty(tmpLabel)) {
-      labels.add(new Label(language, tmpLabel));
-      label = tmpLabel;
-    } else if (!labels.isEmpty() && TextUtils.isEmpty(tmpLabel)) {
-      label = getDefaultLabel(tmpLabel, labels);
+    if (builder.labels.isEmpty() && builder.label != null) {
+      labels = ImmutableList.of(new Label(language, builder.label));
+      label = builder.label;
+    } else if (!builder.labels.isEmpty() && builder.label == null) {
+      labels = builder.labels;
+      label = getDefaultLabel(builder.labels, language);
     } else {
-      label = tmpLabel;
+      checkState(
+          (builder.labels.isEmpty() && builder.label == null)
+              || (builder.labels.stream().anyMatch(l -> l.value.equals(builder.label))));
+      labels = builder.labels;
+      label = builder.label;
     }
-    checkLabels(label, labels);
     selectionFlags = builder.selectionFlags;
     roleFlags = builder.roleFlags;
     averageBitrate = builder.averageBitrate;
@@ -1010,29 +1030,6 @@ public final class Format implements Bundleable {
     }
   }
 
-  private @Nullable String getDefaultLabel(@Nullable String label, List<Label> labels) {
-    if (TextUtils.isEmpty(label)) {
-      for (Label l : labels) {
-        if (TextUtils.equals(l.lang, language)) {
-          return l.value;
-        }
-      }
-      if (!labels.isEmpty()) {
-        return labels.get(0).value;
-      }
-    }
-    return label;
-  }
-
-  private void checkLabels(@Nullable String label, List<Label> labels)
-      throws IllegalStateException {
-    if (!TextUtils.isEmpty(label)
-        && !labels.isEmpty()
-        && labels.stream().noneMatch(l -> TextUtils.equals(l.value, label))) {
-      throw new IllegalStateException();
-    }
-  }
-
   /** Returns a {@link Format.Builder} initialized with the values of this instance. */
   @UnstableApi
   public Builder buildUpon() {
@@ -1056,7 +1053,7 @@ public final class Format implements Bundleable {
 
     // Prefer manifest values, but fill in from sample format if missing.
     @Nullable String label = manifestFormat.label != null ? manifestFormat.label : this.label;
-    List<Label> labels = manifestFormat.labels;
+    List<Label> labels = !manifestFormat.labels.isEmpty() ? manifestFormat.labels : this.labels;
     @Nullable String language = this.language;
     if ((trackType == C.TRACK_TYPE_TEXT || trackType == C.TRACK_TYPE_AUDIO)
         && manifestFormat.language != null) {
@@ -1246,6 +1243,7 @@ public final class Format implements Bundleable {
         && Float.compare(pixelWidthHeightRatio, other.pixelWidthHeightRatio) == 0
         && Util.areEqual(id, other.id)
         && Util.areEqual(label, other.label)
+        && labels.equals(other.labels)
         && Util.areEqual(codecs, other.codecs)
         && Util.areEqual(containerMimeType, other.containerMimeType)
         && Util.areEqual(sampleMimeType, other.sampleMimeType)
@@ -1254,8 +1252,7 @@ public final class Format implements Bundleable {
         && Util.areEqual(metadata, other.metadata)
         && Util.areEqual(colorInfo, other.colorInfo)
         && Util.areEqual(drmInitData, other.drmInitData)
-        && initializationDataEquals(other)
-        && labels.equals(other.labels);
+        && initializationDataEquals(other);
   }
 
   /**
@@ -1338,7 +1335,7 @@ public final class Format implements Bundleable {
     if (format.language != null) {
       builder.append(", language=").append(format.language);
     }
-    if (format.labels.size() > 0) {
+    if (!format.labels.isEmpty()) {
       builder.append(", labels=[");
       Joiner.on(',').appendTo(builder, format.labels);
       builder.append("]");
@@ -1561,4 +1558,13 @@ public final class Format implements Bundleable {
   private static <T> T defaultIfNull(@Nullable T value, @Nullable T defaultValue) {
     return value != null ? value : defaultValue;
   }
+
+  private static String getDefaultLabel(List<Label> labels, @Nullable String language) {
+    for (Label l : labels) {
+      if (TextUtils.equals(l.language, language)) {
+        return l.value;
+      }
+    }
+    return labels.get(0).value;
+  }
 }
diff --git a/libraries/common/src/main/java/androidx/media3/common/Label.java b/libraries/common/src/main/java/androidx/media3/common/Label.java
index 63e6c94501..455ed70dc0 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Label.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Label.java
@@ -1,94 +1,86 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package androidx.media3.common;
 
 import static androidx.media3.common.util.Assertions.checkNotNull;
 
 import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.media3.common.util.UnstableApi;
 import androidx.media3.common.util.Util;
 
-/** A Label, as defined by ISO 23009-1, 4th edition, 5.3.7.2. */
+/** A label for a {@link Format}. */
 @UnstableApi
-public class Label implements Parcelable, Bundleable {
-  /** Declares the language code(s) for this Label. */
-  @Nullable public final String lang;
+public class Label {
+  /**
+   * The language of this label, as an IETF BCP 47 conformant tag, or null if unknown or not
+   * applicable.
+   */
+  @Nullable public final String language;
 
-  /** The value for this Label. */
+  /** The value for this label. */
   public final String value;
 
   /**
-   * @param lang The lang code.
-   * @param value The value.
+   * Creates a label.
+   *
+   * @param language The language of this label, as an IETF BCP 47 conformant tag, or null if
+   *     unknown or not applicable.
+   * @param value The label value.
    */
-  public Label(@Nullable String lang, String value) {
-    this.lang = lang;
+  public Label(@Nullable String language, String value) {
+    this.language = Util.normalizeLanguageCode(language);
     this.value = value;
   }
 
-  /* package */ Label(Parcel in) {
-    lang = in.readString();
-    value = in.readString();
-  }
-
   @Override
   public boolean equals(@Nullable Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
     Label label = (Label) o;
-    return Util.areEqual(lang, label.lang) && Util.areEqual(value, label.value);
+    return Util.areEqual(language, label.language) && Util.areEqual(value, label.value);
   }
 
   @Override
   public int hashCode() {
     int result = value.hashCode();
-    result = 31 * result + (lang != null ? lang.hashCode() : 0);
+    result = 31 * result + (language != null ? language.hashCode() : 0);
     return result;
   }
 
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    dest.writeString(lang);
-    dest.writeString(value);
-  }
-
-  public static final Parcelable.Creator<Label> CREATOR =
-      new Parcelable.Creator<Label>() {
-
-        @Override
-        public Label createFromParcel(Parcel in) {
-          return new Label(in);
-        }
-
-        @Override
-        public Label[] newArray(int size) {
-          return new Label[size];
-        }
-      };
-
-  private static final String FIELD_LANG_INDEX = Util.intToStringMaxRadix(0);
+  private static final String FIELD_LANGUAGE_INDEX = Util.intToStringMaxRadix(0);
   private static final String FIELD_VALUE_INDEX = Util.intToStringMaxRadix(1);
 
-  @Override
+  /** Serializes this instance to a {@link Bundle}. */
   public Bundle toBundle() {
     Bundle bundle = new Bundle();
-    bundle.putString(FIELD_LANG_INDEX, lang);
+    if (language != null) {
+      bundle.putString(FIELD_LANGUAGE_INDEX, language);
+    }
     bundle.putString(FIELD_VALUE_INDEX, value);
     return bundle;
   }
 
-  /**
-   * Constructs an instance of {@link Label} from a {@link Bundle} produced by {@link #toBundle()}.
-   */
+  /** Deserializes an instance from a {@link Bundle} produced by {@link #toBundle()}. */
   public static Label fromBundle(Bundle bundle) {
     return new Label(
-        bundle.getString(FIELD_LANG_INDEX), checkNotNull(bundle.getString(FIELD_VALUE_INDEX)));
+        bundle.getString(FIELD_LANGUAGE_INDEX), checkNotNull(bundle.getString(FIELD_VALUE_INDEX)));
   }
 }
diff --git a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
index 40ab4fc560..1710b232ed 100644
--- a/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
+++ b/libraries/common/src/test/java/androidx/media3/common/FormatTest.java
@@ -20,10 +20,12 @@ import static androidx.media3.common.MimeTypes.VIDEO_MP4;
 import static androidx.media3.common.MimeTypes.VIDEO_WEBM;
 import static androidx.media3.test.utils.TestUtil.buildTestData;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import android.os.Bundle;
 import androidx.media3.test.utils.FakeMetadataEntry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
@@ -59,44 +61,58 @@ public final class FormatTest {
 
   @Test
   public void formatBuild_withLabelAndWithoutLabels_labelIsInLabels() {
-    Format format = createTestFormat();
-    format = format.buildUpon().setLabels(null).build();
+    Format format = new Format.Builder().setLabel("label").setLabels(ImmutableList.of()).build();
 
-    assertThat(format.labels.size()).isEqualTo(1);
-    assertThat(format.labels.get(0).value).isEqualTo(format.label);
+    assertThat(format.label).isEqualTo("label");
+    assertThat(format.labels).hasSize(1);
+    assertThat(format.labels.get(0).value).isEqualTo("label");
   }
 
   @Test
   public void formatBuild_withLabelsAndLanguageMatchingAndWithoutLabel_theLanguageMatchIsInLabel() {
-    Format format = createTestFormat();
-    format.labels.add(new Label("language", "matchingLabel"));
-    format = format.buildUpon().setLabel(null).build();
+    Format format =
+        new Format.Builder()
+            .setLabel(null)
+            .setLabels(
+                ImmutableList.of(
+                    new Label("en", "nonDefaultLabel"), new Label("zh", "matchingLabel")))
+            .setLanguage("zh")
+            .build();
 
     assertThat(format.label).isEqualTo("matchingLabel");
   }
 
   @Test
   public void formatBuild_withLabelsAndNoLanguageMatchingAndWithoutLabel_theFirstIsInLabel() {
-    Format format = createTestFormat();
-    format.labels.add(new Label("otherLanguage", "otherLabel"));
-    format = format.buildUpon().setLabel(null).build();
+    Format format =
+        new Format.Builder()
+            .setLabel(null)
+            .setLabels(
+                ImmutableList.of(new Label("fr", "firstLabel"), new Label("de", "secondLabel")))
+            .setLanguage("en")
+            .build();
 
-    assertThat(format.label).isEqualTo("label");
+    assertThat(format.label).isEqualTo("firstLabel");
   }
 
   @Test
-  public void formatBuild_withoutLabelsOrLabel_theyAreEmpty() {
+  public void formatBuild_withoutLabelsOrLabel_bothEmpty() {
     Format format = createTestFormat();
-    format = format.buildUpon().setLabel(null).setLabels(null).build();
+    format = format.buildUpon().setLabel(null).setLabels(ImmutableList.of()).build();
 
-    assertThat(format.label).isEqualTo(null);
-    assertThat(format.labels.size()).isEqualTo(0);
+    assertThat(format.label).isNull();
+    assertThat(format.labels).isEmpty();
   }
 
-  @Test(expected = IllegalStateException.class)
-  public void formatBuild_withLabelAndLabelsSetButNotMatching_throwsException() {
-    Format format = createTestFormat();
-    format.buildUpon().setLabel("otherLabel").build();
+  @Test
+  public void formatBuild_withLabelAndLabelsSetButNoMatch_throwsException() {
+    assertThrows(
+        IllegalStateException.class,
+        () ->
+            new Format.Builder()
+                .setLabel("otherLabel")
+                .setLabels(ImmutableList.of(new Label("en", "label")))
+                .build());
   }
 
   private static Format createTestFormat() {
@@ -125,12 +141,10 @@ public final class FormatTest {
             .setChromaBitdepth(11)
             .build();
 
-    List<Label> labels = new ArrayList<>();
-    labels.add(new Label("en", "label"));
     return new Format.Builder()
         .setId("id")
         .setLabel("label")
-        .setLabels(labels)
+        .setLabels(ImmutableList.of(new Label("en", "label")))
         .setLanguage("language")
         .setSelectionFlags(C.SELECTION_FLAG_DEFAULT)
         .setRoleFlags(C.ROLE_FLAG_MAIN)
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 9e011d6bae..4fa9eea43c 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
@@ -864,10 +864,11 @@ public class DashManifestParser extends DefaultHandler
       ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
     Format.Builder formatBuilder = representationInfo.format.buildUpon();
-    if (label != null) {
+    if (label != null && labels.isEmpty()) {
       formatBuilder.setLabel(label);
+    } else {
+      formatBuilder.setLabels(labels);
     }
-    formatBuilder.setLabels(labels);
     @Nullable String drmSchemeType = representationInfo.drmSchemeType;
     if (drmSchemeType == null) {
       drmSchemeType = extraDrmSchemeType;
diff --git a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
index 3d2c806882..2e6fa372b2 100644
--- a/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
+++ b/libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
@@ -281,7 +281,10 @@ public class DashManifestParserTest {
 
     assertThat(adaptationSets.get(0).representations.get(0).format.label).isEqualTo("audio label");
     assertThat(adaptationSets.get(1).representations.get(0).format.label).isEqualTo("video label");
-    assertThat(adaptationSets.get(0).representations.get(0).format.labels.size()).isEqualTo(0);
+    assertThat(adaptationSets.get(0).representations.get(0).format.labels).hasSize(1);
+    assertThat(adaptationSets.get(0).representations.get(0).format.labels.get(0).value)
+        .isEqualTo("audio label");
+    assertThat(adaptationSets.get(1).representations.get(0).format.labels).hasSize(1);
     assertThat(adaptationSets.get(1).representations.get(0).format.labels.get(0).value)
         .isEqualTo("video label");
   }
@@ -441,7 +444,7 @@ public class DashManifestParserTest {
     xpp.next();
 
     Label label = parser.parseLabel(xpp);
-    assertThat(label.lang).isEqualTo("en");
+    assertThat(label.language).isEqualTo("en");
     assertThat(label.value).isEqualTo("test label");
     assertNextTag(xpp);
   }
@@ -454,7 +457,7 @@ public class DashManifestParserTest {
     xpp.next();
 
     Label label = parser.parseLabel(xpp);
-    assertThat(label.lang).isEqualTo(null);
+    assertThat(label.language).isNull();
     assertNextTag(xpp);
   }
 
@@ -466,7 +469,8 @@ public class DashManifestParserTest {
     xpp.next();
 
     Label label = parser.parseLabel(xpp);
-    assertThat(label.value).isEqualTo("");
+    assertThat(label.value).isNotNull();
+    assertThat(label.value).isEmpty();
     assertNextTag(xpp);
   }
 
diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
index 6ef59444ac..cfb7e82525 100644
--- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
+++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
@@ -877,7 +877,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
     int roleFlags = 0;
     @Nullable String language = null;
     @Nullable String label = null;
-    @Nullable List<Label> labels = null;
+    List<Label> labels = ImmutableList.of();
     if (mediaTagFormat != null) {
       codecs = mediaTagFormat.codecs;
       metadata = mediaTagFormat.metadata;
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
index f546e67e62..59cd6af726 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java
@@ -104,7 +104,7 @@ public final class DumpableFormat implements Dumper.Dumpable {
     if (!format.labels.isEmpty()) {
       dumper.startBlock("labels");
       for (int i = 0; i < format.labels.size(); i++) {
-        String lang = format.labels.get(i).lang;
+        String lang = format.labels.get(i).language;
         if (lang != null) {
           dumper.add("lang", lang);
         }