Updated golden file tests and readded constructor

libraries/common/src/main/java/androidx/media3/common/ColorInfo.java

@@ -22,6 +22,7 @@ import androidx.media3.common.util.Util;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.Arrays;
 import org.checkerframework.dataflow.qual.Pure;
+
 // copybara:exo-only import com.google.android.exoplayer2.Bundleable;
 // copybara:exo-only import com.google.android.exoplayer2.C;
 // copybara:exo-only import com.google.android.exoplayer2.Format;
@@ -256,6 +257,24 @@ public final class ColorInfo implements Bundleable {
   // Lazily initialized hashcode.
   private int hashCode;
 
+  /**
+   * Constructs the ColorInfo.
+   *
+   * @param colorSpace The color space of the video.
+   * @param colorRange The color range of the video.
+   * @param colorTransfer The color transfer characteristics of the video.
+   * @param hdrStaticInfo HdrStaticInfo as defined in CTA-861.3, or null if none specified.
+   * @deprecated Use {@link Builder}.
+   */
+  @Deprecated
+  public ColorInfo(
+      @C.ColorSpace int colorSpace,
+      @C.ColorRange int colorRange,
+      @C.ColorTransfer int colorTransfer,
+      @Nullable byte[] hdrStaticInfo) {
+    this(colorSpace, colorRange, colorTransfer, hdrStaticInfo, Format.NO_VALUE, Format.NO_VALUE);
+  }
+
   /**
    * Constructs the ColorInfo.
    *

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

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

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

@@ -74,7 +74,8 @@ public class RtspMediaTrackTest {
                 .setHeight(544)
                 .setWidth(960)
                 .setCodecs("avc1.64001F")
-                .setColorInfo(new ColorInfo.Builder()
+                .setColorInfo(
+                    new ColorInfo.Builder()
                         .setColorRange(1)
                         .setLumaBitdepth(8)
                         .setChromaBitdepth(8)

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

@@ -18,10 +18,8 @@ track 0:
     height = 120
     pixelWidthHeightRatio = 0.5
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 120
     pixelWidthHeightRatio = 0.5
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 120
     pixelWidthHeightRatio = 0.5
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 120
     pixelWidthHeightRatio = 0.5
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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_18byte_nclx_colr.mp4.0.dump

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 1
       colorRange = 2
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

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

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 1
       colorRange = 2
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

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

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 1
       colorRange = 2
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

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

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 1
       colorRange = 2
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

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

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 1
       colorRange = 2
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
     initializationData:
       data = length 29, hash 4746B5D9

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

@@ -20,6 +20,8 @@ track 0:
     colorInfo:
       colorSpace = 2
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=major_brand, value=mp42, mdta: key=minor_version, value=0, mdta: key=compatible_brands, value=isommp42, mdta: key=com.android.capture.fps, value=240.0, mdta: key=com.android.version, value=10, mdta: key=encoder, value=Lavf58.29.100, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 22, hash 4CF81805

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

@@ -20,6 +20,8 @@ track 0:
     colorInfo:
       colorSpace = 2
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=major_brand, value=mp42, mdta: key=minor_version, value=0, mdta: key=compatible_brands, value=isommp42, mdta: key=com.android.capture.fps, value=240.0, mdta: key=com.android.version, value=10, mdta: key=encoder, value=Lavf58.29.100, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 22, hash 4CF81805

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

@@ -20,6 +20,8 @@ track 0:
     colorInfo:
       colorSpace = 2
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=major_brand, value=mp42, mdta: key=minor_version, value=0, mdta: key=compatible_brands, value=isommp42, mdta: key=com.android.capture.fps, value=240.0, mdta: key=com.android.version, value=10, mdta: key=encoder, value=Lavf58.29.100, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 22, hash 4CF81805

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

@@ -20,6 +20,8 @@ track 0:
     colorInfo:
       colorSpace = 2
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=major_brand, value=mp42, mdta: key=minor_version, value=0, mdta: key=compatible_brands, value=isommp42, mdta: key=com.android.capture.fps, value=240.0, mdta: key=com.android.version, value=10, mdta: key=encoder, value=Lavf58.29.100, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 22, hash 4CF81805

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

@@ -20,6 +20,8 @@ track 0:
     colorInfo:
       colorSpace = 2
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=major_brand, value=mp42, mdta: key=minor_version, value=0, mdta: key=compatible_brands, value=isommp42, mdta: key=com.android.capture.fps, value=240.0, mdta: key=com.android.version, value=10, mdta: key=encoder, value=Lavf58.29.100, Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
     initializationData:
       data = length 22, hash 4CF81805

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

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -15,6 +15,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -18,10 +18,8 @@ track 0:
     height = 720
     frameRate = 29.970028
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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_partially_fragmented.mp4.0.dump

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -12,6 +12,9 @@ track 0:
     codecs = avc1.64001F
     width = 1080
     height = 720
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     initializationData:
       data = length 29, hash 4746B5D9
       data = length 10, hash 7A0D0F2B

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

@@ -22,6 +22,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 7
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433

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

@@ -22,6 +22,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 7
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433

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

@@ -22,6 +22,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 7
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433

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

@@ -22,6 +22,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 7
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433

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

@@ -22,6 +22,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 7
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[mdta: key=com.apple.quicktime.location.accuracy.horizontal, value=3.754789, mdta: key=com.apple.quicktime.location.ISO6709, value=+37.7450-122.4301+066.374/, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone 12 Pro Max, mdta: key=com.apple.quicktime.software, value=14.5.1, mdta: key=com.apple.quicktime.creationdate, value=2021-05-25T09:21:51-0700, Mp4Timestamp: creation time=3704804511, modification time=3704804511, timescale=600]
     initializationData:
       data = length 526, hash 7B3FC433

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

@@ -21,6 +21,8 @@ track 0:
       colorRange = 2
       colorTransfer = 6
       hdrStaticInfo = length 25, hash 423AFC35
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
   sample 0:
     time = 0

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

@@ -21,6 +21,8 @@ track 0:
       colorRange = 2
       colorTransfer = 6
       hdrStaticInfo = length 25, hash 423AFC35
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
   sample 0:
     time = 0

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

@@ -21,6 +21,8 @@ track 0:
       colorRange = 2
       colorTransfer = 6
       hdrStaticInfo = length 25, hash 423AFC35
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
   sample 0:
     time = 0

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

@@ -21,6 +21,8 @@ track 0:
       colorRange = 2
       colorTransfer = 6
       hdrStaticInfo = length 25, hash 423AFC35
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
   sample 0:
     time = 0

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

@@ -21,6 +21,8 @@ track 0:
       colorRange = 2
       colorTransfer = 6
       hdrStaticInfo = length 25, hash 423AFC35
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000]
   sample 0:
     time = 0

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump

@@ -21,6 +21,8 @@ track 0:
     colorInfo:
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.apple.quicktime.live-photo.auto, value=01, mdta: key=com.apple.quicktime.content.identifier, value=A873E9D3-2FBA-440A-B4D1-AEB073BC8E54, mdta: key=com.apple.quicktime.live-photo.vitality-score, value=0.9398496, mdta: key=com.apple.quicktime.live-photo.vitality-scoring-version, value=0000000000000004, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone SE (3rd generation), mdta: key=com.apple.quicktime.software, value=16.5.1, mdta: key=com.apple.quicktime.creationdate, value=2023-07-05T13:13:32+0800, Mp4Timestamp: creation time=3771378882, modification time=3771378882, timescale=600]
     initializationData:
       data = length 78, hash C57F938D

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump

@@ -21,6 +21,8 @@ track 0:
     colorInfo:
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.apple.quicktime.live-photo.auto, value=01, mdta: key=com.apple.quicktime.content.identifier, value=A873E9D3-2FBA-440A-B4D1-AEB073BC8E54, mdta: key=com.apple.quicktime.live-photo.vitality-score, value=0.9398496, mdta: key=com.apple.quicktime.live-photo.vitality-scoring-version, value=0000000000000004, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone SE (3rd generation), mdta: key=com.apple.quicktime.software, value=16.5.1, mdta: key=com.apple.quicktime.creationdate, value=2023-07-05T13:13:32+0800, Mp4Timestamp: creation time=3771378882, modification time=3771378882, timescale=600]
     initializationData:
       data = length 78, hash C57F938D

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump

@@ -21,6 +21,8 @@ track 0:
     colorInfo:
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.apple.quicktime.live-photo.auto, value=01, mdta: key=com.apple.quicktime.content.identifier, value=A873E9D3-2FBA-440A-B4D1-AEB073BC8E54, mdta: key=com.apple.quicktime.live-photo.vitality-score, value=0.9398496, mdta: key=com.apple.quicktime.live-photo.vitality-scoring-version, value=0000000000000004, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone SE (3rd generation), mdta: key=com.apple.quicktime.software, value=16.5.1, mdta: key=com.apple.quicktime.creationdate, value=2023-07-05T13:13:32+0800, Mp4Timestamp: creation time=3771378882, modification time=3771378882, timescale=600]
     initializationData:
       data = length 78, hash C57F938D

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump

@@ -21,6 +21,8 @@ track 0:
     colorInfo:
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.apple.quicktime.live-photo.auto, value=01, mdta: key=com.apple.quicktime.content.identifier, value=A873E9D3-2FBA-440A-B4D1-AEB073BC8E54, mdta: key=com.apple.quicktime.live-photo.vitality-score, value=0.9398496, mdta: key=com.apple.quicktime.live-photo.vitality-scoring-version, value=0000000000000004, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone SE (3rd generation), mdta: key=com.apple.quicktime.software, value=16.5.1, mdta: key=com.apple.quicktime.creationdate, value=2023-07-05T13:13:32+0800, Mp4Timestamp: creation time=3771378882, modification time=3771378882, timescale=600]
     initializationData:
       data = length 78, hash C57F938D

libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump

@@ -21,6 +21,8 @@ track 0:
     colorInfo:
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.apple.quicktime.live-photo.auto, value=01, mdta: key=com.apple.quicktime.content.identifier, value=A873E9D3-2FBA-440A-B4D1-AEB073BC8E54, mdta: key=com.apple.quicktime.live-photo.vitality-score, value=0.9398496, mdta: key=com.apple.quicktime.live-photo.vitality-scoring-version, value=0000000000000004, mdta: key=com.apple.quicktime.make, value=Apple, mdta: key=com.apple.quicktime.model, value=iPhone SE (3rd generation), mdta: key=com.apple.quicktime.software, value=16.5.1, mdta: key=com.apple.quicktime.creationdate, value=2023-07-05T13:13:32+0800, Mp4Timestamp: creation time=3771378882, modification time=3771378882, timescale=600]
     initializationData:
       data = length 78, hash C57F938D

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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -13,10 +13,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -13,10 +13,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -13,10 +13,8 @@ track 256:
     width = 640
     height = 426
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -16,10 +16,9 @@ track 256:
     width = 854
     height = 480
     colorInfo:
-      colorSpace = -1
       colorRange = 2
-      colorTransfer = -1
+      lumaBitdepth = 8
-      hdrStaticInfo = length 0, hash 0
+      chromaBitdepth = 8
     initializationData:
       data = length 83, hash 7F428
   sample 0:

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

@@ -16,10 +16,9 @@ track 256:
     width = 854
     height = 480
     colorInfo:
-      colorSpace = -1
       colorRange = 2
-      colorTransfer = -1
+      lumaBitdepth = 8
-      hdrStaticInfo = length 0, hash 0
+      chromaBitdepth = 8
     initializationData:
       data = length 83, hash 7F428
   sample 0:

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

@@ -16,10 +16,9 @@ track 256:
     width = 854
     height = 480
     colorInfo:
-      colorSpace = -1
       colorRange = 2
-      colorTransfer = -1
+      lumaBitdepth = 8
-      hdrStaticInfo = length 0, hash 0
+      chromaBitdepth = 8
     initializationData:
       data = length 83, hash 7F428
   sample 0:

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

@@ -16,10 +16,9 @@ track 256:
     width = 854
     height = 480
     colorInfo:
-      colorSpace = -1
       colorRange = 2
-      colorTransfer = -1
+      lumaBitdepth = 8
-      hdrStaticInfo = length 0, hash 0
+      chromaBitdepth = 8
     initializationData:
       data = length 83, hash 7F428
   sample 0:

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

@@ -13,10 +13,9 @@ track 256:
     width = 854
     height = 480
     colorInfo:
-      colorSpace = -1
       colorRange = 2
-      colorTransfer = -1
+      lumaBitdepth = 8
-      hdrStaticInfo = length 0, hash 0
+      chromaBitdepth = 8
     initializationData:
       data = length 83, hash 7F428
   sample 0:

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

@@ -17,10 +17,8 @@ track 256:
     height = 686
     pixelWidthHeightRatio = 1.0003651
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -17,10 +17,8 @@ track 256:
     height = 686
     pixelWidthHeightRatio = 1.0003651
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -17,10 +17,8 @@ track 256:
     height = 686
     pixelWidthHeightRatio = 1.0003651
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -17,10 +17,8 @@ track 256:
     height = 686
     pixelWidthHeightRatio = 1.0003651
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      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

@@ -14,10 +14,8 @@ track 256:
     height = 686
     pixelWidthHeightRatio = 1.0003651
     colorInfo:
-      colorSpace = -1
+      lumaBitdepth = 8
-      colorRange = -1
+      chromaBitdepth = 8
-      colorTransfer = -1
-      hdrStaticInfo = length 0, hash 0
     initializationData:
       data = length 146, hash 61554FEF
   sample 0:

libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump

@@ -69,6 +69,8 @@ track 2:
       colorSpace = 2
       colorRange = 1
       colorTransfer = 3
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 85, hash 6F3CAA16

libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 6
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 99, hash 99842E5A

libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump

@@ -19,6 +19,8 @@ track 0:
     rotationDegrees = 180
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump

@@ -19,6 +19,8 @@ track 0:
     rotationDegrees = 270
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump

@@ -19,6 +19,8 @@ track 0:
     rotationDegrees = 90
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump

@@ -19,6 +19,8 @@ track 0:
     frameRate = 20000.0
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510
@@ -44,6 +46,8 @@ track 1:
     frameRate = 10000.0
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=SomeStringKey, value=10.0, Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=com.android.capture.fps, value=120.0, Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[xyz: latitude=33.0, longitude=-120.0, Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump

@@ -19,6 +19,8 @@ track 0:
     frameRate = 20000.0
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510
@@ -44,6 +46,8 @@ track 1:
     frameRate = 10000.0
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump

@@ -18,6 +18,8 @@ track 0:
     height = 10
     colorInfo:
       colorRange = 1
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[mdta: key=SomeStringKey, value=Some Random String, Mp4Timestamp: creation time=2082849800, modification time=2082849800, timescale=10000]
     initializationData:
       data = length 28, hash 410B510

libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump

@@ -21,6 +21,8 @@ track 0:
       colorSpace = 6
       colorRange = 2
       colorTransfer = 6
+      lumaBitdepth = 10
+      chromaBitdepth = 10
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 99, hash 99842E5A

libraries/test_data/src/test/assets/muxerdumps/sample.mp4.dump

@@ -17,6 +17,9 @@ track 0:
     width = 1080
     height = 720
     frameRate = 32.113037
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
     initializationData:
       data = length 29, hash 4746B5D9

libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump

@@ -16,6 +16,9 @@ track 0:
     width = 1080
     height = 720
     frameRate = 31.004547
+    colorInfo:
+      lumaBitdepth = 8
+      chromaBitdepth = 8
     metadata = entries=[Mp4Timestamp: creation time=2083344800, modification time=2083344800, timescale=10000]
   sample 0:
     time = 0

libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump

@@ -18,6 +18,8 @@ format video:
     colorSpace = 1
     colorRange = 2
     colorTransfer = 3
+    lumaBitdepth = 8
+    chromaBitdepth = 8
   metadata = entries=[Mp4Timestamp: creation time=3718109610, modification time=3718109610, timescale=1000]
   initializationData:
     data = length 29, hash 4746B5D9

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

@@ -7,10 +7,8 @@ format video:
   height = 720
   frameRate = 29.970028
   colorInfo:
-    colorSpace = -1
+    lumaBitdepth = 8
-    colorRange = -1
+    chromaBitdepth = 8
-    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

@@ -19,10 +19,8 @@ format video:
   height = 720
   frameRate = 29.970028
   colorInfo:
-    colorSpace = -1
+    lumaBitdepth = 8
-    colorRange = -1
+    chromaBitdepth = 8
-    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

@@ -19,10 +19,8 @@ format video:
   height = 720
   frameRate = 29.970028
   colorInfo:
-    colorSpace = -1
+    lumaBitdepth = 8
-    colorRange = -1
+    chromaBitdepth = 8
-    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