Make MediaItem.SubtitleConfiguration bundleable

PiperOrigin-RevId: 534390168
(cherry picked from commit 3ac41de751e27e28bc383cc2aa0667d9332322b3)

library/common/src/main/java/com/google/android/exoplayer2/MediaItem.java

@@ -862,7 +862,7 @@ public final class MediaItem implements Bundleable {
       return result;
       return result;
     }
     }
 
 
-    // Bundleable implementation
+    // Bundleable implementation.
 
 
     private static final String FIELD_SCHEME = Util.intToStringMaxRadix(0);
     private static final String FIELD_SCHEME = Util.intToStringMaxRadix(0);
     private static final String FIELD_LICENSE_URI = Util.intToStringMaxRadix(1);
     private static final String FIELD_LICENSE_URI = Util.intToStringMaxRadix(1);
@@ -1385,7 +1385,7 @@ public final class MediaItem implements Bundleable {
 
 
   /** Properties for a text track. */
   /** Properties for a text track. */
   // TODO: Mark this final when Subtitle is deleted.
   // TODO: Mark this final when Subtitle is deleted.
-  public static class SubtitleConfiguration {
+  public static class SubtitleConfiguration implements Bundleable {
 
 
     /** Builder for {@link SubtitleConfiguration} instances. */
     /** Builder for {@link SubtitleConfiguration} instances. */
     public static final class Builder {
     public static final class Builder {
@@ -1556,6 +1556,64 @@ public final class MediaItem implements Bundleable {
       result = 31 * result + (id == null ? 0 : id.hashCode());
       result = 31 * result + (id == null ? 0 : id.hashCode());
       return result;
       return result;
     }
     }
+
+    // Bundleable implementation.
+
+    private static final String FIELD_URI = Util.intToStringMaxRadix(0);
+    private static final String FIELD_MIME_TYPE = 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_LABEL = Util.intToStringMaxRadix(5);
+    private static final String FIELD_ID = Util.intToStringMaxRadix(6);
+
+    /** Object that can restore {@link SubtitleConfiguration} from a {@link Bundle}. */
+    public static final Creator<SubtitleConfiguration> CREATOR = SubtitleConfiguration::fromBundle;
+
+    private static SubtitleConfiguration fromBundle(Bundle bundle) {
+      Uri uri = checkNotNull(bundle.getParcelable(FIELD_URI));
+      @Nullable String mimeType = bundle.getString(FIELD_MIME_TYPE);
+      @Nullable String language = bundle.getString(FIELD_LANGUAGE);
+      @C.SelectionFlags int selectionFlags = bundle.getInt(FIELD_SELECTION_FLAGS, 0);
+      @C.RoleFlags int roleFlags = bundle.getInt(FIELD_ROLE_FLAGS, 0);
+      @Nullable String label = bundle.getString(FIELD_LABEL);
+      @Nullable String id = bundle.getString(FIELD_ID);
+
+      SubtitleConfiguration.Builder builder = new SubtitleConfiguration.Builder(uri);
+      return builder
+          .setMimeType(mimeType)
+          .setLanguage(language)
+          .setSelectionFlags(selectionFlags)
+          .setRoleFlags(roleFlags)
+          .setLabel(label)
+          .setId(id)
+          .build();
+    }
+
+    @Override
+    public Bundle toBundle() {
+      Bundle bundle = new Bundle();
+      bundle.putParcelable(FIELD_URI, uri);
+      if (mimeType != null) {
+        bundle.putString(FIELD_MIME_TYPE, mimeType);
+      }
+      if (language != null) {
+        bundle.putString(FIELD_LANGUAGE, language);
+      }
+      if (selectionFlags != 0) {
+        bundle.putInt(FIELD_SELECTION_FLAGS, selectionFlags);
+      }
+      if (roleFlags != 0) {
+        bundle.putInt(FIELD_ROLE_FLAGS, roleFlags);
+      }
+      if (label != null) {
+        bundle.putString(FIELD_LABEL, label);
+      }
+      if (id != null) {
+        bundle.putString(FIELD_ID, id);
+      }
+      return bundle;
+    }
   }
   }
 
 
   /**
   /**

library/common/src/test/java/com/google/android/exoplayer2/MediaItemTest.java

@@ -341,6 +341,42 @@ public class MediaItemTest {
   }
   }
 
 
   @Test
   @Test
+  public void
+      createDefaultSubtitleConfigurationInstance_toBundleSkipsDefaultValues_fromBundleRestoresThem() {
+    MediaItem.SubtitleConfiguration subtitleConfiguration =
+        new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/en")).build();
+
+    Bundle subtitleConfigurationBundle = subtitleConfiguration.toBundle();
+
+    // Check that default values are skipped when bundling, only Uri field (="0") is present
+    assertThat(subtitleConfigurationBundle.keySet()).containsExactly("0");
+
+    MediaItem.SubtitleConfiguration subtitleConfigurationFromBundle =
+        MediaItem.SubtitleConfiguration.CREATOR.fromBundle(subtitleConfigurationBundle);
+
+    assertThat(subtitleConfigurationFromBundle).isEqualTo(subtitleConfiguration);
+  }
+
+  @Test
+  public void createSubtitleConfigurationInstance_roundTripViaBundle_yieldsEqualInstance() {
+    // Creates instance by setting some non-default values
+    MediaItem.SubtitleConfiguration subtitleConfiguration =
+        new MediaItem.SubtitleConfiguration.Builder(Uri.parse(URI_STRING + "/en"))
+            .setMimeType(MimeTypes.APPLICATION_TTML)
+            .setLanguage("en")
+            .setSelectionFlags(C.SELECTION_FLAG_FORCED)
+            .setRoleFlags(C.ROLE_FLAG_ALTERNATE)
+            .setLabel("label")
+            .setId("id")
+            .build();
+
+    MediaItem.SubtitleConfiguration subtitleConfigurationFromBundle =
+        MediaItem.SubtitleConfiguration.CREATOR.fromBundle(subtitleConfiguration.toBundle());
+
+    assertThat(subtitleConfigurationFromBundle).isEqualTo(subtitleConfiguration);
+  }
+
+  @Test
   public void builderSetTag_isNullByDefault() {
   public void builderSetTag_isNullByDefault() {
     MediaItem mediaItem = new MediaItem.Builder().setUri(URI_STRING).build();
     MediaItem mediaItem = new MediaItem.Builder().setUri(URI_STRING).build();