Removing id from Label and ensuring label/labels consistency in Format.Builder.

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. */
-   * The human readable label, or null if unknown or not applicable.
+  @Nullable public final String label;
-   *
-   * @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;
@@ -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() {

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) {
+  public Label(@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();
   }
@@ -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)
+    return Util.areEqual(lang, label.lang)
-        && 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);
   }

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")

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)
+                  .setLabel(subtitleConfigurations.get(i).label)
-                  .setLabels(labels)
                   .setId(subtitleConfigurations.get(i).id)
                   .build();
           ExtractorsFactory extractorsFactory =

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)
+            .setLabel(subtitleConfiguration.label)
-            .setLabels(labels)
             .setId(subtitleConfiguration.id != null ? subtitleConfiguration.id : trackId)
             .build();
     this.dataSpec =

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);
+        labels.add(parseLabel(xpp));
-        label = parsedLabel.value;
-        labels.add(parsedLabel);
       } 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);
   }
 
   /**

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);
   }
 

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))

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)
+              .setLabel((String) getNormalizedAttribute(KEY_NAME))
-              .setLabels(labels)
               .setSampleMimeType(sampleMimeType)
               .setAverageBitrate(parseRequiredInt(parser, KEY_BITRATE))
               .setLanguage((String) getNormalizedAttribute(KEY_LANGUAGE))

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(streamName.name);
-      builder.setLabel(label);
-
-      List<Label> labels = new ArrayList<>();
-      labels.add(new Label(null, null, label));
-      builder.setLabels(labels);
     }
     int trackType = MimeTypes.getTrackType(streamFormat.sampleMimeType);
     if (trackType == C.TRACK_TYPE_AUDIO || trackType == C.TRACK_TYPE_VIDEO) {

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 =

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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);
         }

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,20 +107,8 @@ 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;
-  }
 
   private String buildLanguageString(Format format) {
     @Nullable String language = format.language;