From 3b9ee1c1a1656e4247f43133a8c2e79d1757a196 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Mon, 17 Apr 2023 16:09:49 +0100 Subject: [PATCH] Add NAL unit start code in csd0/csd1 test data The actual csd data contains NAL units so it should always start with a NAL unit start code (00 00 00 01). This issue was not caught before because in the code there was no validation to check whether its a valid NAL unit. PiperOrigin-RevId: 524849867 --- .../muxerdumps/mp4_with_0_orientation.mp4.dump | 6 +++--- .../muxerdumps/mp4_with_180_orientation.mp4.dump | 6 +++--- .../muxerdumps/mp4_with_270_orientation.mp4.dump | 6 +++--- .../muxerdumps/mp4_with_90_orientation.mp4.dump | 6 +++--- .../mp4_with_different_tracks_offset.mp4.dump | 12 ++++++------ .../muxerdumps/mp4_with_float_metadata.mp4.dump | 14 +++++++------- .../assets/muxerdumps/mp4_with_frame_rate.mp4.dump | 6 +++--- .../assets/muxerdumps/mp4_with_location.mp4.dump | 6 +++--- .../muxerdumps/mp4_with_null_location.mp4.dump | 6 +++--- .../mp4_with_same_tracks_offset.mp4.dump | 12 ++++++------ .../muxerdumps/mp4_with_string_metadata.mp4.dump | 14 +++++++------- .../test/assets/muxerdumps/mp4_with_xmp.mp4.dump | 14 +++++++------- 12 files changed, 54 insertions(+), 54 deletions(-) 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 4c7c520cc0..917bc9e0e8 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 @@ -12,13 +12,13 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 878147bac7..80b2f18f4b 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 rotationDegrees = 180 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 b0217f6e54..3a7adfa976 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 rotationDegrees = 270 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 2a5ad0b955..347e471002 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 rotationDegrees = 90 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 2be7d750bb..84a20720c9 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 frameRate = 20000.0 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 1 @@ -34,14 +34,14 @@ track 1: format 0: id = 2 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 frameRate = 10000.0 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 1 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 c7714028b2..29587d68eb 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 @@ -2,7 +2,7 @@ ftyp (28 bytes): Data = length 20, hash EF896440 mdat (71 bytes): Data = length 55, hash 6B19F4A7 -moov (764 bytes): +moov (772 bytes): mvhd (108 bytes): Data = length 100, hash A5ADE288 meta (114 bytes): @@ -12,22 +12,22 @@ moov (764 bytes): Data = length 29, hash 45F2DCDF ilst (36 bytes): Data = length 28, hash 2BFD5C32 - trak (534 bytes): + trak (542 bytes): tkhd (92 bytes): Data = length 84, hash 8893F5BB - mdia (434 bytes): + mdia (442 bytes): mdhd (32 bytes): Data = length 24, hash 50217AD hdlr (44 bytes): Data = length 36, hash A0852FF2 - minf (350 bytes): + minf (358 bytes): vmhd (20 bytes): Data = length 12, hash EE830681 dinf (36 bytes): Data = length 28, hash D535436B - stbl (286 bytes): - stsd (158 bytes): - Data = length 150, hash 2AD095C5 + stbl (294 bytes): + stsd (166 bytes): + Data = length 158, hash B2A35483 stts (24 bytes): Data = length 16, hash E4FC6483 stsz (24 bytes): 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 54a927948a..a35f3c307a 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 metadata = entries=[mdta: key=com.android.capture.fps, value=42f00000] initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 d107be5a43..a847404d78 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 metadata = entries=[xyz: latitude=33.0, longitude=-120.0] initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 4c7c520cc0..917bc9e0e8 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 @@ -12,13 +12,13 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 536870913 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 2be7d750bb..84a20720c9 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 @@ -12,14 +12,14 @@ track 0: format 0: id = 1 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 frameRate = 20000.0 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 1 @@ -34,14 +34,14 @@ track 1: format 0: id = 2 sampleMimeType = video/avc - codecs = avc1.9B2BF3 + codecs = avc1.F4000A maxInputSize = 85 width = 12 height = 10 frameRate = 10000.0 initializationData: - data = length 24, hash 7F12E259 - data = length 5, hash 1B4D906 + data = length 28, hash 410B510 + data = length 9, hash FBADD682 sample 0: time = 0 flags = 1 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 5ccfe8b30e..7417467c4c 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 @@ -2,7 +2,7 @@ ftyp (28 bytes): Data = length 20, hash EF896440 mdat (71 bytes): Data = length 55, hash 6B19F4A7 -moov (778 bytes): +moov (786 bytes): mvhd (108 bytes): Data = length 100, hash A5ADE288 meta (128 bytes): @@ -12,22 +12,22 @@ moov (778 bytes): Data = length 29, hash 45F2DCDF ilst (50 bytes): Data = length 42, hash F4AA183B - trak (534 bytes): + trak (542 bytes): tkhd (92 bytes): Data = length 84, hash 8893F5BB - mdia (434 bytes): + mdia (442 bytes): mdhd (32 bytes): Data = length 24, hash 50217AD hdlr (44 bytes): Data = length 36, hash A0852FF2 - minf (350 bytes): + minf (358 bytes): vmhd (20 bytes): Data = length 12, hash EE830681 dinf (36 bytes): Data = length 28, hash D535436B - stbl (286 bytes): - stsd (158 bytes): - Data = length 150, hash 2AD095C5 + stbl (294 bytes): + stsd (166 bytes): + Data = length 158, hash B2A35483 stts (24 bytes): Data = length 16, hash E4FC6483 stsz (24 bytes): diff --git a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_xmp.mp4.dump b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_xmp.mp4.dump index 31244194e0..7f58669503 100644 --- a/libraries/test_data/src/test/assets/muxerdumps/mp4_with_xmp.mp4.dump +++ b/libraries/test_data/src/test/assets/muxerdumps/mp4_with_xmp.mp4.dump @@ -2,25 +2,25 @@ ftyp (28 bytes): Data = length 20, hash EF896440 mdat (71 bytes): Data = length 55, hash 6B19F4A7 -moov (650 bytes): +moov (658 bytes): mvhd (108 bytes): Data = length 100, hash A5ADE288 - trak (534 bytes): + trak (542 bytes): tkhd (92 bytes): Data = length 84, hash 8893F5BB - mdia (434 bytes): + mdia (442 bytes): mdhd (32 bytes): Data = length 24, hash 50217AD hdlr (44 bytes): Data = length 36, hash A0852FF2 - minf (350 bytes): + minf (358 bytes): vmhd (20 bytes): Data = length 12, hash EE830681 dinf (36 bytes): Data = length 28, hash D535436B - stbl (286 bytes): - stsd (158 bytes): - Data = length 150, hash 2AD095C5 + stbl (294 bytes): + stsd (166 bytes): + Data = length 158, hash B2A35483 stts (24 bytes): Data = length 16, hash E4FC6483 stsz (24 bytes):