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

Merge pull request #1189 from v-novaltd:dsparano-exo245

Browse Source 
PiperOrigin-RevId: 629476777
This commit is contained in:
Copybara-Service 2024-04-30 11:31:53 -07:00
commit 6e8f3a8f97
62 changed files with 400 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASENOTES.md
View File

@ -20,6 +20,13 @@
count constraints as they only apply for playback.
* Track Selection:
* Extractors:
* MPEG-TS: Roll forward the change ensuring the last frame is rendered by
passing the last access unit of a stream to the sample queue
([#7909](https://github.com/google/ExoPlayer/issues/7909)).
Incorporating fixes to resolve the issues that emerged in I-frame only
HLS streams([#1150](https://github.com/google/ExoPlayer/issues/1150))
and H.262 HLS streams
([#1126](https://github.com/google/ExoPlayer/issues/1126)).
* Audio:
* Video:
* Text:

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

@ -159,7 +159,7 @@ public final class Ac3Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -161,7 +161,7 @@ public final class Ac4Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -194,7 +194,7 @@ public final class AdtsReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -215,7 +215,7 @@ public final class DtsReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -86,7 +86,7 @@ public final class DvbSubtitleReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
if (writingSample) {
// packetStarted method must be called before reading sample.
checkState(sampleTimeUs != C.TIME_UNSET);

4
libraries/extractor/src/main/java/androidx/media3/extractor/ts/ElementaryStreamReader.java
View File

@ -31,7 +31,7 @@ import androidx.media3.extractor.TrackOutput;
* <li>{@link #seek()} (optional, to reset the state)
* <li>{@link #packetStarted(long, int)} (to signal the start of a new packet)
* <li>{@link #consume(ParsableByteArray)} (zero or more times, to provide packet data)
* <li>{@link #packetFinished()} (to signal the end of the current packet)
* <li>{@link #packetFinished(boolean)} (to signal the end of the current packet)
* <li>Repeat steps 3-5 for subsequent packets
* </ol>
*/
@ -67,5 +67,5 @@ public interface ElementaryStreamReader {
void consume(ParsableByteArray data) throws ParserException;
/** Called when a packet ends. */
void packetFinished();
void packetFinished(boolean isEndOfInput);
}

9
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java
View File

@ -217,8 +217,13 @@ public final class H262Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
// Do nothing.
public void packetFinished(boolean isEndOfInput) {
checkStateNotNull(output); // Asserts that createTracks has been called.
if (isEndOfInput) {
@C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
int size = (int) (totalBytesWritten - samplePosition);
output.sampleMetadata(sampleTimeUs, flags, size, /* offset= */ 0, /* cryptoData= */ null);
}
}
/**

9
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java
View File

@ -216,8 +216,13 @@ public final class H263Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
// Do nothing.
public void packetFinished(boolean isEndOfInput) {
// Assert that createTracks has been called.
checkStateNotNull(sampleReader);
if (isEndOfInput) {
sampleReader.onDataEnd(totalBytesWritten, /* bytesWrittenPastPosition= */ 0, hasOutputFormat);
sampleReader.reset();
}
}
/**

21
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java
View File

@ -167,8 +167,11 @@ public final class H264Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
// Do nothing.
public void packetFinished(boolean isEndOfInput) {
assertTracksCreated();
if (isEndOfInput) {
sampleReader.end(totalBytesWritten);
}
}
@RequiresNonNull("sampleReader")
@ -491,12 +494,24 @@ public final class H264Reader implements ElementaryStreamReader {
sampleIsKeyframe = false;
readingSample = true;
}
setSampleIsKeyframe();
return sampleIsKeyframe;
}
public void end(long position) {
setSampleIsKeyframe();
// Output a final sample with the NAL units currently held
nalUnitStartPosition = position;
outputSample(/* offset= */ 0);
readingSample = false;
}
private void setSampleIsKeyframe() {
boolean treatIFrameAsKeyframe =
allowNonIdrKeyframes ? sliceHeader.isISlice() : randomAccessIndicator;
sampleIsKeyframe |=
nalUnitType == NalUnitUtil.NAL_UNIT_TYPE_IDR
|| (treatIFrameAsKeyframe && nalUnitType == NalUnitUtil.NAL_UNIT_TYPE_NON_IDR);
return sampleIsKeyframe;
}
private void outputSample(int offset) {

18
libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java
View File

@ -172,8 +172,11 @@ public final class H265Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
// Do nothing.
public void packetFinished(boolean isEndOfInput) {
assertTracksCreated();
if (isEndOfInput) {
sampleReader.end(totalBytesWritten);
}
}
@RequiresNonNull("sampleReader")
@ -374,6 +377,17 @@ public final class H265Reader implements ElementaryStreamReader {
}
}
public void end(long position) {
sampleIsKeyframe = nalUnitHasKeyframeData;
// Output a sample with the NAL units since the current nalUnitPosition
outputSample(/* offset= */ (int) (position - nalUnitPosition));
// Output a final sample with the remaining NAL units up to the passed position
samplePosition = nalUnitPosition;
nalUnitPosition = position;
outputSample(/* offset= */ 0);
readingSample = false;
}
private void outputSample(int offset) {
if (sampleTimeUs == C.TIME_UNSET) {
return;

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

@ -120,7 +120,7 @@ public final class Id3Reader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
Assertions.checkStateNotNull(output); // Asserts that createTracks has been called.
if (!writingSample || sampleSize == 0 || sampleBytesRead != sampleSize) {
return;

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

@ -153,7 +153,7 @@ public final class LatmReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -119,7 +119,7 @@ public final class MpegAudioReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -214,7 +214,7 @@ public final class MpeghReader implements ElementaryStreamReader {
}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
// Do nothing.
}

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

@ -107,7 +107,8 @@ public final class PesReader implements TsPayloadReader {
Log.w(TAG, "Unexpected start indicator: expected " + payloadSize + " more bytes");
}
// Either way, notify the reader that it has now finished.
reader.packetFinished();
boolean isEndOfInput = (data.limit() == 0);
reader.packetFinished(isEndOfInput);
break;
default:
throw new IllegalStateException();
@ -147,7 +148,8 @@ public final class PesReader implements TsPayloadReader {
if (payloadSize != C.LENGTH_UNSET) {
payloadSize -= readLength;
if (payloadSize == 0) {
reader.packetFinished();
// There are bytes left in data, see above, so this is not the end of input
reader.packetFinished(/* isEndOfInput= */ false);
setState(STATE_READING_HEADER);
}
}
@ -158,6 +160,22 @@ public final class PesReader implements TsPayloadReader {
}
}
/**
* Determines if the parser can consume a synthesized empty pusi.
*
* @param isModeHls {@code True} if operating in HLS (HTTP Live Streaming) mode, {@code false}
* otherwise.
*/
public boolean canConsumeSynthesizedEmptyPusi(boolean isModeHls) {
// Pusi only payload to trigger end of sample data is only applicable if
// pes does not have a length field and body is being read, another exclusion
// 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
&& !(isModeHls && reader instanceof H262Reader);
}
private void setState(int state) {
this.state = state;
bytesRead = 0;

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

@ -357,7 +357,7 @@ public final class PsExtractor implements Extractor {
pesPayloadReader.packetStarted(timeUs, TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR);
pesPayloadReader.consume(data);
// We always have complete PES packets with program stream.
pesPayloadReader.packetFinished();
pesPayloadReader.packetFinished(/* isEndOfInput= */ false);
}
private void parseHeader() {

13
libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsExtractor.java
View File

@ -425,8 +425,9 @@ public final class TsExtractor implements Extractor {
public @ReadResult int read(ExtractorInput input, PositionHolder seekPosition)
throws IOException {
long inputLength = input.getLength();
boolean isModeHls = mode == MODE_HLS;
if (tracksEnded) {
boolean canReadDuration = inputLength != C.LENGTH_UNSET && mode != MODE_HLS;
boolean canReadDuration = inputLength != C.LENGTH_UNSET && !isModeHls;
if (canReadDuration && !durationReader.isDurationReadFinished()) {
return durationReader.readDuration(input, seekPosition, pcrPid);
}
@ -447,6 +448,16 @@ public final class TsExtractor implements Extractor {
}
if (!fillBufferWithAtLeastOnePacket(input)) {
// Send a synthesized empty pusi to allow for packetFinished to be triggered on the last unit.
for (int i = 0; i < tsPayloadReaders.size(); i++) {
TsPayloadReader payloadReader = tsPayloadReaders.valueAt(i);
if (payloadReader instanceof PesReader) {
PesReader pesReader = (PesReader) payloadReader;
if (pesReader.canConsumeSynthesizedEmptyPusi(isModeHls)) {
pesReader.consume(new ParsableByteArray(), FLAG_PAYLOAD_UNIT_START_INDICATOR);
}
}
}
return RESULT_END_OF_INPUT;
}

2
libraries/extractor/src/test/java/androidx/media3/extractor/ts/TsExtractorTest.java
View File

@ -545,7 +545,7 @@ public final class TsExtractorTest {
public void consume(ParsableByteArray data) {}
@Override
public void packetFinished() {
public void packetFinished(boolean isEndOfInput) {
packetsRead++;
}

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 234, hash A48D3D90
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 234, hash A48D3D90
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 234, hash A48D3D90
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 234, hash A48D3D90
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 234, hash A48D3D90
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 442, hash A7367ECF
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 442, hash A7367ECF
track 257:
total output bytes = 18432
sample count = 9

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

@ -8,7 +8,7 @@ seekMap:
numberOfTracks = 1
track 256:
total output bytes = 207313
sample count = 29
sample count = 30
format 0:
id = 1/256
sampleMimeType = video/avc
@ -137,4 +137,8 @@ track 256:
time = 933333
flags = 1
data = length 7334, hash 614FA397
sample 29:
time = 966666
flags = 1
data = length 7287, hash A67CBA0A
tracksEnded = true

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

@ -8,7 +8,7 @@ seekMap:
numberOfTracks = 1
track 256:
total output bytes = 153789
sample count = 20
sample count = 21
format 0:
id = 1/256
sampleMimeType = video/avc
@ -101,4 +101,8 @@ track 256:
time = 933333
flags = 1
data = length 7334, hash 614FA397
sample 20:
time = 966666
flags = 1
data = length 7287, hash A67CBA0A
tracksEnded = true

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

@ -8,7 +8,7 @@ seekMap:
numberOfTracks = 1
track 256:
total output bytes = 87806
sample count = 11
sample count = 12
format 0:
id = 1/256
sampleMimeType = video/avc
@ -65,4 +65,8 @@ track 256:
time = 933333
flags = 1
data = length 7334, hash 614FA397
sample 11:
time = 966666
flags = 1
data = length 7287, hash A67CBA0A
tracksEnded = true

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

@ -8,7 +8,7 @@ seekMap:
numberOfTracks = 1
track 256:
total output bytes = 7288
sample count = 0
sample count = 1
format 0:
id = 1/256
sampleMimeType = video/avc
@ -21,4 +21,8 @@ track 256:
initializationData:
data = length 25, hash 8F89F820
data = length 8, hash 9BAAE288
sample 0:
time = 966666
flags = 1
data = length 7287, hash A67CBA0A
tracksEnded = true

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

@ -5,7 +5,7 @@ seekMap:
numberOfTracks = 1
track 256:
total output bytes = 207313
sample count = 29
sample count = 30
format 0:
id = 1/256
sampleMimeType = video/avc
@ -134,4 +134,8 @@ track 256:
time = 933333
flags = 1
data = length 7334, hash 614FA397
sample 29:
time = 966666
flags = 1
data = length 7287, hash A67CBA0A
tracksEnded = true

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 442, hash A7367ECF
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 442, hash A7367ECF
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 442, hash A7367ECF
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 442, hash A7367ECF
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 254, hash 36EBDA1
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 254, hash 36EBDA1
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 254, hash 36EBDA1
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 254, hash 36EBDA1
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 254, hash 36EBDA1
tracksEnded = true

10
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 = 31
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -137,4 +137,12 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
sample 29:
time = 1000000
flags = 0
data = length 7, hash 680F23CB
sample 30:
time = 1000000
flags = 0
data = length 160, hash 11EC03D0
tracksEnded = true

10
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 = 22
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -101,4 +101,12 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
sample 20:
time = 1000000
flags = 0
data = length 7, hash 680F23CB
sample 21:
time = 1000000
flags = 0
data = length 160, hash 11EC03D0
tracksEnded = true

10
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 = 13
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -65,4 +65,12 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
sample 11:
time = 1000000
flags = 0
data = length 7, hash 680F23CB
sample 12:
time = 1000000
flags = 0
data = length 160, hash 11EC03D0
tracksEnded = true

10
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 = 4
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -29,4 +29,12 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
sample 2:
time = 1000000
flags = 0
data = length 7, hash 680F23CB
sample 3:
time = 1000000
flags = 0
data = length 160, hash 11EC03D0
tracksEnded = true

10
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 = 31
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -134,4 +134,12 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
sample 29:
time = 1000000
flags = 0
data = length 7, hash 680F23CB
sample 30:
time = 1000000
flags = 0
data = length 160, hash 11EC03D0
tracksEnded = true

10
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 = 17
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -81,4 +81,12 @@ track 256:
time = 1133333
flags = 0
data = length 46, hash CE770A40
sample 15:
time = 1266666
flags = 0
data = length 7, hash 680F23CB
sample 16:
time = 1266666
flags = 0
data = length 92, hash 531EE3AD
tracksEnded = true

10
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 = 13
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -65,4 +65,12 @@ track 256:
time = 1133333
flags = 0
data = length 46, hash CE770A40
sample 11:
time = 1266666
flags = 0
data = length 7, hash 680F23CB
sample 12:
time = 1266666
flags = 0
data = length 92, hash 531EE3AD
tracksEnded = true

10
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 = 8
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -45,4 +45,12 @@ track 256:
time = 1133333
flags = 0
data = length 46, hash CE770A40
sample 6:
time = 1266666
flags = 0
data = length 7, hash 680F23CB
sample 7:
time = 1266666
flags = 0
data = length 92, hash 531EE3AD
tracksEnded = true

10
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 = 3
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -25,4 +25,12 @@ track 256:
time = 1133333
flags = 0
data = length 46, hash CE770A40
sample 1:
time = 1266666
flags = 0
data = length 7, hash 680F23CB
sample 2:
time = 1266666
flags = 0
data = length 92, hash 531EE3AD
tracksEnded = true

10
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 = 17
format 0:
id = 1/256
sampleMimeType = video/hevc
@ -78,4 +78,12 @@ track 256:
time = 1133333
flags = 0
data = length 46, hash CE770A40
sample 15:
time = 1266666
flags = 0
data = length 7, hash 680F23CB
sample 16:
time = 1266666
flags = 0
data = length 92, hash 531EE3AD
tracksEnded = true

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

@ -807,7 +807,7 @@ MediaCodecAdapter (exotest.audio.aac):
rendered = false
MediaCodecAdapter (exotest.video.avc):
inputBuffers:
count = 58
count = 59
input buffer #0:
timeUs = 1000000000000
contents = length 427, hash 45C53469
@ -980,11 +980,14 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000002416666
contents = length 1035, hash 324B27D0
input buffer #57:
timeUs = 1000002458322
contents = length 787, hash 1111D81C
input buffer #58:
timeUs = 0
flags = 4
contents = length 0, hash 1
outputBuffers:
count = 57
count = 58
output buffer #0:
timeUs = 1000000000000
size = 427
@ -1213,6 +1216,10 @@ MediaCodecAdapter (exotest.video.avc):
timeUs = 1000002416666
size = 1035
rendered = true
output buffer #57:
timeUs = 1000002458322
size = 787
rendered = true
AudioSink:
buffer count = 114
config:

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

@ -660,7 +660,7 @@ MediaCodecAdapter (exotest.audio.mpegl2):
rendered = false
MediaCodecAdapter (exotest.video.mpeg2):
inputBuffers:
count = 58
count = 59
input buffer #0:
timeUs = 1000000125000
contents = length 32732, hash 7B7C01FD
@ -833,11 +833,14 @@ MediaCodecAdapter (exotest.video.mpeg2):
timeUs = 1000002541666
contents = length 2738, hash 8F8FDE0A
input buffer #57:
timeUs = 1000002583333
contents = length 2970, hash 78651B41
input buffer #58:
timeUs = 0
flags = 4
contents = length 0, hash 1
outputBuffers:
count = 57
count = 58
output buffer #0:
timeUs = 1000000125000
size = 32732
@ -1066,6 +1069,10 @@ MediaCodecAdapter (exotest.video.mpeg2):
timeUs = 1000002541666
size = 2738
rendered = true
output buffer #57:
timeUs = 1000002583333
size = 2970
rendered = true
AudioSink:
buffer count = 93
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 442, hash A7367ECF
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 = 442
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 442, hash A7367ECF
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 = 442
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 254, hash 36EBDA1
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 = 254
rendered = true

18
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 = 32
input buffer #0:
timeUs = 1000000066666
contents = length 2517, hash 85352308
@ -89,11 +89,17 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 1000000933333
contents = length 87, hash EEC4D98C
input buffer #29:
timeUs = 1000001000000
contents = length 7, hash 680F23CB
input buffer #30:
timeUs = 1000001000000
contents = length 160, hash 11EC03D0
input buffer #31:
timeUs = 0
flags = 4
contents = length 0, hash 1
outputBuffers:
count = 29
count = 31
output buffer #0:
timeUs = 1000000066666
size = 2517
@ -210,3 +216,11 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 1000000933333
size = 87
rendered = true
output buffer #29:
timeUs = 1000001000000
size = 7
rendered = true
output buffer #30:
timeUs = 1000001000000
size = 160
rendered = true

18
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 = 18
input buffer #0:
timeUs = 1000000266666
contents = length 7464, hash EBF8518B
@ -47,11 +47,17 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 1000001133333
contents = length 46, hash CE770A40
input buffer #15:
timeUs = 1000001266666
contents = length 7, hash 680F23CB
input buffer #16:
timeUs = 1000001266666
contents = length 92, hash 531EE3AD
input buffer #17:
timeUs = 0
flags = 4
contents = length 0, hash 1
outputBuffers:
count = 15
count = 17
output buffer #0:
timeUs = 1000000266666
size = 7464
@ -112,3 +118,11 @@ MediaCodecAdapter (exotest.video.hevc):
timeUs = 1000001133333
size = 46
rendered = true
output buffer #15:
timeUs = 1000001266666
size = 7
rendered = true
output buffer #16:
timeUs = 1000001266666
size = 92
rendered = true

12
libraries/test_data/src/test/assets/transformerdumps/ts/sample_no_bframes.ts/transmuxed_with_inappmuxer.dump
View File

@ -7,8 +7,8 @@ seekMap:
getPosition(1065600) = [[timeUs=0, position=44]]
numberOfTracks = 2
track 0:
total output bytes = 287190
sample count = 29
total output bytes = 301430
sample count = 30
format 0:
id = 1
sampleMimeType = video/avc
@ -16,7 +16,7 @@ track 0:
maxInputSize = 22910
width = 1080
height = 720
frameRate = 31.042604
frameRate = 31.004547
colorInfo:
colorSpace = 1
colorRange = 2
@ -141,8 +141,12 @@ track 0:
data = length 20866, hash 219DA8C0
sample 28:
time = 934255
flags = 536870912
flags = 0
data = length 7215, hash A853B1A9
sample 29:
time = 967622
flags = 536870912
data = length 14240, hash 4EE77DF9
track 1:
total output bytes = 9529
sample count = 45