Updated golden file tests and removed deprecated ColorInfo constructor usage

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java

@@ -430,7 +430,7 @@ public final class MediaCodecInfoTest {
   }
 
   private static ColorInfo buildColorInfo(@C.ColorSpace int colorSpace) {
-    return new ColorInfo(
+    return new ColorInfo.Builder().setColorSpace(
-        colorSpace, C.COLOR_RANGE_FULL, C.COLOR_TRANSFER_HLG, /* hdrStaticInfo= */ null);
+        colorSpace).setColorRange(C.COLOR_RANGE_FULL).setColorTransfer(C.COLOR_TRANSFER_HLG).build();
   }
 }

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtilTest.java

@@ -90,11 +90,12 @@ public final class MediaCodecUtilTest {
   @Test
   public void getCodecProfileAndLevel_handlesAv1ProfileMain10HDRWithHdrInfoSet() {
     ColorInfo colorInfo =
-        new ColorInfo(
+        new ColorInfo.Builder()
-            /* colorSpace= */ C.COLOR_SPACE_BT709,
+            .setColorSpace(C.COLOR_SPACE_BT709)
-            /* colorRange= */ C.COLOR_RANGE_LIMITED,
+            .setColorRange(C.COLOR_RANGE_LIMITED)
-            /* colorTransfer= */ C.COLOR_TRANSFER_SDR,
+            .setColorTransfer(C.COLOR_TRANSFER_SDR)
-            /* hdrStaticInfo= */ new byte[] {1, 2, 3, 4, 5, 6, 7});
+            .setHdrStaticInfo(new byte[] {1, 2, 3, 4, 5, 6, 7})
+            .build();
     Format format =
         new Format.Builder()
             .setSampleMimeType(MimeTypes.VIDEO_AV1)
@@ -110,11 +111,11 @@ public final class MediaCodecUtilTest {
   @Test
   public void getCodecProfileAndLevel_handlesAv1ProfileMain10HDRWithoutHdrInfoSet() {
     ColorInfo colorInfo =
-        new ColorInfo(
+        new ColorInfo.Builder()
-            /* colorSpace= */ C.COLOR_SPACE_BT709,
+            .setColorSpace(C.COLOR_SPACE_BT709)
-            /* colorRange= */ C.COLOR_RANGE_LIMITED,
+            .setColorRange(C.COLOR_RANGE_LIMITED)
-            /* colorTransfer= */ C.COLOR_TRANSFER_HLG,
+            .setColorTransfer(C.COLOR_TRANSFER_HLG)
-            /* hdrStaticInfo= */ null);
+            .build();
     Format format =
         new Format.Builder()
             .setSampleMimeType(MimeTypes.VIDEO_AV1)

libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java

@@ -26,6 +26,7 @@ import static org.junit.Assert.assertThrows;
 
 import android.net.Uri;
 import androidx.media3.common.C;
+import androidx.media3.common.ColorInfo;
 import androidx.media3.common.Format;
 import androidx.media3.common.MimeTypes;
 import androidx.media3.extractor.AacUtil;
@@ -73,6 +74,11 @@ public class RtspMediaTrackTest {
                 .setHeight(544)
                 .setWidth(960)
                 .setCodecs("avc1.64001F")
+                .setColorInfo(new ColorInfo.Builder()
+                    .setColorRange(1)
+                    .setLumaBitdepth(8)
+                    .setChromaBitdepth(8)
+                    .build())
                 .setInitializationData(
                     ImmutableList.of(
                         new byte[] {
@@ -246,6 +252,12 @@ public class RtspMediaTrackTest {
                 .setHeight(544)
                 .setWidth(960)
                 .setCodecs("avc1.64001F")
+                .setColorInfo(
+                    new ColorInfo.Builder()
+                        .setColorRange(1)
+                        .setChromaBitdepth(8)
+                        .setLumaBitdepth(8)
+                        .build())
                 .setInitializationData(
                     ImmutableList.of(
                         new byte[] {

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump

@@ -17,6 +17,11 @@ track 0:
     width = 180
     height = 120
     pixelWidthHeightRatio = 0.5
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 32, hash 1F3D6E87

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump

@@ -17,6 +17,11 @@ track 0:
     width = 180
     height = 120
     pixelWidthHeightRatio = 0.5
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 32, hash 1F3D6E87

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump

@@ -17,6 +17,11 @@ track 0:
     width = 180
     height = 120
     pixelWidthHeightRatio = 0.5
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 32, hash 1F3D6E87

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump

@@ -17,6 +17,11 @@ track 0:
     width = 180
     height = 120
     pixelWidthHeightRatio = 0.5
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 32, hash 1F3D6E87

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 29.970028
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump

@@ -12,6 +12,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump

@@ -12,6 +12,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump

@@ -12,6 +12,11 @@ track 256:
     codecs = avc1.64001E
     width = 640
     height = 426
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 29, hash 4C2CAE9C
       data = length 9, hash D971CD89

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = hvc1.1.6.L90.90
     width = 854
     height = 480
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 83, hash 7F428
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = hvc1.1.6.L90.90
     width = 854
     height = 480
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 83, hash 7F428
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = hvc1.1.6.L90.90
     width = 854
     height = 480
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 83, hash 7F428
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump

@@ -15,6 +15,11 @@ track 256:
     codecs = hvc1.1.6.L90.90
     width = 854
     height = 480
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 83, hash 7F428
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump

@@ -12,6 +12,11 @@ track 256:
     codecs = hvc1.1.6.L90.90
     width = 854
     height = 480
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 83, hash 7F428
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump

@@ -16,6 +16,11 @@ track 256:
     width = 914
     height = 686
     pixelWidthHeightRatio = 1.0003651
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump

@@ -16,6 +16,11 @@ track 256:
     width = 914
     height = 686
     pixelWidthHeightRatio = 1.0003651
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump

@@ -16,6 +16,11 @@ track 256:
     width = 914
     height = 686
     pixelWidthHeightRatio = 1.0003651
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump

@@ -16,6 +16,11 @@ track 256:
     width = 914
     height = 686
     pixelWidthHeightRatio = 1.0003651
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump

@@ -13,6 +13,11 @@ track 256:
     width = 914
     height = 686
     pixelWidthHeightRatio = 1.0003651
+    colorInfo:
+      colorSpace = -1
+      colorRange = -1
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump

@@ -6,6 +6,11 @@ format video:
   width = 1080
   height = 720
   frameRate = 29.970028
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump

@@ -18,6 +18,11 @@ format video:
   width = 1080
   height = 720
   frameRate = 29.970028
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump

@@ -18,6 +18,11 @@ format video:
   width = 1080
   height = 720
   frameRate = 29.970028
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump

@@ -19,6 +19,11 @@ format video:
   height = 720
   frameRate = 29.970028
   rotationDegrees = 90
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump

@@ -12,6 +12,11 @@ format video:
   width = 1080
   height = 720
   frameRate = 29.970028
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump

@@ -12,6 +12,11 @@ format video:
   width = 1080
   height = 720
   frameRate = 29.970028
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 32.113037
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[mdta: key=com.android.capture.fps, value=60.0, xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 32.113037
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=2000000000, modification time=2000000000, timescale=10000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 32.113037
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[mdta: key=StringKey, value=StringValue, mdta: key=FloatKey, value=600.0, xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump

@@ -17,6 +17,11 @@ track 0:
     width = 1080
     height = 720
     frameRate = 32.113037
+    colorInfo:
+      colorSpace = -1
+      colorRange = 2
+      colorTransfer = -1
+      hdrStaticInfo = length 0, hash 0
     metadata = entries=[xyz: latitude=45.0, longitude=-90.0, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump

@@ -6,6 +6,11 @@ format video:
   width = 320
   height = 240
   frameRate = 29.523811
+  colorInfo:
+    colorSpace = -1
+    colorRange = -1
+    colorTransfer = -1
+    hdrStaticInfo = length 0, hash 0
   metadata = entries=[mdta: key=com.android.version, value=10, mdta: key=com.android.video.temporal_layers_count, value=4, mdta: key=com.android.capture.fps, value=240.0, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8], smta: captureFrameRate=240.0, svcTemporalLayerCount=4, Mp4Timestamp: creation time=3686904890, modification time=3686904890, timescale=1000]
   initializationData:
     data = length 33, hash D3FB879D