From 3cafb08a32424bad19d1d3b74874760a0509c836 Mon Sep 17 00:00:00 2001 From: Rohit Singh Date: Wed, 27 Mar 2024 19:09:50 +0000 Subject: [PATCH] =?UTF-8?q?=EF=BB=BFFix=20condition=20to=20send=20dummy=20?= =?UTF-8?q?end=20of=20input=20and=20update=20dump=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/androidx/media3/extractor/ts/PesReader.java | 2 +- .../assets/extractordumps/ts/sample_h263.ts.0.dump | 6 +++++- .../assets/extractordumps/ts/sample_h263.ts.1.dump | 6 +++++- .../assets/extractordumps/ts/sample_h263.ts.2.dump | 6 +++++- .../ts/sample_h263.ts.unknown_length.dump | 6 +++++- .../assets/extractordumps/ts/sample_h264.ts.0.dump | 6 +++++- .../assets/extractordumps/ts/sample_h264.ts.1.dump | 6 +++++- .../assets/extractordumps/ts/sample_h264.ts.2.dump | 6 +++++- .../assets/extractordumps/ts/sample_h264.ts.3.dump | 6 +++++- .../ts/sample_h264.ts.unknown_length.dump | 6 +++++- .../extractordumps/ts/sample_h264_dts_audio.ts.0.dump | 6 +++++- .../ts/sample_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.unknown_length.dump | 6 +++++- .../sample_h264_no_access_unit_delimiters.ts.0.dump | 6 +++++- .../sample_h264_no_access_unit_delimiters.ts.1.dump | 6 +++++- .../sample_h264_no_access_unit_delimiters.ts.2.dump | 6 +++++- .../sample_h264_no_access_unit_delimiters.ts.3.dump | 6 +++++- ...4_no_access_unit_delimiters.ts.unknown_length.dump | 6 +++++- .../assets/extractordumps/ts/sample_h265.ts.0.dump | 6 +++++- .../assets/extractordumps/ts/sample_h265.ts.1.dump | 6 +++++- .../assets/extractordumps/ts/sample_h265.ts.2.dump | 6 +++++- .../assets/extractordumps/ts/sample_h265.ts.3.dump | 6 +++++- .../ts/sample_h265.ts.unknown_length.dump | 6 +++++- .../extractordumps/ts/sample_h265_rps_pred.ts.0.dump | 6 +++++- .../extractordumps/ts/sample_h265_rps_pred.ts.1.dump | 6 +++++- .../extractordumps/ts/sample_h265_rps_pred.ts.2.dump | 6 +++++- .../extractordumps/ts/sample_h265_rps_pred.ts.3.dump | 6 +++++- .../ts/sample_h265_rps_pred.ts.unknown_length.dump | 6 +++++- .../src/test/assets/playbackdumps/hls/cea608.dump | 7 +++++++ .../playbackdumps/ts/sample_h264_dts_audio.ts.dump | 11 +++++++++-- .../playbackdumps/ts/sample_h264_mpeg_audio.ts.dump | 11 +++++++++-- .../ts/sample_h264_no_access_unit_delimiters.ts.dump | 11 +++++++++-- .../test/assets/playbackdumps/ts/sample_h265.ts.dump | 11 +++++++++-- .../playbackdumps/ts/sample_h265_rps_pred.ts.dump | 11 +++++++++-- 37 files changed, 203 insertions(+), 41 deletions(-) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java index 525572ea08..007bc2b03b 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java @@ -171,7 +171,7 @@ public final class PesReader implements TsPayloadReader { // is due to H262 streams possibly having, in HLS mode, a pes across more than one segment // which would trigger committing an unfinished sample in the middle of the access unit return state == STATE_READING_BODY - && payloadSize != C.LENGTH_UNSET + && payloadSize == C.LENGTH_UNSET && !(reader instanceof H262Reader); } diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump index d7e09a7fc8..4acc09c7f8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 39002 - sample count = 24 + sample count = 25 format 0: id = 1/256 sampleMimeType = video/mp4v-es @@ -112,4 +112,8 @@ track 256: time = 920000 flags = 0 data = length 222, hash 7E77BF79 + sample 24: + time = 960000 + flags = 1 + data = length 11769, hash D94C80C0 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump index e67426081b..068d08fae8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 27354 - sample count = 18 + sample count = 19 format 0: id = 1/256 sampleMimeType = video/mp4v-es @@ -88,4 +88,8 @@ track 256: time = 920000 flags = 0 data = length 222, hash 7E77BF79 + sample 18: + time = 960000 + flags = 1 + data = length 11769, hash D94C80C0 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump index 396584d608..beabaa70f5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 13592 - sample count = 8 + sample count = 9 format 0: id = 1/256 sampleMimeType = video/mp4v-es @@ -48,4 +48,8 @@ track 256: time = 920000 flags = 0 data = length 222, hash 7E77BF79 + sample 8: + time = 960000 + flags = 1 + data = length 11769, hash D94C80C0 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump index 0dbb32e7a1..3a4f911622 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 39002 - sample count = 24 + sample count = 25 format 0: id = 1/256 sampleMimeType = video/mp4v-es @@ -109,4 +109,8 @@ track 256: time = 920000 flags = 0 data = length 222, hash 7E77BF79 + sample 24: + time = 960000 + flags = 1 + data = length 11769, hash D94C80C0 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump index e5267ce7e0..1b75458810 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 41614 - sample count = 29 + sample count = 30 format 0: id = 1/256 sampleMimeType = video/avc @@ -137,4 +137,8 @@ track 256: time = 966666 flags = 0 data = length 93, hash B6B6263C + sample 29: + time = 1033333 + flags = 0 + data = length 235, hash ED1A7470 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump index 5355585faa..88e46511a0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 25812 - sample count = 20 + sample count = 21 format 0: id = 1/256 sampleMimeType = video/avc @@ -101,4 +101,8 @@ track 256: time = 966666 flags = 0 data = length 93, hash B6B6263C + sample 20: + time = 1033333 + flags = 0 + data = length 235, hash ED1A7470 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump index 49ff7f1a56..5fad034da9 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 13114 - sample count = 11 + sample count = 12 format 0: id = 1/256 sampleMimeType = video/avc @@ -65,4 +65,8 @@ track 256: time = 966666 flags = 0 data = length 93, hash B6B6263C + sample 11: + time = 1033333 + flags = 0 + data = length 235, hash ED1A7470 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump index e47af7088d..5409e11ba7 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 412 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -29,4 +29,8 @@ track 256: time = 966666 flags = 0 data = length 93, hash B6B6263C + sample 2: + time = 1033333 + flags = 0 + data = length 235, hash ED1A7470 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump index f162217769..5a89e9d97e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 41614 - sample count = 29 + sample count = 30 format 0: id = 1/256 sampleMimeType = video/avc @@ -134,4 +134,8 @@ track 256: time = 966666 flags = 0 data = length 93, hash B6B6263C + sample 29: + time = 1033333 + flags = 0 + data = length 235, hash ED1A7470 tracksEnded = true 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 0145c3572e..426f20b570 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -29,6 +29,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 18432 sample count = 9 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 43ff3cfaa9..c8d25b1598 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 @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -26,6 +26,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 18432 sample count = 9 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 c1aa54cd6c..481adde1ae 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -29,6 +29,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 5015 sample count = 4 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 c1aa54cd6c..481adde1ae 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -29,6 +29,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 5015 sample count = 4 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 c1aa54cd6c..481adde1ae 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -29,6 +29,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 5015 sample count = 4 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 80cd8196ef..86c786e20d 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 @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 2 track 256: total output bytes = 13650 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -26,6 +26,10 @@ track 256: time = 100100 flags = 0 data = length 813, hash 99F7B4FA + sample 2: + time = 133466 + flags = 0 + data = length 443, hash 3F995B11 track 257: total output bytes = 5015 sample count = 4 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 af8d33818c..a02d99c0a2 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 = 4 + sample count = 5 format 0: id = 1/256 sampleMimeType = video/avc @@ -37,4 +37,8 @@ track 256: time = 133466 flags = 0 data = length 518, hash 546C177 + sample 4: + time = 100100 + flags = 0 + data = length 255, hash 6A68F67F 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 af8d33818c..a02d99c0a2 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 = 4 + sample count = 5 format 0: id = 1/256 sampleMimeType = video/avc @@ -37,4 +37,8 @@ track 256: time = 133466 flags = 0 data = length 518, hash 546C177 + sample 4: + time = 100100 + flags = 0 + data = length 255, hash 6A68F67F 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 af8d33818c..a02d99c0a2 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 = 4 + sample count = 5 format 0: id = 1/256 sampleMimeType = video/avc @@ -37,4 +37,8 @@ track 256: time = 133466 flags = 0 data = length 518, hash 546C177 + sample 4: + time = 100100 + flags = 0 + data = length 255, hash 6A68F67F 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 d85d264d45..d87b069e09 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 = 0 + sample count = 1 format 0: id = 1/256 sampleMimeType = video/avc @@ -21,4 +21,8 @@ track 256: initializationData: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 + sample 0: + time = 100100 + flags = 0 + data = length 255, hash 6A68F67F 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 1bd3989f30..78337824d1 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 = 4 + sample count = 5 format 0: id = 1/256 sampleMimeType = video/avc @@ -34,4 +34,8 @@ track 256: time = 133466 flags = 0 data = length 518, hash 546C177 + sample 4: + time = 100100 + flags = 0 + data = length 255, hash 6A68F67F 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 5ec4a66af0..f09550dd52 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 19364 - sample count = 29 + sample count = 30 format 0: id = 1/256 sampleMimeType = video/hevc @@ -137,4 +137,8 @@ track 256: time = 933333 flags = 0 data = length 87, hash EEC4D98C + sample 29: + time = 1000000 + flags = 0 + data = length 168, hash 717913A6 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 596214fd00..8d97773757 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 3806 - sample count = 20 + sample count = 21 format 0: id = 1/256 sampleMimeType = video/hevc @@ -101,4 +101,8 @@ track 256: time = 933333 flags = 0 data = length 87, hash EEC4D98C + sample 20: + time = 1000000 + flags = 0 + data = length 168, hash 717913A6 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 96e619ae78..6893a3b688 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 1796 - sample count = 11 + sample count = 12 format 0: id = 1/256 sampleMimeType = video/hevc @@ -65,4 +65,8 @@ track 256: time = 933333 flags = 0 data = length 87, hash EEC4D98C + sample 11: + time = 1000000 + flags = 0 + data = length 168, hash 717913A6 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 6664dd6e5a..6950615b2e 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 396 - sample count = 2 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/hevc @@ -29,4 +29,8 @@ track 256: time = 933333 flags = 0 data = length 87, hash EEC4D98C + sample 2: + time = 1000000 + flags = 0 + data = length 168, hash 717913A6 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 3d8153a7e9..94d7594316 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 @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 19364 - sample count = 29 + sample count = 30 format 0: id = 1/256 sampleMimeType = video/hevc @@ -134,4 +134,8 @@ track 256: time = 933333 flags = 0 data = length 87, hash EEC4D98C + sample 29: + time = 1000000 + flags = 0 + data = length 168, hash 717913A6 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 87e44ae05a..f89512902a 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 10004 - sample count = 15 + sample count = 16 format 0: id = 1/256 sampleMimeType = video/hevc @@ -81,4 +81,8 @@ track 256: time = 1133333 flags = 0 data = length 46, hash CE770A40 + sample 15: + time = 1266666 + flags = 0 + data = length 100, hash E3C60A69 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 b07c3b0c80..e93e80e5ad 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 856 - sample count = 11 + sample count = 12 format 0: id = 1/256 sampleMimeType = video/hevc @@ -65,4 +65,8 @@ track 256: time = 1133333 flags = 0 data = length 46, hash CE770A40 + sample 11: + time = 1266666 + flags = 0 + data = length 100, hash E3C60A69 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 c1481fc0be..f27ba066b5 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 563 - sample count = 6 + sample count = 7 format 0: id = 1/256 sampleMimeType = video/hevc @@ -45,4 +45,8 @@ track 256: time = 1133333 flags = 0 data = length 46, hash CE770A40 + sample 6: + time = 1266666 + flags = 0 + data = length 100, hash E3C60A69 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 accd73847b..c26b2935f1 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 @@ -8,7 +8,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 146 - sample count = 1 + sample count = 2 format 0: id = 1/256 sampleMimeType = video/hevc @@ -25,4 +25,8 @@ track 256: time = 1133333 flags = 0 data = length 46, hash CE770A40 + sample 1: + time = 1266666 + flags = 0 + data = length 100, hash E3C60A69 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 7e18985e7b..01023baaf2 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 @@ -5,7 +5,7 @@ seekMap: numberOfTracks = 1 track 256: total output bytes = 10004 - sample count = 15 + sample count = 16 format 0: id = 1/256 sampleMimeType = video/hevc @@ -78,4 +78,8 @@ track 256: time = 1133333 flags = 0 data = length 46, hash CE770A40 + sample 15: + time = 1266666 + flags = 0 + data = length 100, hash E3C60A69 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump b/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump index 66d93a45ac..f7bc02de02 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump @@ -980,6 +980,9 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000002416666 contents = length 1035, hash 324B27D0 input buffer #57: + timeUs = 1000002458322 + contents = length 788, hash 11292B64 + input buffer #58: timeUs = 0 flags = 4 contents = length 0, hash 1 @@ -1213,6 +1216,10 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000002416666 size = 1035 rendered = true + output buffer #57: + timeUs = 1000002458322 + size = 788 + rendered = true AudioSink: buffer count = 114 config: diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump index 34b4d19750..4a033c4a36 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump @@ -1,6 +1,6 @@ MediaCodecAdapter (exotest.video.avc): inputBuffers: - count = 3 + count = 4 input buffer #0: timeUs = 1000000066733 contents = length 12394, hash A39F5311 @@ -8,11 +8,14 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000100100 contents = length 813, hash 99F7B4FA input buffer #2: + timeUs = 1000000133466 + contents = length 443, hash 3F995B11 + input buffer #3: timeUs = 0 flags = 4 contents = length 0, hash 1 outputBuffers: - count = 2 + count = 3 output buffer #0: timeUs = 1000000066733 size = 12394 @@ -21,3 +24,7 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000100100 size = 813 rendered = true + output buffer #2: + timeUs = 1000000133466 + size = 443 + rendered = true diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump index 4aae982e35..bd7bc256be 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump @@ -37,7 +37,7 @@ MediaCodecAdapter (exotest.audio.mpegl2): rendered = false MediaCodecAdapter (exotest.video.avc): inputBuffers: - count = 3 + count = 4 input buffer #0: timeUs = 1000000066733 contents = length 12394, hash A39F5311 @@ -45,11 +45,14 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000100100 contents = length 813, hash 99F7B4FA input buffer #2: + timeUs = 1000000133466 + contents = length 443, hash 3F995B11 + input buffer #3: timeUs = 0 flags = 4 contents = length 0, hash 1 outputBuffers: - count = 2 + count = 3 output buffer #0: timeUs = 1000000066733 size = 12394 @@ -58,6 +61,10 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000100100 size = 813 rendered = true + output buffer #2: + timeUs = 1000000133466 + size = 443 + rendered = true AudioSink: buffer count = 4 config: diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump index a83a82169c..b47a10f66e 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump @@ -1,6 +1,6 @@ MediaCodecAdapter (exotest.video.avc): inputBuffers: - count = 3 + count = 4 input buffer #0: timeUs = 1000000066733 contents = length 11672, hash 476AEFF9 @@ -8,11 +8,14 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000133466 contents = length 524, hash 184416EF input buffer #2: + timeUs = 1000000100100 + contents = length 255, hash 6A68F67F + input buffer #3: timeUs = 0 flags = 4 contents = length 0, hash 1 outputBuffers: - count = 2 + count = 3 output buffer #0: timeUs = 1000000066733 size = 11672 @@ -21,3 +24,7 @@ MediaCodecAdapter (exotest.video.avc): timeUs = 1000000133466 size = 524 rendered = true + output buffer #2: + timeUs = 1000000100100 + size = 255 + rendered = true diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump index a49e443656..e67ecc7b58 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump @@ -1,6 +1,6 @@ MediaCodecAdapter (exotest.video.hevc): inputBuffers: - count = 30 + count = 31 input buffer #0: timeUs = 1000000066666 contents = length 2517, hash 85352308 @@ -89,11 +89,14 @@ MediaCodecAdapter (exotest.video.hevc): timeUs = 1000000933333 contents = length 87, hash EEC4D98C input buffer #29: + timeUs = 1000001000000 + contents = length 168, hash 717913A6 + input buffer #30: timeUs = 0 flags = 4 contents = length 0, hash 1 outputBuffers: - count = 29 + count = 30 output buffer #0: timeUs = 1000000066666 size = 2517 @@ -210,3 +213,7 @@ MediaCodecAdapter (exotest.video.hevc): timeUs = 1000000933333 size = 87 rendered = true + output buffer #29: + timeUs = 1000001000000 + size = 168 + rendered = true diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump index 66a5f49812..0c7d4d59ac 100644 --- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump +++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump @@ -1,6 +1,6 @@ MediaCodecAdapter (exotest.video.hevc): inputBuffers: - count = 16 + count = 17 input buffer #0: timeUs = 1000000266666 contents = length 7464, hash EBF8518B @@ -47,11 +47,14 @@ MediaCodecAdapter (exotest.video.hevc): timeUs = 1000001133333 contents = length 46, hash CE770A40 input buffer #15: + timeUs = 1000001266666 + contents = length 100, hash E3C60A69 + input buffer #16: timeUs = 0 flags = 4 contents = length 0, hash 1 outputBuffers: - count = 15 + count = 16 output buffer #0: timeUs = 1000000266666 size = 7464 @@ -112,3 +115,7 @@ MediaCodecAdapter (exotest.video.hevc): timeUs = 1000001133333 size = 46 rendered = true + output buffer #15: + timeUs = 1000001266666 + size = 100 + rendered = true