From 07150b816ffd537bcf548d93859c1c0387eecb20 Mon Sep 17 00:00:00 2001 From: Daniele Sparano Date: Wed, 12 Feb 2025 14:14:20 +0000 Subject: [PATCH] Fix h264 and h265 dumps --- .../ts/sample_h264_no_access_unit_delimiters.ts.0.dump | 8 ++++++-- .../ts/sample_h264_no_access_unit_delimiters.ts.1.dump | 8 ++++++-- .../ts/sample_h264_no_access_unit_delimiters.ts.2.dump | 8 ++++++-- .../ts/sample_h264_no_access_unit_delimiters.ts.3.dump | 8 ++++++-- ..._h264_no_access_unit_delimiters.ts.unknown_length.dump | 8 ++++++-- .../test/assets/extractordumps/ts/sample_h265.ts.0.dump | 2 +- .../test/assets/extractordumps/ts/sample_h265.ts.1.dump | 2 +- .../test/assets/extractordumps/ts/sample_h265.ts.2.dump | 2 +- .../test/assets/extractordumps/ts/sample_h265.ts.3.dump | 2 +- .../extractordumps/ts/sample_h265.ts.unknown_length.dump | 2 +- .../extractordumps/ts/sample_h265_rps_pred.ts.0.dump | 2 +- .../extractordumps/ts/sample_h265_rps_pred.ts.1.dump | 2 +- .../extractordumps/ts/sample_h265_rps_pred.ts.2.dump | 2 +- .../extractordumps/ts/sample_h265_rps_pred.ts.3.dump | 2 +- .../ts/sample_h265_rps_pred.ts.unknown_length.dump | 2 +- 15 files changed, 40 insertions(+), 20 deletions(-) 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 b094b7f03a..71cdd163ef 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 12451 - sample count = 5 + sample count = 6 format 0: id = 1/256 containerMimeType = video/mp2t @@ -42,5 +42,9 @@ track 256: sample 4: time = 100100 flags = 0 - data = length 255, hash 66DC6D3F + data = length 6, hash 34E64009 + sample 5: + time = 100100 + flags = 0 + data = length 249, hash 689D3447 tracksEnded = true 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 b094b7f03a..71cdd163ef 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 12451 - sample count = 5 + sample count = 6 format 0: id = 1/256 containerMimeType = video/mp2t @@ -42,5 +42,9 @@ track 256: sample 4: time = 100100 flags = 0 - data = length 255, hash 66DC6D3F + data = length 6, hash 34E64009 + sample 5: + time = 100100 + flags = 0 + data = length 249, hash 689D3447 tracksEnded = true 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 b094b7f03a..71cdd163ef 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 12451 - sample count = 5 + sample count = 6 format 0: id = 1/256 containerMimeType = video/mp2t @@ -42,5 +42,9 @@ track 256: sample 4: time = 100100 flags = 0 - data = length 255, hash 66DC6D3F + data = length 6, hash 34E64009 + sample 5: + time = 100100 + flags = 0 + data = length 249, hash 689D3447 tracksEnded = true 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 0977f524f2..30371facc4 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 255 - sample count = 1 + sample count = 2 format 0: id = 1/256 containerMimeType = video/mp2t @@ -26,5 +26,9 @@ track 256: sample 0: time = 100100 flags = 0 - data = length 255, hash 66DC6D3F + data = length 6, hash 34E64009 + sample 1: + time = 100100 + flags = 0 + data = length 249, hash 689D3447 tracksEnded = true 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 1fb5a3b448..389f67eb02 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 @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 12451 - sample count = 5 + sample count = 6 format 0: id = 1/256 containerMimeType = video/mp2t @@ -39,5 +39,9 @@ track 256: sample 4: time = 100100 flags = 0 - data = length 255, hash 66DC6D3F + data = length 6, hash 34E64009 + sample 5: + time = 100100 + flags = 0 + data = length 249, hash 689D3447 tracksEnded = true 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 34eb1f048b..81ffb9dd12 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 @@ -143,5 +143,5 @@ track 256: sample 29: time = 1000000 flags = 0 - data = length 161, hash F9142BEE + data = length 168, hash 8220F9BC tracksEnded = true 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 4d7ecf1855..04ff7ec348 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 @@ -107,5 +107,5 @@ track 256: sample 20: time = 1000000 flags = 0 - data = length 161, hash F9142BEE + data = length 168, hash 8220F9BC tracksEnded = true 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 66cea66053..b6b31cfb0e 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 @@ -71,5 +71,5 @@ track 256: sample 11: time = 1000000 flags = 0 - data = length 161, hash F9142BEE + data = length 168, hash 8220F9BC tracksEnded = true 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 52921d3ecc..5c01c5aa17 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 @@ -35,5 +35,5 @@ track 256: sample 2: time = 1000000 flags = 0 - data = length 161, hash F9142BEE + data = length 168, hash 8220F9BC tracksEnded = true 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 aa46ae3d1a..9a60d9fe46 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 @@ -140,5 +140,5 @@ track 256: sample 29: time = 1000000 flags = 0 - data = length 161, hash F9142BEE + data = length 168, hash 8220F9BC tracksEnded = true 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 985f2703b7..05624c7318 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 @@ -87,5 +87,5 @@ track 256: sample 15: time = 1266666 flags = 0 - data = length 93, hash 3D33BACB + data = length 100, hash 6E090F99 tracksEnded = true 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 566549d36b..538f19f635 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 @@ -71,5 +71,5 @@ track 256: sample 11: time = 1266666 flags = 0 - data = length 93, hash 3D33BACB + data = length 100, hash 6E090F99 tracksEnded = true 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 4b631681e2..5865311faf 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 @@ -51,5 +51,5 @@ track 256: sample 6: time = 1266666 flags = 0 - data = length 93, hash 3D33BACB + data = length 100, hash 6E090F99 tracksEnded = true 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 027fee8729..fc525a0711 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 @@ -31,5 +31,5 @@ track 256: sample 1: time = 1266666 flags = 0 - data = length 93, hash 3D33BACB + data = length 100, hash 6E090F99 tracksEnded = true 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 ccc75ec9eb..e5e758dcc5 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 @@ -84,5 +84,5 @@ track 256: sample 15: time = 1266666 flags = 0 - data = length 93, hash 3D33BACB + data = length 100, hash 6E090F99 tracksEnded = true