From e28288f9c51754c4ae484362dce4c52b262cc522 Mon Sep 17 00:00:00 2001 From: microkatz Date: Thu, 21 Sep 2023 11:07:11 +0000 Subject: [PATCH] Updated golden file tests and removed deprecated ColorInfo constructor usage --- .../mediacodec/MediaCodecInfoTest.java | 4 ++-- .../mediacodec/MediaCodecUtilTest.java | 21 ++++++++++--------- .../exoplayer/rtsp/RtspMediaTrackTest.java | 12 +++++++++++ ...on-photo-jfif-segment-shortened.jpg.0.dump | 5 +++++ ...on-photo-jfif-segment-shortened.jpg.1.dump | 5 +++++ ...on-photo-jfif-segment-shortened.jpg.2.dump | 5 +++++ ...on-photo-jfif-segment-shortened.jpg.3.dump | 5 +++++ .../extractordumps/mp4/sample.mp4.0.dump | 5 +++++ .../extractordumps/mp4/sample.mp4.1.dump | 5 +++++ .../extractordumps/mp4/sample.mp4.2.dump | 5 +++++ .../extractordumps/mp4/sample.mp4.3.dump | 5 +++++ .../mp4/sample.mp4.unknown_length.dump | 5 +++++ .../mp4/sample_mdat_too_long.mp4.0.dump | 5 +++++ .../mp4/sample_mdat_too_long.mp4.1.dump | 5 +++++ .../mp4/sample_mdat_too_long.mp4.2.dump | 5 +++++ .../mp4/sample_mdat_too_long.mp4.3.dump | 5 +++++ ...mple_mdat_too_long.mp4.unknown_length.dump | 5 +++++ .../ts/sample_h264_dts_audio.ts.0.dump | 5 +++++ ...mple_h264_dts_audio.ts.unknown_length.dump | 5 +++++ .../ts/sample_h264_mpeg_audio.ts.0.dump | 5 +++++ .../ts/sample_h264_mpeg_audio.ts.1.dump | 5 +++++ .../ts/sample_h264_mpeg_audio.ts.2.dump | 5 +++++ .../ts/sample_h264_mpeg_audio.ts.3.dump | 5 +++++ ...ple_h264_mpeg_audio.ts.unknown_length.dump | 5 +++++ ...e_h264_no_access_unit_delimiters.ts.0.dump | 5 +++++ ...e_h264_no_access_unit_delimiters.ts.1.dump | 5 +++++ ...e_h264_no_access_unit_delimiters.ts.2.dump | 5 +++++ ...e_h264_no_access_unit_delimiters.ts.3.dump | 5 +++++ ...ess_unit_delimiters.ts.unknown_length.dump | 5 +++++ .../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 | 5 +++++ .../ts/sample_h265_rps_pred.ts.1.dump | 5 +++++ .../ts/sample_h265_rps_pred.ts.2.dump | 5 +++++ .../ts/sample_h265_rps_pred.ts.3.dump | 5 +++++ ...ample_h265_rps_pred.ts.unknown_length.dump | 5 +++++ .../mp4/sample.mp4/noaudio.dump | 5 +++++ .../mp4/sample.mp4/original.dump | 5 +++++ .../original_original_transmux.dump | 5 +++++ .../mp4/sample.mp4/rotated.dump | 5 +++++ .../mp4/sample.mp4/silence.dump | 5 +++++ .../mp4/sample.mp4/silence_48000hz.dump | 5 +++++ .../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 +++++ .../sample_sef_slow_motion.mp4/noaudio.dump | 5 +++++ 50 files changed, 260 insertions(+), 12 deletions(-) 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 909c5a71ce..63c5d83757 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,7 @@ public final class MediaCodecInfoTest { } private static ColorInfo buildColorInfo(@C.ColorSpace int colorSpace) { - return new ColorInfo( - colorSpace, C.COLOR_RANGE_FULL, C.COLOR_TRANSFER_HLG, /* hdrStaticInfo= */ null); + return new ColorInfo.Builder().setColorSpace( + colorSpace).setColorRange(C.COLOR_RANGE_FULL).setColorTransfer(C.COLOR_TRANSFER_HLG).build(); } } diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtilTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtilTest.java index a9e122762f..d1af420a0a 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtilTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtilTest.java @@ -90,11 +90,12 @@ public final class MediaCodecUtilTest { @Test public void getCodecProfileAndLevel_handlesAv1ProfileMain10HDRWithHdrInfoSet() { ColorInfo colorInfo = - new ColorInfo( - /* colorSpace= */ C.COLOR_SPACE_BT709, - /* colorRange= */ C.COLOR_RANGE_LIMITED, - /* colorTransfer= */ C.COLOR_TRANSFER_SDR, - /* hdrStaticInfo= */ new byte[] {1, 2, 3, 4, 5, 6, 7}); + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT709) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_SDR) + .setHdrStaticInfo(new byte[] {1, 2, 3, 4, 5, 6, 7}) + .build(); Format format = new Format.Builder() .setSampleMimeType(MimeTypes.VIDEO_AV1) @@ -110,11 +111,11 @@ public final class MediaCodecUtilTest { @Test public void getCodecProfileAndLevel_handlesAv1ProfileMain10HDRWithoutHdrInfoSet() { ColorInfo colorInfo = - new ColorInfo( - /* colorSpace= */ C.COLOR_SPACE_BT709, - /* colorRange= */ C.COLOR_RANGE_LIMITED, - /* colorTransfer= */ C.COLOR_TRANSFER_HLG, - /* hdrStaticInfo= */ null); + new ColorInfo.Builder() + .setColorSpace(C.COLOR_SPACE_BT709) + .setColorRange(C.COLOR_RANGE_LIMITED) + .setColorTransfer(C.COLOR_TRANSFER_HLG) + .build(); Format format = new Format.Builder() .setSampleMimeType(MimeTypes.VIDEO_AV1) 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 11fac5a101..d18ac8ed41 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 @@ -26,6 +26,7 @@ import static org.junit.Assert.assertThrows; import android.net.Uri; import androidx.media3.common.C; +import androidx.media3.common.ColorInfo; import androidx.media3.common.Format; import androidx.media3.common.MimeTypes; import androidx.media3.extractor.AacUtil; @@ -73,6 +74,11 @@ public class RtspMediaTrackTest { .setHeight(544) .setWidth(960) .setCodecs("avc1.64001F") + .setColorInfo(new ColorInfo.Builder() + .setColorRange(1) + .setLumaBitdepth(8) + .setChromaBitdepth(8) + .build()) .setInitializationData( ImmutableList.of( new byte[] { @@ -246,6 +252,12 @@ public class RtspMediaTrackTest { .setHeight(544) .setWidth(960) .setCodecs("avc1.64001F") + .setColorInfo( + new ColorInfo.Builder() + .setColorRange(1) + .setChromaBitdepth(8) + .setLumaBitdepth(8) + .build()) .setInitializationData( ImmutableList.of( new byte[] { 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 2e8ca549c1..d055d0daed 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 @@ -17,6 +17,11 @@ track 0: width = 180 height = 120 pixelWidthHeightRatio = 0.5 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 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 2e8ca549c1..d055d0daed 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 @@ -17,6 +17,11 @@ track 0: width = 180 height = 120 pixelWidthHeightRatio = 0.5 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 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 2e8ca549c1..d055d0daed 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 @@ -17,6 +17,11 @@ track 0: width = 180 height = 120 pixelWidthHeightRatio = 0.5 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 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 2e8ca549c1..d055d0daed 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 @@ -17,6 +17,11 @@ track 0: width = 180 height = 120 pixelWidthHeightRatio = 0.5 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf58.42.100], Mp4Timestamp: creation time=0, modification time=0, timescale=1000] initializationData: data = length 32, hash 1F3D6E87 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 713bb91d2a..fbbedfa122 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 c31ee81b1b..b81fe6b2d5 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 60508b5bc0..2c85045a7d 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 33b7075b1a..cd0610fea0 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 713bb91d2a..fbbedfa122 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 399b08a389..0ea8f5e8d1 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 27816cedb5..6589c585f6 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 d52b5554fd..a6c576338c 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 a9ce9b07f6..382d361b15 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 399b08a389..0ea8f5e8d1 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 6d210a26ad..d32792bcc7 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 614c00db41..f6b3e5f3f4 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 @@ -12,6 +12,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 67a53d8985..a6da441f21 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 67a53d8985..a6da441f21 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 67a53d8985..a6da441f21 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 b1aae85d77..f247dafbff 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 211da76926..3ded1b3442 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 @@ -12,6 +12,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 606963f1a3..bbd23d9817 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 606963f1a3..bbd23d9817 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 606963f1a3..bbd23d9817 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 eb82f409a4..09f2763929 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 @@ -15,6 +15,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 69ec11e297..c29acd11ff 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 @@ -12,6 +12,11 @@ track 256: codecs = avc1.64001E width = 640 height = 426 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 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 b28ab564d2..4de7e73809 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 @@ -15,6 +15,11 @@ track 256: codecs = hvc1.1.6.L90.90 width = 854 height = 480 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 83, hash 7F428 sample 0: 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 830bc3affa..ae1a00da24 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 @@ -15,6 +15,11 @@ track 256: codecs = hvc1.1.6.L90.90 width = 854 height = 480 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 83, hash 7F428 sample 0: 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 1e36d3fd45..4809546705 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 @@ -15,6 +15,11 @@ track 256: codecs = hvc1.1.6.L90.90 width = 854 height = 480 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 83, hash 7F428 sample 0: 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 45b59a2efb..77b5418642 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 @@ -15,6 +15,11 @@ track 256: codecs = hvc1.1.6.L90.90 width = 854 height = 480 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 83, hash 7F428 sample 0: 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 ea0b24b10d..6c81406963 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 @@ -12,6 +12,11 @@ track 256: codecs = hvc1.1.6.L90.90 width = 854 height = 480 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 83, hash 7F428 sample 0: 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 e09a1ed5f3..6c6f353310 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 @@ -16,6 +16,11 @@ track 256: width = 914 height = 686 pixelWidthHeightRatio = 1.0003651 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 146, hash 61554FEF sample 0: 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 854d46c000..ac2cc79155 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 @@ -16,6 +16,11 @@ track 256: width = 914 height = 686 pixelWidthHeightRatio = 1.0003651 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 146, hash 61554FEF sample 0: 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 9c05ad0397..53f421bb59 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 @@ -16,6 +16,11 @@ track 256: width = 914 height = 686 pixelWidthHeightRatio = 1.0003651 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 146, hash 61554FEF sample 0: 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 156ab664e3..b1edb8e95a 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 @@ -16,6 +16,11 @@ track 256: width = 914 height = 686 pixelWidthHeightRatio = 1.0003651 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 146, hash 61554FEF sample 0: 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 bc6ea441cf..fd48904138 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 @@ -13,6 +13,11 @@ track 256: width = 914 height = 686 pixelWidthHeightRatio = 1.0003651 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 initializationData: data = length 146, hash 61554FEF sample 0: 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 63fae31138..84a32f5bbf 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 @@ -6,6 +6,11 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 17c19d41bf..4d6a2d672f 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 @@ -18,6 +18,11 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 07cbd150f6..487b57ce96 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 @@ -18,6 +18,11 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 8f616a8c1e..e1887ba1b2 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 @@ -19,6 +19,11 @@ format video: height = 720 frameRate = 29.970028 rotationDegrees = 90 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 86aeaa6870..b63d17e14a 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 @@ -12,6 +12,11 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 5e87ed4f46..b963b08cad 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 @@ -12,6 +12,11 @@ format video: width = 1080 height = 720 frameRate = 29.970028 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[TSSE: description=null: values=[Lavf56.1.0], xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=1000] initializationData: data = length 29, hash 4746B5D9 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 520b52eb37..ca411fe733 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 32.113037 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[mdta: key=com.android.capture.fps, value=60.0, xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000] initializationData: data = length 29, hash 4746B5D9 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 a23d9b86dd..0e60c0f0bb 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 32.113037 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=2000000000, modification time=2000000000, timescale=10000] initializationData: data = length 29, hash 4746B5D9 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 661bf62c5b..f9d79666de 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 32.113037 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[mdta: key=StringKey, value=StringValue, mdta: key=FloatKey, value=600.0, xyz: latitude=40.68, longitude=-74.5, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000] initializationData: data = length 29, hash 4746B5D9 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 431d44a355..8b396979c0 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 @@ -17,6 +17,11 @@ track 0: width = 1080 height = 720 frameRate = 32.113037 + colorInfo: + colorSpace = -1 + colorRange = 2 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[xyz: latitude=45.0, longitude=-90.0, Mp4Timestamp: creation time=3547558895, modification time=3547558895, timescale=10000] initializationData: data = length 29, hash 4746B5D9 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 d8e1c96eff..ba932b2c4c 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 @@ -6,6 +6,11 @@ format video: width = 320 height = 240 frameRate = 29.523811 + colorInfo: + colorSpace = -1 + colorRange = -1 + colorTransfer = -1 + hdrStaticInfo = length 0, hash 0 metadata = entries=[mdta: key=com.android.version, value=10, mdta: key=com.android.video.temporal_layers_count, value=4, mdta: key=com.android.capture.fps, value=240.0, SlowMotion: segments=[Segment: startTimeMs=88, endTimeMs=879, speedDivisor=2, Segment: startTimeMs=1255, endTimeMs=1970, speedDivisor=8], smta: captureFrameRate=240.0, svcTemporalLayerCount=4, Mp4Timestamp: creation time=3686904890, modification time=3686904890, timescale=1000] initializationData: data = length 33, hash D3FB879D