From 716240776ee63fd21278e59c4efdf36d42250a8a Mon Sep 17 00:00:00 2001 From: microkatz Date: Thu, 21 Sep 2023 11:17:27 +0000 Subject: [PATCH] Updated golden file tests and readded constructor --- .../androidx/media3/common/ColorInfo.java | 19 +++++++++++++++++++ .../mediacodec/MediaCodecInfoTest.java | 7 +++++-- .../exoplayer/rtsp/RtspMediaTrackTest.java | 11 ++++++----- ...on-photo-jfif-segment-shortened.jpg.0.dump | 6 ++---- ...on-photo-jfif-segment-shortened.jpg.1.dump | 6 ++---- ...on-photo-jfif-segment-shortened.jpg.2.dump | 6 ++---- ...on-photo-jfif-segment-shortened.jpg.3.dump | 6 ++---- .../extractordumps/mp4/sample.mp4.0.dump | 6 ++---- .../extractordumps/mp4/sample.mp4.1.dump | 6 ++---- .../extractordumps/mp4/sample.mp4.2.dump | 6 ++---- .../extractordumps/mp4/sample.mp4.3.dump | 6 ++---- .../mp4/sample.mp4.unknown_length.dump | 6 ++---- .../mp4/sample_18byte_nclx_colr.mp4.0.dump | 2 ++ .../mp4/sample_18byte_nclx_colr.mp4.1.dump | 2 ++ .../mp4/sample_18byte_nclx_colr.mp4.2.dump | 2 ++ .../mp4/sample_18byte_nclx_colr.mp4.3.dump | 2 ++ ...e_18byte_nclx_colr.mp4.unknown_length.dump | 2 ++ .../mp4/sample_android_slow_motion.mp4.0.dump | 2 ++ .../mp4/sample_android_slow_motion.mp4.1.dump | 2 ++ .../mp4/sample_android_slow_motion.mp4.2.dump | 2 ++ .../mp4/sample_android_slow_motion.mp4.3.dump | 2 ++ ...ndroid_slow_motion.mp4.unknown_length.dump | 2 ++ .../mp4/sample_fragmented.mp4.0.dump | 3 +++ .../sample_fragmented.mp4.unknown_length.dump | 3 +++ ...ample_fragmented_large_bitrates.mp4.0.dump | 3 +++ ...ample_fragmented_large_bitrates.mp4.1.dump | 3 +++ ...ample_fragmented_large_bitrates.mp4.2.dump | 3 +++ ...ample_fragmented_large_bitrates.mp4.3.dump | 3 +++ ...ted_large_bitrates.mp4.unknown_length.dump | 3 +++ .../mp4/sample_fragmented_seekable.mp4.0.dump | 3 +++ .../mp4/sample_fragmented_seekable.mp4.1.dump | 3 +++ .../mp4/sample_fragmented_seekable.mp4.2.dump | 3 +++ .../mp4/sample_fragmented_seekable.mp4.3.dump | 3 +++ ...ragmented_seekable.mp4.unknown_length.dump | 3 +++ .../mp4/sample_fragmented_sei.mp4.0.dump | 3 +++ ...ple_fragmented_sei.mp4.unknown_length.dump | 3 +++ .../mp4/sample_mdat_too_long.mp4.0.dump | 6 ++---- .../mp4/sample_mdat_too_long.mp4.1.dump | 6 ++---- .../mp4/sample_mdat_too_long.mp4.2.dump | 6 ++---- .../mp4/sample_mdat_too_long.mp4.3.dump | 6 ++---- ...mple_mdat_too_long.mp4.unknown_length.dump | 6 ++---- .../sample_partially_fragmented.mp4.0.dump | 3 +++ ...rtially_fragmented.mp4.unknown_length.dump | 3 +++ .../mp4/sample_with_color_info.mp4.0.dump | 2 ++ .../mp4/sample_with_color_info.mp4.1.dump | 2 ++ .../mp4/sample_with_color_info.mp4.2.dump | 2 ++ .../mp4/sample_with_color_info.mp4.3.dump | 2 ++ ...le_with_color_info.mp4.unknown_length.dump | 2 ++ .../sample_with_colr_mdcv_and_clli.mp4.0.dump | 2 ++ .../sample_with_colr_mdcv_and_clli.mp4.1.dump | 2 ++ .../sample_with_colr_mdcv_and_clli.mp4.2.dump | 2 ++ .../sample_with_colr_mdcv_and_clli.mp4.3.dump | 2 ++ ...colr_mdcv_and_clli.mp4.unknown_length.dump | 2 ++ ...riginal_quicktime_specification.mov.0.dump | 2 ++ ...riginal_quicktime_specification.mov.1.dump | 2 ++ ...riginal_quicktime_specification.mov.2.dump | 2 ++ ...riginal_quicktime_specification.mov.3.dump | 2 ++ ...time_specification.mov.unknown_length.dump | 2 ++ .../ts/sample_h264_dts_audio.ts.0.dump | 6 ++---- ...mple_h264_dts_audio.ts.unknown_length.dump | 6 ++---- .../ts/sample_h264_mpeg_audio.ts.0.dump | 6 ++---- .../ts/sample_h264_mpeg_audio.ts.1.dump | 6 ++---- .../ts/sample_h264_mpeg_audio.ts.2.dump | 6 ++---- .../ts/sample_h264_mpeg_audio.ts.3.dump | 6 ++---- ...ple_h264_mpeg_audio.ts.unknown_length.dump | 6 ++---- ...e_h264_no_access_unit_delimiters.ts.0.dump | 6 ++---- ...e_h264_no_access_unit_delimiters.ts.1.dump | 6 ++---- ...e_h264_no_access_unit_delimiters.ts.2.dump | 6 ++---- ...e_h264_no_access_unit_delimiters.ts.3.dump | 6 ++---- ...ess_unit_delimiters.ts.unknown_length.dump | 6 ++---- .../extractordumps/ts/sample_h265.ts.0.dump | 5 ++--- .../extractordumps/ts/sample_h265.ts.1.dump | 5 ++--- .../extractordumps/ts/sample_h265.ts.2.dump | 5 ++--- .../extractordumps/ts/sample_h265.ts.3.dump | 5 ++--- .../ts/sample_h265.ts.unknown_length.dump | 5 ++--- .../ts/sample_h265_rps_pred.ts.0.dump | 6 ++---- .../ts/sample_h265_rps_pred.ts.1.dump | 6 ++---- .../ts/sample_h265_rps_pred.ts.2.dump | 6 ++---- .../ts/sample_h265_rps_pred.ts.3.dump | 6 ++---- ...ample_h265_rps_pred.ts.unknown_length.dump | 6 ++---- .../h265_with_metadata_track.mp4.dump | 2 ++ .../assets/muxerdumps/hdr10-720p.mp4.dump | 2 ++ .../mp4_with_0_orientation.mp4.dump | 2 ++ .../mp4_with_180_orientation.mp4.dump | 2 ++ .../mp4_with_270_orientation.mp4.dump | 2 ++ .../mp4_with_90_orientation.mp4.dump | 2 ++ .../mp4_with_different_tracks_offset.mp4.dump | 4 ++++ .../mp4_with_float_metadata.mp4.dump | 2 ++ .../muxerdumps/mp4_with_frame_rate.mp4.dump | 2 ++ .../muxerdumps/mp4_with_location.mp4.dump | 2 ++ .../mp4_with_null_location.mp4.dump | 2 ++ .../mp4_with_same_tracks_offset.mp4.dump | 4 ++++ .../mp4_with_string_metadata.mp4.dump | 2 ++ .../muxerdumps/partial_hdr10-720p.mp4.dump | 2 ++ .../test/assets/muxerdumps/sample.mp4.dump | 3 +++ .../assets/muxerdumps/sample_av1.mp4.dump | 3 +++ ...mixedWith_sample_18byte_nclx_colr.mp4.dump | 2 ++ .../mp4/sample.mp4/noaudio.dump | 6 ++---- .../mp4/sample.mp4/original.dump | 6 ++---- .../original_original_transmux.dump | 6 ++---- .../mp4/sample.mp4/rotated.dump | 6 ++---- .../mp4/sample.mp4/silence.dump | 6 ++---- .../mp4/sample.mp4/silence_48000hz.dump | 6 ++---- .../mp4/sample.mp4/with_capture_fps.dump | 5 ++--- .../mp4/sample.mp4/with_creation_time.dump | 5 ++--- .../mp4/sample.mp4/with_custom_metadata.dump | 5 ++--- .../sample.mp4/with_location_metadata.dump | 5 ++--- .../looping_mixedWith_test.mp3.dump | 2 ++ .../sample_18byte_nclx_colr.mp4/original.dump | 2 ++ .../sample_18byte_nclx_colr.mp4/silence.dump | 2 ++ .../sample_sef_slow_motion.mp4/noaudio.dump | 6 ++---- .../mp4/sample_twos_pcm.mp4/original.dump | 3 +++ .../mp4/sample_twos_pcm.mp4/silence.dump | 3 +++ .../clipped.dump | 2 ++ .../clipped_clipped_transmux.dump | 2 ++ .../highPitch_silenceHighPitch.dump | 2 ++ .../mixed_sample_rf64.wav.dump | 2 ++ .../mp4/sowt-with-video.mov/original.dump | 2 ++ .../sowt-with-video.mov/original_silence.dump | 2 ++ .../sequence_repeated3Times.dump | 2 ++ ...mixed_loopingAudiosowt-with-video.mov.dump | 2 ++ .../mp4/sowt-with-video.mov/silence.dump | 2 ++ .../silenceHighPitch_highPitch.dump | 2 ++ .../silenceHighPitch_silence.dump | 2 ++ .../silenceHighPitch_silenceHighPitch.dump | 2 ++ .../sowt-with-video.mov/silence_original.dump | 2 ++ .../sowt-with-video.mov/silence_silence.dump | 2 ++ .../silence_silenceHighPitch.dump | 2 ++ .../media3/test/utils/DumpableFormat.java | 2 ++ 129 files changed, 306 insertions(+), 186 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java b/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java index fa4d98613e..0640ca1663 100644 --- a/libraries/common/src/main/java/androidx/media3/common/ColorInfo.java +++ b/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. * diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java index 63c5d83757..4dbc3f1090 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfoTest.java +++ b/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( - colorSpace).setColorRange(C.COLOR_RANGE_FULL).setColorTransfer(C.COLOR_TRANSFER_HLG).build(); + return new ColorInfo.Builder() + .setColorSpace(colorSpace) + .setColorRange(C.COLOR_RANGE_FULL) + .setColorTransfer(C.COLOR_TRANSFER_HLG) + .build(); } } diff --git a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java index d18ac8ed41..29831cbcdc 100644 --- a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java +++ b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java @@ -74,11 +74,12 @@ public class RtspMediaTrackTest { .setHeight(544) .setWidth(960) .setCodecs("avc1.64001F") - .setColorInfo(new ColorInfo.Builder() - .setColorRange(1) - .setLumaBitdepth(8) - .setChromaBitdepth(8) - .build()) + .setColorInfo( + new ColorInfo.Builder() + .setColorRange(1) + .setLumaBitdepth(8) + .setChromaBitdepth(8) + .build()) .setInitializationData( ImmutableList.of( new byte[] { diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump index d055d0daed..8ec7baaa23 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump index d055d0daed..8ec7baaa23 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump index d055d0daed..8ec7baaa23 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump index d055d0daed..8ec7baaa23 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump index fbbedfa122..2c0dadfe38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump index b81fe6b2d5..7d3a61f8d0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump index 2c85045a7d..ddc7c10aee 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump index cd0610fea0..04a0db969d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump index fbbedfa122..2c0dadfe38 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump index b557ab09f7..75ca98e3b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump index b557ab09f7..75ca98e3b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump index b557ab09f7..75ca98e3b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump index b557ab09f7..75ca98e3b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump index b557ab09f7..75ca98e3b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump index 0c271ad758..33d855d245 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump index 0c271ad758..33d855d245 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump index 0c271ad758..33d855d245 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump index 0c271ad758..33d855d245 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump index 0c271ad758..33d855d245 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_android_slow_motion.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump index cb3c2003f0..1da8999b55 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump index cb3c2003f0..1da8999b55 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump index 5b9a721cb6..462e145434 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump index 53cb776780..388f3a0d86 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump index ecb83ddeea..d69439ddb6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump index c049809940..e8ed448e6c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump index 5b9a721cb6..462e145434 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_large_bitrates.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump index 5165fb2222..8d2edb8b11 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump index d64a12c6d4..b1d7f8adef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump index 98cc19fadf..0b220e1afa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump index 3fd459b246..29ae1ae4b2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump index 5165fb2222..8d2edb8b11 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_seekable.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump index cfc8c3c60c..c2cb6e83a0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump index cfc8c3c60c..c2cb6e83a0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_fragmented_sei.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump index 0ea8f5e8d1..3b3e5aa63f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump index 6589c585f6..1ff49d1518 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump index a6c576338c..c598996978 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump index 382d361b15..3e82996fe5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump index 0ea8f5e8d1..3b3e5aa63f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_mdat_too_long.mp4.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump index 85e1af453c..f0ba575fcb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump index 85e1af453c..f0ba575fcb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_partially_fragmented.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump index 717370334c..29b2cfa6d0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump index e352a2fa08..fe191d47e9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump index c96275c53a..4b29a5899f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump index b26b77737d..ed7a217b73 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump index 717370334c..29b2cfa6d0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_color_info.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump index 198985401e..4ef00b607a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump index 2d033600dd..4fbfbd773e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump index c9672440fa..733957024e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump index edf606db82..538fe086d0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump index 198985401e..4ef00b607a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_colr_mdcv_and_clli.mp4.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump index d6216c5bd9..346e692caf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.0.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump index 21243c95a3..59313ce118 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.1.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump index 62c0ab674b..849f7152ed 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.2.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump index 53c0705be4..40c4eee40c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.3.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump index d6216c5bd9..346e692caf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mp4/sample_with_original_quicktime_specification.mov.unknown_length.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump index d32792bcc7..88149be1a2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump index f6b3e5f3f4..82dc922fa3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump index a6da441f21..14fdeb2b08 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump index a6da441f21..14fdeb2b08 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump index a6da441f21..14fdeb2b08 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump index f247dafbff..5c8e373856 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump index 3ded1b3442..1d9e0d4154 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump index bbd23d9817..efc4982d76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump index bbd23d9817..efc4982d76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump index bbd23d9817..efc4982d76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump index 09f2763929..8f744992d8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump index c29acd11ff..938a3dcffc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump index 4de7e73809..d84b88cb2b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump +++ b/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 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 83, hash 7F428 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump index ae1a00da24..e490cc45b9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump +++ b/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 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 83, hash 7F428 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump index 4809546705..bba794744e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump +++ b/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 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 83, hash 7F428 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump index 77b5418642..286707eae8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump +++ b/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 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 83, hash 7F428 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump index 6c81406963..a6f53039d6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump +++ b/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 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 83, hash 7F428 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump index 6c6f353310..4c48998a9c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 146, hash 61554FEF sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump index ac2cc79155..2333b52841 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 146, hash 61554FEF sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump index 53f421bb59..e333da3008 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 146, hash 61554FEF sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump index b1edb8e95a..d77e39484f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 146, hash 61554FEF sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump index fd48904138..20da28fa68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 initializationData: data = length 146, hash 61554FEF sample 0: diff --git a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump index 334953068c..a17d501929 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/h265_with_metadata_track.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump index 0688dd9446..d62b694803 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/hdr10-720p.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump index 1ef259f107..0022672c9e 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_0_orientation.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump index 0706e97027..16b9c1b912 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_180_orientation.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump index c152b1c65c..edd0ab5765 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_270_orientation.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump index 2b3fa7ebdc..2bf7d547e3 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_90_orientation.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump index fb3a7735e1..0fc8fe0a83 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_different_tracks_offset.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump index 584ab8ef05..f22ab25741 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_float_metadata.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump index 6c0155d17d..2811d53d40 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_frame_rate.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump index dfb9bfbfe4..762f6a9037 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_location.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump index 1ef259f107..0022672c9e 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_null_location.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump index fb3a7735e1..0fc8fe0a83 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_same_tracks_offset.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump index b44188362f..37551fdca5 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_string_metadata.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump index 0e63fbe676..6d5031acc9 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/partial_hdr10-720p.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample.mp4.dump index 79f83fab37..9c88ea3fdc 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/sample.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump index ee99ef5b1f..6d923bf2df 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/sample_av1.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump b/libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump index 13da0e0e37..4383006226 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp3/test.mp3/looping_mixedWith_sample_18byte_nclx_colr.mp4.dump +++ b/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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump index 84a32f5bbf..0aebbe2bd6 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/noaudio.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump index 4d6a2d672f..5a01c4f715 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump index 487b57ce96..0ac77e54d9 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/original_original_transmux.dump +++ b/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 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump index e1887ba1b2..766b87e3c1 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/rotated.dump @@ -20,10 +20,8 @@ format video: frameRate = 29.970028 rotationDegrees = 90 colorInfo: - colorSpace = -1 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump index b63d17e14a..ebb6465175 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence.dump @@ -13,10 +13,8 @@ format video: height = 720 frameRate = 29.970028 colorInfo: - colorSpace = -1 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump index b963b08cad..1733c93d3e 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/silence_48000hz.dump @@ -13,10 +13,8 @@ format video: height = 720 frameRate = 29.970028 colorInfo: - colorSpace = -1 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump index ca411fe733..a87a5fe199 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump @@ -18,10 +18,9 @@ track 0: height = 720 frameRate = 32.113037 colorInfo: - colorSpace = -1 colorRange = 2 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump index 0e60c0f0bb..c79fb2b92a 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump @@ -18,10 +18,9 @@ track 0: height = 720 frameRate = 32.113037 colorInfo: - colorSpace = -1 colorRange = 2 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=2000000000, modification time=2000000000, timescale=10000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump index f9d79666de..a4e64dbad9 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump @@ -18,10 +18,9 @@ track 0: height = 720 frameRate = 32.113037 colorInfo: - colorSpace = -1 colorRange = 2 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump index 8b396979c0..caa091288e 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump @@ -18,10 +18,9 @@ track 0: height = 720 frameRate = 32.113037 colorInfo: - colorSpace = -1 colorRange = 2 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[xyz: latitude=45.0, longitude=-90.0, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump index d43efb0c8a..14eebf4163 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/looping_mixedWith_test.mp3.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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump index 5792fb0326..9273e09aef 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/original.dump @@ -10,6 +10,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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump index 90ac863272..cb3541e9ad 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_18byte_nclx_colr.mp4/silence.dump @@ -16,6 +16,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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump index ba932b2c4c..1795d9c07f 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_sef_slow_motion.mp4/noaudio.dump @@ -7,10 +7,8 @@ format video: height = 240 frameRate = 29.523811 colorInfo: - colorSpace = -1 - colorRange = -1 - colorTransfer = -1 - hdrStaticInfo = length 0, hash 0 + lumaBitdepth = 8 + chromaBitdepth = 8 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 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump index cd869ca44b..1e9434772c 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/original.dump @@ -13,6 +13,9 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump index 2359889ccc..debc6b9e33 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_twos_pcm.mp4/silence.dump @@ -12,6 +12,9 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 29, hash 4746B5D9 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump index 7a840fc413..356c62bc66 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped.dump @@ -23,6 +23,8 @@ format video: colorSpace = 2 colorRange = 1 colorTransfer = 3 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 31, hash 4B108214 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump index c2926d425e..2a30943175 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sample_with_increasing_timestamps_320w_240h.mp4/clipped_clipped_transmux.dump @@ -23,6 +23,8 @@ format video: colorSpace = 2 colorRange = 1 colorTransfer = 3 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[TSSE: description=null: values=[Lavf58.76.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 31, hash 4B108214 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump index e61a8bbf7e..8bd7fca868 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/highPitch_silenceHighPitch.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump index a27aa4f33b..1a8cf2d175 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/mixed_sample_rf64.wav.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump index a77194625a..093c0819c6 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump index b39b2484ee..ce81e5d518 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/original_silence.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump index 8b380eb665..d951f9bf7a 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump index 1d118b927d..0b5f659977 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/sequence_repeated3Times_mixed_loopingAudiosowt-with-video.mov.dump @@ -16,6 +16,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump index 244cb2cc34..02d82b9662 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump index 3e61256ed5..8708b2baa8 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_highPitch.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump index bd198a627b..29b54f0ffc 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silence.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump index b22c48daa0..7806630a63 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silenceHighPitch_silenceHighPitch.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump index 5d0d86281c..a3527fa511 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_original.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump index 18cac4b299..c09558b8fa 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silence.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump index 1f5a7b804b..5cd3131c6e 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mp4/sowt-with-video.mov/silence_silenceHighPitch.dump @@ -15,6 +15,8 @@ format video: colorInfo: colorSpace = 1 colorRange = 2 + lumaBitdepth = 8 + chromaBitdepth = 8 metadata = entries=[Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 34, hash 8D738018 diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java index d7a8787d49..b4dc79382a 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/DumpableFormat.java @@ -74,6 +74,8 @@ public final class DumpableFormat implements Dumper.Dumpable { if (colorInfo.hdrStaticInfo != null) { dumper.add("hdrStaticInfo", colorInfo.hdrStaticInfo); } + addIfNonDefault(dumper, "lumaBitdepth", colorInfo, DEFAULT_COLOR_INFO, c -> c.lumaBitdepth); + addIfNonDefault(dumper, "chromaBitdepth", colorInfo, DEFAULT_COLOR_INFO, c -> c.chromaBitdepth); dumper.endBlock(); } addIfNonDefault(dumper, "channelCount", format, DEFAULT_FORMAT, format -> format.channelCount);