loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix condition to send dummy end of input and update dump files

Browse Source
This commit is contained in:
Rohit Singh 2024-03-27 19:09:50 +00:00
parent a7f5c3f5b6
commit 3cafb08a32
37 changed files with 203 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java
View File

@ -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);
}

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.3.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_dts_audio.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.3.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_no_access_unit_delimiters.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.unknown_length.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.0.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.1.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump
View File

@ -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

6
libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.unknown_length.dump
View File

@ -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

7
libraries/test_data/src/test/assets/playbackdumps/hls/cea608.dump
View File

@ -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:

11
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_dts_audio.ts.dump
View File

@ -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

11
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_mpeg_audio.ts.dump
View File

@ -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:

11
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h264_no_access_unit_delimiters.ts.dump
View File

@ -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

11
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265.ts.dump
View File

@ -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

11
libraries/test_data/src/test/assets/playbackdumps/ts/sample_h265_rps_pred.ts.dump
View File

@ -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