Format: Add Builder

Package private for now. It will be made visible in a child CL.

Issue: #2863
PiperOrigin-RevId: 296255558

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

@@ -23,13 +23,13 @@ import static com.google.common.truth.Truth.assertThat;
 import android.os.Parcel;
 import android.os.Parcel;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
 import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.video.ColorInfo;
 import com.google.android.exoplayer2.video.ColorInfo;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import org.junit.Test;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.RunWith;
@@ -38,32 +38,59 @@ import org.junit.runner.RunWith;
 @RunWith(AndroidJUnit4.class)
 @RunWith(AndroidJUnit4.class)
 public final class FormatTest {
 public final class FormatTest {
 
 
-  private static final List<byte[]> initData;
-  static {
-    byte[] initData1 = new byte[] {1, 2, 3};
-    byte[] initData2 = new byte[] {4, 5, 6};
-    List<byte[]> initDataList = new ArrayList<>();
-    initDataList.add(initData1);
-    initDataList.add(initData2);
-    initData = Collections.unmodifiableList(initDataList);
+  @Test
+  public void buildUponFormat_createsEqualFormat() {
+    Format testFormat = createTestFormat();
+    assertThat(testFormat.buildUpon().build()).isEqualTo(testFormat);
   }
   }
 
 
   @Test
   @Test
-  public void testParcelable() {
-    DrmInitData.SchemeData drmData1 = new DrmInitData.SchemeData(WIDEVINE_UUID, VIDEO_MP4,
-        TestUtil.buildTestData(128, 1 /* data seed */));
-    DrmInitData.SchemeData drmData2 = new DrmInitData.SchemeData(C.UUID_NIL, VIDEO_WEBM,
-        TestUtil.buildTestData(128, 1 /* data seed */));
+  public void parcelFormat_createsEqualFormat_exceptExoMediaCryptoType() {
+    Format formatToParcel = createTestFormat();
+
+    Parcel parcel = Parcel.obtain();
+    formatToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    Format formatFromParcel = Format.CREATOR.createFromParcel(parcel);
+    Format expectedFormat = formatToParcel.buildUpon().setExoMediaCryptoType(null).build();
+
+    assertThat(formatFromParcel.exoMediaCryptoType).isNull();
+    assertThat(formatFromParcel).isEqualTo(expectedFormat);
+
+    parcel.recycle();
+  }
+
+  private static Format createTestFormat() {
+    byte[] initData1 = new byte[] {1, 2, 3};
+    byte[] initData2 = new byte[] {4, 5, 6};
+    List<byte[]> initializationData = new ArrayList<>();
+    initializationData.add(initData1);
+    initializationData.add(initData2);
+
+    DrmInitData.SchemeData drmData1 =
+        new DrmInitData.SchemeData(
+            WIDEVINE_UUID, VIDEO_MP4, TestUtil.buildTestData(128, 1 /* data seed */));
+    DrmInitData.SchemeData drmData2 =
+        new DrmInitData.SchemeData(
+            C.UUID_NIL, VIDEO_WEBM, TestUtil.buildTestData(128, 1 /* data seed */));
     DrmInitData drmInitData = new DrmInitData(drmData1, drmData2);
     DrmInitData drmInitData = new DrmInitData(drmData1, drmData2);
+
     byte[] projectionData = new byte[] {1, 2, 3};
     byte[] projectionData = new byte[] {1, 2, 3};
-    Metadata metadata = new Metadata(
+
+    Metadata metadata =
+        new Metadata(
             new TextInformationFrame("id1", "description1", "value1"),
             new TextInformationFrame("id1", "description1", "value1"),
             new TextInformationFrame("id2", "description2", "value2"));
             new TextInformationFrame("id2", "description2", "value2"));
-    ColorInfo colorInfo =  new ColorInfo(C.COLOR_SPACE_BT709,
-        C.COLOR_RANGE_LIMITED, C.COLOR_TRANSFER_SDR, new byte[] {1, 2, 3, 4, 5, 6, 7});
 
 
-    Format formatToParcel =
-        new Format(
+    ColorInfo colorInfo =
+        new ColorInfo(
+            C.COLOR_SPACE_BT709,
+            C.COLOR_RANGE_LIMITED,
+            C.COLOR_TRANSFER_SDR,
+            new byte[] {1, 2, 3, 4, 5, 6, 7});
+
+    return new Format(
         "id",
         "id",
         "label",
         "label",
         "language",
         "language",
@@ -75,15 +102,15 @@ public final class FormatTest {
         metadata,
         metadata,
         /* containerMimeType= */ MimeTypes.VIDEO_MP4,
         /* containerMimeType= */ MimeTypes.VIDEO_MP4,
         /* sampleMimeType= */ MimeTypes.VIDEO_H264,
         /* sampleMimeType= */ MimeTypes.VIDEO_H264,
-            /* maxInputSize= */ 2048,
-            initData,
+        /* maxInputSize= */ 5000,
+        initializationData,
         drmInitData,
         drmInitData,
         Format.OFFSET_SAMPLE_RELATIVE,
         Format.OFFSET_SAMPLE_RELATIVE,
         /* width= */ 1920,
         /* width= */ 1920,
         /* height= */ 1080,
         /* height= */ 1080,
         /* frameRate= */ 24,
         /* frameRate= */ 24,
         /* rotationDegrees= */ 90,
         /* rotationDegrees= */ 90,
-            /* pixelWidthHeightRatio= */ 2,
+        /* pixelWidthHeightRatio= */ 4,
         projectionData,
         projectionData,
         C.STEREO_MODE_TOP_BOTTOM,
         C.STEREO_MODE_TOP_BOTTOM,
         colorInfo,
         colorInfo,
@@ -92,17 +119,7 @@ public final class FormatTest {
         C.ENCODING_PCM_24BIT,
         C.ENCODING_PCM_24BIT,
         /* encoderDelay= */ 1001,
         /* encoderDelay= */ 1001,
         /* encoderPadding= */ 1002,
         /* encoderPadding= */ 1002,
-            /* accessibilityChannel= */ Format.NO_VALUE,
-            /* exoMediaCryptoType= */ null);
-
-    Parcel parcel = Parcel.obtain();
-    formatToParcel.writeToParcel(parcel, 0);
-    parcel.setDataPosition(0);
-
-    Format formatFromParcel = Format.CREATOR.createFromParcel(parcel);
-    assertThat(formatFromParcel).isEqualTo(formatToParcel);
-
-    parcel.recycle();
+        /* accessibilityChannel= */ 2,
+        /* exoMediaCryptoType= */ ExoMediaCrypto.class);
   }
   }
-
 }
 }