From a514548d0cf2b0ed2a0da0fff09ffbe60d37c5d7 Mon Sep 17 00:00:00 2001 From: Daniele Sparano Date: Wed, 24 Jan 2024 16:32:11 +0000 Subject: [PATCH] =?UTF-8?q?=EF=BB=BFMove=20TS=20binary=20search=20to=20usi?= =?UTF-8?q?ng=20DTS;=20fix=20PCR=20based=20duration;=20update=20and=20add?= =?UTF-8?q?=20dumps;=20add=20.gitattributes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extractor/ts/TsBinarySearchSeeker.java | 66 +++++------ .../media3/extractor/ts/TsDurationReader.java | 34 +++--- .../extractordumps/ts/sample_ac3.ts.0.dump | 6 +- .../extractordumps/ts/sample_ac3.ts.1.dump | 22 ++-- .../extractordumps/ts/sample_ac3.ts.2.dump | 20 +--- .../extractordumps/ts/sample_ac3.ts.3.dump | 6 +- .../extractordumps/ts/sample_ac4.ts.0.dump | 6 +- .../extractordumps/ts/sample_ac4.ts.1.dump | 36 +++--- .../extractordumps/ts/sample_ac4.ts.2.dump | 24 ++-- .../extractordumps/ts/sample_ac4.ts.3.dump | 6 +- .../extractordumps/ts/sample_ait.ts.0.dump | 7 +- .../extractordumps/ts/sample_ait.ts.1.dump | 61 ++++++++++ .../extractordumps/ts/sample_ait.ts.2.dump | 57 ++++++++++ .../extractordumps/ts/sample_ait.ts.3.dump | 25 +++++ .../extractordumps/ts/sample_eac3.ts.0.dump | 6 +- .../extractordumps/ts/sample_eac3.ts.1.dump | 104 +++++++----------- .../extractordumps/ts/sample_eac3.ts.2.dump | 68 ++++-------- .../extractordumps/ts/sample_eac3.ts.3.dump | 6 +- .../ts/sample_eac3joc.ts.0.dump | 6 +- .../ts/sample_eac3joc.ts.1.dump | 98 ++++++++--------- .../ts/sample_eac3joc.ts.2.dump | 56 +++++----- .../ts/sample_eac3joc.ts.3.dump | 16 ++- .../ts/sample_h262_mpeg_audio.ps.2.dump | 6 +- .../ts/sample_h262_mpeg_audio.ps.3.dump | 6 +- ...ple_h262_mpeg_audio.ps.unknown_length.dump | 8 +- .../ts/sample_h262_mpeg_audio.ts.0.dump | 12 +- .../ts/sample_h262_mpeg_audio.ts.1.dump | 12 +- .../ts/sample_h262_mpeg_audio.ts.2.dump | 22 ++-- .../ts/sample_h262_mpeg_audio.ts.3.dump | 6 +- ...ple_h262_mpeg_audio.ts.unknown_length.dump | 6 +- .../extractordumps/ts/sample_h263.ts.0.dump | 6 +- .../extractordumps/ts/sample_h263.ts.1.dump | 6 +- .../extractordumps/ts/sample_h263.ts.2.dump | 30 ++--- .../extractordumps/ts/sample_h263.ts.3.dump | 6 +- .../extractordumps/ts/sample_h264.ts.0.dump | 26 ++--- .../extractordumps/ts/sample_h264.ts.1.dump | 66 +++++------ .../extractordumps/ts/sample_h264.ts.2.dump | 42 +++---- .../extractordumps/ts/sample_h264.ts.3.dump | 18 ++- .../ts/sample_h264.ts.unknown_length.dump | 20 ++-- .../ts/sample_h264_dts_audio.ts.0.dump | 18 +-- ...mple_h264_dts_audio.ts.unknown_length.dump | 12 +- .../ts/sample_h264_mpeg_audio.ts.0.dump | 12 +- .../ts/sample_h264_mpeg_audio.ts.1.dump | 12 +- .../ts/sample_h264_mpeg_audio.ts.2.dump | 22 ++-- .../ts/sample_h264_mpeg_audio.ts.3.dump | 6 +- ...ple_h264_mpeg_audio.ts.unknown_length.dump | 6 +- ...e_h264_no_access_unit_delimiters.ts.0.dump | 10 +- ...e_h264_no_access_unit_delimiters.ts.1.dump | 10 +- ...e_h264_no_access_unit_delimiters.ts.2.dump | 26 ++--- ...e_h264_no_access_unit_delimiters.ts.3.dump | 6 +- ...ess_unit_delimiters.ts.unknown_length.dump | 4 +- .../extractordumps/ts/sample_h265.ts.0.dump | 26 ++--- .../ts/sample_h265.ts.unknown_length.dump | 20 ++-- .../ts/sample_h265_rps_pred.ts.0.dump | 18 +-- .../ts/sample_h265_rps_pred.ts.1.dump | 14 +-- ...ample_h265_rps_pred.ts.unknown_length.dump | 12 +- .../extractordumps/ts/sample_latm.ts.0.dump | 7 +- .../extractordumps/ts/sample_scte35.ts.0.dump | 18 +-- .../extractordumps/ts/sample_scte35.ts.1.dump | 18 +-- .../extractordumps/ts/sample_scte35.ts.2.dump | 38 ++----- .../extractordumps/ts/sample_scte35.ts.3.dump | 6 +- .../ts/sample_scte35.ts.unknown_length.dump | 12 +- .../extractordumps/ts/sample_with_junk.0.dump | 12 +- .../extractordumps/ts/sample_with_junk.1.dump | 12 +- .../extractordumps/ts/sample_with_junk.2.dump | 22 ++-- .../extractordumps/ts/sample_with_junk.3.dump | 6 +- .../ts/sample_with_junk.unknown_length.dump | 6 +- .../src/test/assets/media/ssa/.gitattributes | 1 + .../test/assets/media/subrip/.gitattributes | 1 + .../androidx/media3/test/utils/TestUtil.java | 1 + 70 files changed, 745 insertions(+), 683 deletions(-) create mode 100644 libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.1.dump create mode 100644 libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.2.dump create mode 100644 libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.3.dump create mode 100644 libraries/test_data/src/test/assets/media/ssa/.gitattributes create mode 100644 libraries/test_data/src/test/assets/media/subrip/.gitattributes diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsBinarySearchSeeker.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsBinarySearchSeeker.java index 4d21386eccc..0690f5a25e3 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsBinarySearchSeeker.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsBinarySearchSeeker.java @@ -28,10 +28,10 @@ /** * A seeker that supports seeking within TS stream using binary search. * - *

This seeker uses the first and last PCR values within the stream, as well as the stream - * duration to interpolate the PCR value of the seeking position. Then it performs binary search - * within the stream to find a packets whose PCR value is within {@link #SEEK_TOLERANCE_US} from the - * target PCR. + *

This seeker uses the first and last DTS values within the stream, as well as the stream + * duration to interpolate the DTS value of the seeking position. Then it performs binary search + * within the stream to find a packets whose DTS value is within {@link #SEEK_TOLERANCE_US} from the + * target DTS. */ /* package */ final class TsBinarySearchSeeker extends BinarySearchSeeker { @@ -39,14 +39,14 @@ private static final int MINIMUM_SEARCH_RANGE_BYTES = 5 * TsExtractor.TS_PACKET_SIZE; public TsBinarySearchSeeker( - TimestampAdjuster pcrTimestampAdjuster, + TimestampAdjuster timestampAdjuster, long streamDurationUs, long inputLength, - int pcrPid, + int selectedPid, int timestampSearchBytes) { super( new DefaultSeekTimestampConverter(), - new TsPcrSeeker(pcrPid, pcrTimestampAdjuster, timestampSearchBytes), + new TsTimestampSeeker(selectedPid, timestampAdjuster, timestampSearchBytes), streamDurationUs, /* floorTimePosition= */ 0, /* ceilingTimePosition= */ streamDurationUs + 1, @@ -57,25 +57,25 @@ public TsBinarySearchSeeker( } /** - * A {@link TimestampSeeker} implementation that looks for a given PCR timestamp at a given + * A {@link TimestampSeeker} implementation that looks for a given DTS timestamp at a given * position in a TS stream. * - *

Given a PCR timestamp, and a position within a TS stream, this seeker will peek up to {@link + *

Given a DTS timestamp, and a position within a TS stream, this seeker will peek up to {@link * #timestampSearchBytes} from that stream position, look for all packets with PID equal to - * PCR_PID, and then compare the PCR timestamps (if available) of these packets to the target + * SELECTED_PID, and then compare the DTS timestamps (if available) of these packets to the target * timestamp. */ - private static final class TsPcrSeeker implements TimestampSeeker { + private static final class TsTimestampSeeker implements TimestampSeeker { - private final TimestampAdjuster pcrTimestampAdjuster; + private final TimestampAdjuster timestampAdjuster; private final ParsableByteArray packetBuffer; - private final int pcrPid; + private final int selectedPid; private final int timestampSearchBytes; - public TsPcrSeeker( - int pcrPid, TimestampAdjuster pcrTimestampAdjuster, int timestampSearchBytes) { - this.pcrPid = pcrPid; - this.pcrTimestampAdjuster = pcrTimestampAdjuster; + public TsTimestampSeeker( + int selectedPid, TimestampAdjuster timestampAdjuster, int timestampSearchBytes) { + this.selectedPid = selectedPid; + this.timestampAdjuster = timestampAdjuster; this.timestampSearchBytes = timestampSearchBytes; packetBuffer = new ParsableByteArray(); } @@ -89,16 +89,16 @@ public TimestampSearchResult searchForTimestamp(ExtractorInput input, long targe packetBuffer.reset(bytesToSearch); input.peekFully(packetBuffer.getData(), /* offset= */ 0, bytesToSearch); - return searchForPcrValueInBuffer(packetBuffer, targetTimestamp, inputPosition); + return searchForDtsValueInBuffer(packetBuffer, targetTimestamp, inputPosition); } - private TimestampSearchResult searchForPcrValueInBuffer( - ParsableByteArray packetBuffer, long targetPcrTimeUs, long bufferStartOffset) { + private TimestampSearchResult searchForDtsValueInBuffer( + ParsableByteArray packetBuffer, long targetDtsTimeUs, long bufferStartOffset) { int limit = packetBuffer.limit(); long startOfLastPacketPosition = C.INDEX_UNSET; long endOfLastPacketPosition = C.INDEX_UNSET; - long lastPcrTimeUsInRange = C.TIME_UNSET; + long lastDtsTimeUsInRange = C.TIME_UNSET; while (packetBuffer.bytesLeft() >= TsExtractor.TS_PACKET_SIZE) { int startOfPacket = @@ -107,34 +107,34 @@ private TimestampSearchResult searchForPcrValueInBuffer( if (endOfPacket > limit) { break; } - long pcrValue = TsUtil.readPcrFromPacket(packetBuffer, startOfPacket, pcrPid); - if (pcrValue != C.TIME_UNSET) { - long pcrTimeUs = pcrTimestampAdjuster.adjustTsTimestamp(pcrValue); - if (pcrTimeUs > targetPcrTimeUs) { - if (lastPcrTimeUsInRange == C.TIME_UNSET) { - // First PCR timestamp is already over target. - return TimestampSearchResult.overestimatedResult(pcrTimeUs, bufferStartOffset); + long dtsValue = TsUtil.readDtsFromPacket(packetBuffer, startOfPacket, selectedPid); + if (dtsValue != C.TIME_UNSET) { + long dtsTimeUs = timestampAdjuster.adjustTsTimestamp(dtsValue); + if (dtsTimeUs > targetDtsTimeUs) { + if (lastDtsTimeUsInRange == C.TIME_UNSET) { + // First DTS timestamp is already over target. + return TimestampSearchResult.overestimatedResult(dtsTimeUs, bufferStartOffset); } else { - // Last PCR timestamp < target timestamp < this timestamp. + // Last DTS timestamp < target timestamp < this timestamp. return TimestampSearchResult.targetFoundResult( bufferStartOffset + startOfLastPacketPosition); } - } else if (pcrTimeUs + SEEK_TOLERANCE_US > targetPcrTimeUs) { + } else if (dtsTimeUs + SEEK_TOLERANCE_US > targetDtsTimeUs) { long startOfPacketInStream = bufferStartOffset + startOfPacket; return TimestampSearchResult.targetFoundResult(startOfPacketInStream); } - lastPcrTimeUsInRange = pcrTimeUs; + lastDtsTimeUsInRange = dtsTimeUs; startOfLastPacketPosition = startOfPacket; } packetBuffer.setPosition(endOfPacket); endOfLastPacketPosition = endOfPacket; } - if (lastPcrTimeUsInRange != C.TIME_UNSET) { + if (lastDtsTimeUsInRange != C.TIME_UNSET) { long endOfLastPacketPositionInStream = bufferStartOffset + endOfLastPacketPosition; return TimestampSearchResult.underestimatedResult( - lastPcrTimeUsInRange, endOfLastPacketPositionInStream); + lastDtsTimeUsInRange, endOfLastPacketPositionInStream); } else { return TimestampSearchResult.NO_TIMESTAMP_IN_RANGE_RESULT; } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsDurationReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsDurationReader.java index 8fc9c30071d..9827983c3e5 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsDurationReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsDurationReader.java @@ -16,6 +16,7 @@ package androidx.media3.extractor.ts; import static java.lang.Math.min; +import static java.lang.Math.max; import androidx.media3.common.C; import androidx.media3.common.util.ParsableByteArray; @@ -61,6 +62,7 @@ private long secondDtsValue; private long lastDtsValue; + private int firstPcrPosition; private int firstDtsPosition; private long durationUs; @@ -73,6 +75,7 @@ firstDtsValue = C.TIME_UNSET; secondDtsValue = C.TIME_UNSET; lastDtsValue = C.TIME_UNSET; + firstPcrPosition = C.INDEX_UNSET; firstDtsPosition = C.INDEX_UNSET; durationUs = C.TIME_UNSET; packetBuffer = new ParsableByteArray(); @@ -126,17 +129,17 @@ public boolean isDurationReadFinished() { isDurationReadFromPcr = true; return Extractor.RESULT_CONTINUE; } - if (!isLastPcrValueRead) { - return readLastPcrValue(input, seekPositionHolder, pcrPid); + if (!isFirstPcrValueRead) { + return readFirstPcrValue(input, seekPositionHolder, pcrPid); } - if (lastPcrValue == C.TIME_UNSET) { + if (firstPcrValue == C.TIME_UNSET) { isDurationReadFromPcr = true; return Extractor.RESULT_CONTINUE; } - if (!isFirstPcrValueRead) { - return readFirstPcrValue(input, seekPositionHolder, pcrPid); + if (!isLastPcrValueRead) { + return readLastPcrValue(input, seekPositionHolder, pcrPid); } - if (firstPcrValue == C.TIME_UNSET) { + if (lastPcrValue == C.TIME_UNSET) { isDurationReadFromPcr = true; return Extractor.RESULT_CONTINUE; } @@ -171,13 +174,6 @@ public boolean isDurationReadFinished() { isDurationReadFromDts = true; return Extractor.RESULT_CONTINUE; } - if (!isLastDtsValueRead) { - return readLastDtsValue(input, seekPositionHolder, pesPid); - } - if (lastDtsValue == C.TIME_UNSET) { - isDurationReadFromDts = true; - return Extractor.RESULT_CONTINUE; - } if (!isFirstDtsValueRead) { return readFirstDtsValue(input, seekPositionHolder, pesPid); } @@ -192,6 +188,13 @@ public boolean isDurationReadFinished() { isDurationReadFromDts = true; return Extractor.RESULT_CONTINUE; } + if (!isLastDtsValueRead) { + return readLastDtsValue(input, seekPositionHolder, pesPid); + } + if (lastDtsValue == C.TIME_UNSET) { + isDurationReadFromDts = true; + return Extractor.RESULT_CONTINUE; + } long firstDtsPositionUs = timestampAdjuster.adjustTsTimestamp(firstDtsValue); long secondDtsPositionUs = timestampAdjuster.adjustTsTimestamp(secondDtsValue); @@ -256,6 +259,7 @@ private long readFirstPcrValueFromBuffer(ParsableByteArray packetBuffer, int pcr } long pcrValue = TsUtil.readPcrFromPacket(packetBuffer, searchPosition, pcrPid); if (pcrValue != C.TIME_UNSET) { + firstPcrPosition = packetBuffer.getPosition(); return pcrValue; } } @@ -265,7 +269,7 @@ private long readFirstPcrValueFromBuffer(ParsableByteArray packetBuffer, int pcr private int readLastPcrValue(ExtractorInput input, PositionHolder seekPositionHolder, int pcrPid) throws IOException { long inputLength = input.getLength(); - int bytesToSearch = (int) min(timestampSearchBytes, inputLength); + int bytesToSearch = (int) min(timestampSearchBytes, inputLength - firstPcrPosition); long searchStartPosition = inputLength - bytesToSearch; if (input.getPosition() != searchStartPosition) { seekPositionHolder.position = searchStartPosition; @@ -358,7 +362,7 @@ private int readSecondDtsValue(ExtractorInput input, PositionHolder seekPosition private int readLastDtsValue(ExtractorInput input, PositionHolder seekPositionHolder, int pesPid) throws IOException { long inputLength = input.getLength(); - int bytesToSearch = (int) min(timestampSearchBytes, inputLength); + int bytesToSearch = (int) min(timestampSearchBytes, inputLength - firstDtsPosition); long searchStartPosition = inputLength - bytesToSearch; if (input.getPosition() != searchStartPosition) { seekPositionHolder.position = searchStartPosition; diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump index f3ac4e2018c..29b3d8e95fd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 252977 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(126488) = [[timeUs=126488, position=9099]] - getPosition(252977) = [[timeUs=252977, position=18386]] + getPosition(144000) = [[timeUs=144000, position=9099]] + getPosition(288000) = [[timeUs=288000, position=18386]] numberOfTracks = 1 track 1900: total output bytes = 13281 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump index 9f141492b2a..5742e9fb928 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.1.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 252977 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(126488) = [[timeUs=126488, position=9099]] - getPosition(252977) = [[timeUs=252977, position=18386]] + getPosition(144000) = [[timeUs=144000, position=9099]] + getPosition(288000) = [[timeUs=288000, position=18386]] numberOfTracks = 1 track 1900: - total output bytes = 10209 - sample count = 6 + total output bytes = 8673 + sample count = 5 format 0: averageBitrate = 384000 peakBitrate = 384000 @@ -17,26 +17,22 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: - time = 96000 - flags = 1 - data = length 1536, hash 5D09685 - sample 1: time = 128000 flags = 1 data = length 1536, hash A9A24E44 - sample 2: + sample 1: time = 160000 flags = 1 data = length 1536, hash 6F856273 - sample 3: + sample 2: time = 192000 flags = 1 data = length 1536, hash B1737D3C - sample 4: + sample 3: time = 224000 flags = 1 data = length 1536, hash 98FDEB9D - sample 5: + sample 4: time = 256000 flags = 1 data = length 1536, hash 99B9B943 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump index e6cea3993f0..6384316b6d2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 252977 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(126488) = [[timeUs=126488, position=9099]] - getPosition(252977) = [[timeUs=252977, position=18386]] + getPosition(144000) = [[timeUs=144000, position=9099]] + getPosition(288000) = [[timeUs=288000, position=18386]] numberOfTracks = 1 track 1900: - total output bytes = 7137 - sample count = 4 + total output bytes = 4065 + sample count = 2 format 0: averageBitrate = 384000 peakBitrate = 384000 @@ -17,18 +17,10 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: - time = 160000 - flags = 1 - data = length 1536, hash 6F856273 - sample 1: - time = 192000 - flags = 1 - data = length 1536, hash B1737D3C - sample 2: time = 224000 flags = 1 data = length 1536, hash 98FDEB9D - sample 3: + sample 1: time = 256000 flags = 1 data = length 1536, hash 99B9B943 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump index da9814ead36..17d27649af0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 252977 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(126488) = [[timeUs=126488, position=9099]] - getPosition(252977) = [[timeUs=252977, position=18386]] + getPosition(144000) = [[timeUs=144000, position=9099]] + getPosition(288000) = [[timeUs=288000, position=18386]] numberOfTracks = 1 track 1900: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump index 80978a84838..96118e3ebc7 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 796888 + duration = 760000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(398444) = [[timeUs=398444, position=13385]] - getPosition(796888) = [[timeUs=796888, position=26959]] + getPosition(380000) = [[timeUs=380000, position=13385]] + getPosition(760000) = [[timeUs=760000, position=26959]] numberOfTracks = 1 track 1900: total output bytes = 7594 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump index f9bb28919c4..33290180feb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.1.dump @@ -1,64 +1,68 @@ seekMap: isSeekable = true - duration = 796888 + duration = 760000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(398444) = [[timeUs=398444, position=13385]] - getPosition(796888) = [[timeUs=796888, position=26959]] + getPosition(380000) = [[timeUs=380000, position=13385]] + getPosition(760000) = [[timeUs=760000, position=26959]] numberOfTracks = 1 track 1900: - total output bytes = 5032 - sample count = 12 + total output bytes = 5398 + sample count = 13 format 0: id = 1/1900 sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 sample 0: + time = 240000 + flags = 1 + data = length 366, hash E24F2490 + sample 1: time = 280000 flags = 1 data = length 366, hash EE6F1F06 - sample 1: + sample 2: time = 320000 flags = 1 data = length 366, hash 2DAB000F - sample 2: + sample 3: time = 360000 flags = 1 data = length 366, hash 8102B7EC - sample 3: + sample 4: time = 400000 flags = 1 data = length 366, hash 55BF59AC - sample 4: + sample 5: time = 440000 flags = 1 data = length 494, hash CBC2E09F - sample 5: + sample 6: time = 480000 flags = 1 data = length 519, hash 9DAF56E9 - sample 6: + sample 7: time = 520000 flags = 1 data = length 598, hash 8169EE2 - sample 7: + sample 8: time = 560000 flags = 1 data = length 435, hash 28C21246 - sample 8: + sample 9: time = 600000 flags = 1 data = length 365, hash FF14716D - sample 9: + sample 10: time = 640000 flags = 1 data = length 392, hash 4CC96B29 - sample 10: + sample 11: time = 680000 flags = 1 data = length 373, hash D7AC6D4E - sample 11: + sample 12: time = 720000 flags = 1 data = length 392, hash 99F2511F diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump index 3c90f502a52..e2d38005efc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.2.dump @@ -1,40 +1,44 @@ seekMap: isSeekable = true - duration = 796888 + duration = 760000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(398444) = [[timeUs=398444, position=13385]] - getPosition(796888) = [[timeUs=796888, position=26959]] + getPosition(380000) = [[timeUs=380000, position=13385]] + getPosition(760000) = [[timeUs=760000, position=26959]] numberOfTracks = 1 track 1900: - total output bytes = 2555 - sample count = 6 + total output bytes = 3074 + sample count = 7 format 0: id = 1/1900 sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 sample 0: + time = 480000 + flags = 1 + data = length 519, hash 9DAF56E9 + sample 1: time = 520000 flags = 1 data = length 598, hash 8169EE2 - sample 1: + sample 2: time = 560000 flags = 1 data = length 435, hash 28C21246 - sample 2: + sample 3: time = 600000 flags = 1 data = length 365, hash FF14716D - sample 3: + sample 4: time = 640000 flags = 1 data = length 392, hash 4CC96B29 - sample 4: + sample 5: time = 680000 flags = 1 data = length 373, hash D7AC6D4E - sample 5: + sample 6: time = 720000 flags = 1 data = length 392, hash 99F2511F diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump index 87199300c79..b384141a86b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 796888 + duration = 760000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(398444) = [[timeUs=398444, position=13385]] - getPosition(796888) = [[timeUs=796888, position=26959]] + getPosition(380000) = [[timeUs=380000, position=13385]] + getPosition(760000) = [[timeUs=760000, position=26959]] numberOfTracks = 1 track 1900: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump index 3a305ed6620..fed01c8c8c5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.0.dump @@ -1,7 +1,10 @@ seekMap: - isSeekable = false - duration = UNSET TIME + isSeekable = true + duration = 768000 getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(384000) = [[timeUs=384000, position=14136]] + getPosition(768000) = [[timeUs=768000, position=28460]] numberOfTracks = 2 track 330: total output bytes = 9928 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.1.dump new file mode 100644 index 00000000000..29619f9d356 --- /dev/null +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.1.dump @@ -0,0 +1,61 @@ +seekMap: + isSeekable = true + duration = 768000 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(384000) = [[timeUs=384000, position=14136]] + getPosition(768000) = [[timeUs=768000, position=28460]] +numberOfTracks = 2 +track 330: + total output bytes = 3784 + sample count = 7 + format 0: + peakBitrate = 128000 + id = 1031/330 + sampleMimeType = audio/eac3 + channelCount = 2 + sampleRate = 48000 + language = fr + sample 0: + time = 384000 + flags = 1 + data = length 512, hash 157489A0 + sample 1: + time = 416000 + flags = 1 + data = length 512, hash A37CB66E + sample 2: + time = 448000 + flags = 1 + data = length 512, hash 932F07D4 + sample 3: + time = 480000 + flags = 1 + data = length 512, hash 91F50161 + sample 4: + time = 512000 + flags = 1 + data = length 512, hash 7F9D6CCB + sample 5: + time = 544000 + flags = 1 + data = length 512, hash 3955F015 + sample 6: + time = 576000 + flags = 1 + data = length 512, hash A8E5C938 +track 370: + total output bytes = 942 + sample count = 2 + format 0: + sampleMimeType = application/vnd.dvb.ait + subsampleOffsetUs = -43622564033 + sample 0: + time = 576000 + flags = 1 + data = length 471, hash B189052F + sample 1: + time = 384000 + flags = 1 + data = length 471, hash B189052F +tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.2.dump new file mode 100644 index 00000000000..39abb265b78 --- /dev/null +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.2.dump @@ -0,0 +1,57 @@ +seekMap: + isSeekable = true + duration = 768000 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(384000) = [[timeUs=384000, position=14136]] + getPosition(768000) = [[timeUs=768000, position=28460]] +numberOfTracks = 2 +track 330: + total output bytes = 3784 + sample count = 7 + format 0: + peakBitrate = 128000 + id = 1031/330 + sampleMimeType = audio/eac3 + channelCount = 2 + sampleRate = 48000 + language = fr + sample 0: + time = 384000 + flags = 1 + data = length 512, hash 157489A0 + sample 1: + time = 416000 + flags = 1 + data = length 512, hash A37CB66E + sample 2: + time = 448000 + flags = 1 + data = length 512, hash 932F07D4 + sample 3: + time = 480000 + flags = 1 + data = length 512, hash 91F50161 + sample 4: + time = 512000 + flags = 1 + data = length 512, hash 7F9D6CCB + sample 5: + time = 544000 + flags = 1 + data = length 512, hash 3955F015 + sample 6: + time = 576000 + flags = 1 + data = length 512, hash A8E5C938 +track 370: + total output bytes = 471 + sample count = 1 + format 0: + sampleMimeType = application/vnd.dvb.ait + subsampleOffsetUs = -43622564033 + sample 0: + time = 384000 + flags = 1 + data = length 471, hash B189052F +tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.3.dump new file mode 100644 index 00000000000..f3c50ef5551 --- /dev/null +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.3.dump @@ -0,0 +1,25 @@ +seekMap: + isSeekable = true + duration = 768000 + getPosition(0) = [[timeUs=0, position=0]] + getPosition(1) = [[timeUs=1, position=0]] + getPosition(384000) = [[timeUs=384000, position=14136]] + getPosition(768000) = [[timeUs=768000, position=28460]] +numberOfTracks = 2 +track 330: + total output bytes = 0 + sample count = 0 + format 0: + peakBitrate = 128000 + id = 1031/330 + sampleMimeType = audio/eac3 + channelCount = 2 + sampleRate = 48000 + language = fr +track 370: + total output bytes = 0 + sample count = 0 + format 0: + sampleMimeType = application/vnd.dvb.ait + subsampleOffsetUs = -43622564033 +tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump index 2ccaceef7fc..d87e8769e1c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 250077 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(125038) = [[timeUs=125038, position=109918]] - getPosition(250077) = [[timeUs=250077, position=220025]] + getPosition(144000) = [[timeUs=144000, position=109918]] + getPosition(288000) = [[timeUs=288000, position=220025]] numberOfTracks = 1 track 1900: total output bytes = 216000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump index ccf162fc315..c5636e95933 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.1.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 250077 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(125038) = [[timeUs=125038, position=109918]] - getPosition(250077) = [[timeUs=250077, position=220025]] + getPosition(144000) = [[timeUs=144000, position=109918]] + getPosition(288000) = [[timeUs=288000, position=220025]] numberOfTracks = 1 track 1900: - total output bytes = 168000 - sample count = 42 + total output bytes = 144000 + sample count = 36 format 0: peakBitrate = 6000000 id = 1/1900 @@ -16,170 +16,146 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: - time = 64000 - flags = 1 - data = length 4000, hash 1D5E6AAC - sample 1: - time = 69333 - flags = 1 - data = length 4000, hash 30058F51 - sample 2: - time = 74666 - flags = 1 - data = length 4000, hash 15DD0E4A - sample 3: - time = 79999 - flags = 1 - data = length 4000, hash 37BE7C15 - sample 4: - time = 85332 - flags = 1 - data = length 4000, hash 7CFDD34B - sample 5: - time = 90665 - flags = 1 - data = length 4000, hash 27F20D29 - sample 6: time = 96000 flags = 1 data = length 4000, hash 6F565894 - sample 7: + sample 1: time = 101333 flags = 1 data = length 4000, hash A6F07C4A - sample 8: + sample 2: time = 106666 flags = 1 data = length 4000, hash 3A0CA15C - sample 9: + sample 3: time = 111999 flags = 1 data = length 4000, hash DB365414 - sample 10: + sample 4: time = 117332 flags = 1 data = length 4000, hash 31E08469 - sample 11: + sample 5: time = 122665 flags = 1 data = length 4000, hash 315F5C28 - sample 12: + sample 6: time = 128000 flags = 1 data = length 4000, hash CC65DF80 - sample 13: + sample 7: time = 133333 flags = 1 data = length 4000, hash 503FB64C - sample 14: + sample 8: time = 138666 flags = 1 data = length 4000, hash 817CF735 - sample 15: + sample 9: time = 143999 flags = 1 data = length 4000, hash 37391ADA - sample 16: + sample 10: time = 149332 flags = 1 data = length 4000, hash 37391ADA - sample 17: + sample 11: time = 154665 flags = 1 data = length 4000, hash 64DBF751 - sample 18: + sample 12: time = 160000 flags = 1 data = length 4000, hash 81AE828E - sample 19: + sample 13: time = 165333 flags = 1 data = length 4000, hash 767D6C98 - sample 20: + sample 14: time = 170666 flags = 1 data = length 4000, hash A5F6D4E - sample 21: + sample 15: time = 175999 flags = 1 data = length 4000, hash EABC6B0D - sample 22: + sample 16: time = 181332 flags = 1 data = length 4000, hash F47EF742 - sample 23: + sample 17: time = 186665 flags = 1 data = length 4000, hash 9B2549DA - sample 24: + sample 18: time = 192000 flags = 1 data = length 4000, hash A12733C9 - sample 25: + sample 19: time = 197333 flags = 1 data = length 4000, hash 95F62E99 - sample 26: + sample 20: time = 202666 flags = 1 data = length 4000, hash A4D858 - sample 27: + sample 21: time = 207999 flags = 1 data = length 4000, hash A4D858 - sample 28: + sample 22: time = 213332 flags = 1 data = length 4000, hash 22C1A129 - sample 29: + sample 23: time = 218665 flags = 1 data = length 4000, hash 2C51E4A1 - sample 30: + sample 24: time = 224000 flags = 1 data = length 4000, hash 3782E8BB - sample 31: + sample 25: time = 229333 flags = 1 data = length 4000, hash 2C51E4A1 - sample 32: + sample 26: time = 234666 flags = 1 data = length 4000, hash BDB3D129 - sample 33: + sample 27: time = 239999 flags = 1 data = length 4000, hash F642A55 - sample 34: + sample 28: time = 245332 flags = 1 data = length 4000, hash 32F259F4 - sample 35: + sample 29: time = 250665 flags = 1 data = length 4000, hash 4C987B7C - sample 36: + sample 30: time = 256000 flags = 1 data = length 4000, hash 57C98E1C - sample 37: + sample 31: time = 261333 flags = 1 data = length 4000, hash 4C987B7C - sample 38: + sample 32: time = 266666 flags = 1 data = length 4000, hash 4C987B7C - sample 39: + sample 33: time = 271999 flags = 1 data = length 4000, hash 4C987B7C - sample 40: + sample 34: time = 277332 flags = 1 data = length 4000, hash 4C987B7C - sample 41: + sample 35: time = 282665 flags = 1 data = length 4000, hash 4C987B7C diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump index 286fc25b16d..957cfd3866e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 250077 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(125038) = [[timeUs=125038, position=109918]] - getPosition(250077) = [[timeUs=250077, position=220025]] + getPosition(144000) = [[timeUs=144000, position=109918]] + getPosition(288000) = [[timeUs=288000, position=220025]] numberOfTracks = 1 track 1900: - total output bytes = 96000 - sample count = 24 + total output bytes = 72000 + sample count = 18 format 0: peakBitrate = 6000000 id = 1/1900 @@ -16,98 +16,74 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: - time = 160000 - flags = 1 - data = length 4000, hash 81AE828E - sample 1: - time = 165333 - flags = 1 - data = length 4000, hash 767D6C98 - sample 2: - time = 170666 - flags = 1 - data = length 4000, hash A5F6D4E - sample 3: - time = 175999 - flags = 1 - data = length 4000, hash EABC6B0D - sample 4: - time = 181332 - flags = 1 - data = length 4000, hash F47EF742 - sample 5: - time = 186665 - flags = 1 - data = length 4000, hash 9B2549DA - sample 6: time = 192000 flags = 1 data = length 4000, hash A12733C9 - sample 7: + sample 1: time = 197333 flags = 1 data = length 4000, hash 95F62E99 - sample 8: + sample 2: time = 202666 flags = 1 data = length 4000, hash A4D858 - sample 9: + sample 3: time = 207999 flags = 1 data = length 4000, hash A4D858 - sample 10: + sample 4: time = 213332 flags = 1 data = length 4000, hash 22C1A129 - sample 11: + sample 5: time = 218665 flags = 1 data = length 4000, hash 2C51E4A1 - sample 12: + sample 6: time = 224000 flags = 1 data = length 4000, hash 3782E8BB - sample 13: + sample 7: time = 229333 flags = 1 data = length 4000, hash 2C51E4A1 - sample 14: + sample 8: time = 234666 flags = 1 data = length 4000, hash BDB3D129 - sample 15: + sample 9: time = 239999 flags = 1 data = length 4000, hash F642A55 - sample 16: + sample 10: time = 245332 flags = 1 data = length 4000, hash 32F259F4 - sample 17: + sample 11: time = 250665 flags = 1 data = length 4000, hash 4C987B7C - sample 18: + sample 12: time = 256000 flags = 1 data = length 4000, hash 57C98E1C - sample 19: + sample 13: time = 261333 flags = 1 data = length 4000, hash 4C987B7C - sample 20: + sample 14: time = 266666 flags = 1 data = length 4000, hash 4C987B7C - sample 21: + sample 15: time = 271999 flags = 1 data = length 4000, hash 4C987B7C - sample 22: + sample 16: time = 277332 flags = 1 data = length 4000, hash 4C987B7C - sample 23: + sample 17: time = 282665 flags = 1 data = length 4000, hash 4C987B7C diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump index cfbfae20b65..6cfb926ba22 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 250077 + duration = 288000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(125038) = [[timeUs=125038, position=109918]] - getPosition(250077) = [[timeUs=250077, position=220025]] + getPosition(144000) = [[timeUs=144000, position=109918]] + getPosition(288000) = [[timeUs=288000, position=220025]] numberOfTracks = 1 track 1900: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump index 2fc2f492801..06d6c4ca88a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 2013977 + duration = 2048000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(1006988) = [[timeUs=1006988, position=101524]] - getPosition(2013977) = [[timeUs=2013977, position=203237]] + getPosition(1024000) = [[timeUs=1024000, position=101524]] + getPosition(2048000) = [[timeUs=2048000, position=203237]] numberOfTracks = 1 track 1900: total output bytes = 163840 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump index 771c5216c5c..d1337fa1f3c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.1.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 2013977 + duration = 2048000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(1006988) = [[timeUs=1006988, position=101524]] - getPosition(2013977) = [[timeUs=2013977, position=203237]] + getPosition(1024000) = [[timeUs=1024000, position=101524]] + getPosition(2048000) = [[timeUs=2048000, position=203237]] numberOfTracks = 1 track 1900: - total output bytes = 112640 - sample count = 44 + total output bytes = 110080 + sample count = 43 format 0: peakBitrate = 640000 id = 1/1900 @@ -16,178 +16,174 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: - time = 640000 - flags = 1 - data = length 2560, hash DCFEB7D2 - sample 1: time = 672000 flags = 1 data = length 2560, hash 45EFC639 - sample 2: + sample 1: time = 704000 flags = 1 data = length 2560, hash F598673 - sample 3: + sample 2: time = 736000 flags = 1 data = length 2560, hash 89E4E5EC - sample 4: + sample 3: time = 768000 flags = 1 data = length 2560, hash FBE2532B - sample 5: + sample 4: time = 800000 flags = 1 data = length 2560, hash 9CE5F83B - sample 6: + sample 5: time = 832000 flags = 1 data = length 2560, hash 6ED49E2C - sample 7: + sample 6: time = 864000 flags = 1 data = length 2560, hash BC52F8F3 - sample 8: + sample 7: time = 896000 flags = 1 data = length 2560, hash 759203E2 - sample 9: + sample 8: time = 928000 flags = 1 data = length 2560, hash D5D31AE9 - sample 10: + sample 9: time = 960000 flags = 1 data = length 2560, hash 640A24ED - sample 11: + sample 10: time = 992000 flags = 1 data = length 2560, hash 19B52B8B - sample 12: + sample 11: time = 1024000 flags = 1 data = length 2560, hash 5DA977C3 - sample 13: + sample 12: time = 1056000 flags = 1 data = length 2560, hash 982879DD - sample 14: + sample 13: time = 1088000 flags = 1 data = length 2560, hash A7656B9C - sample 15: + sample 14: time = 1120000 flags = 1 data = length 2560, hash 445CCC67 - sample 16: + sample 15: time = 1152000 flags = 1 data = length 2560, hash ACD5CB5C - sample 17: + sample 16: time = 1184000 flags = 1 data = length 2560, hash 175BBF26 - sample 18: + sample 17: time = 1216000 flags = 1 data = length 2560, hash DBCBEB0 - sample 19: + sample 18: time = 1248000 flags = 1 data = length 2560, hash DA39D991 - sample 20: + sample 19: time = 1280000 flags = 1 data = length 2560, hash F08CC8E2 - sample 21: + sample 20: time = 1312000 flags = 1 data = length 2560, hash 6B0842D7 - sample 22: + sample 21: time = 1344000 flags = 1 data = length 2560, hash 9FE87594 - sample 23: + sample 22: time = 1376000 flags = 1 data = length 2560, hash 8E62CE19 - sample 24: + sample 23: time = 1408000 flags = 1 data = length 2560, hash 5FDC4084 - sample 25: + sample 24: time = 1440000 flags = 1 data = length 2560, hash C32DAEE1 - sample 26: + sample 25: time = 1472000 flags = 1 data = length 2560, hash BBEFB568 - sample 27: + sample 26: time = 1504000 flags = 1 data = length 2560, hash 20504279 - sample 28: + sample 27: time = 1536000 flags = 1 data = length 2560, hash 3B8192D2 - sample 29: + sample 28: time = 1568000 flags = 1 data = length 2560, hash 4206B48 - sample 30: + sample 29: time = 1600000 flags = 1 data = length 2560, hash B195AB53 - sample 31: + sample 30: time = 1632000 flags = 1 data = length 2560, hash 3AA8E25F - sample 32: + sample 31: time = 1664000 flags = 1 data = length 2560, hash BC227D7B - sample 33: + sample 32: time = 1696000 flags = 1 data = length 2560, hash 6A34F7EA - sample 34: + sample 33: time = 1728000 flags = 1 data = length 2560, hash F1E731C4 - sample 35: + sample 34: time = 1760000 flags = 1 data = length 2560, hash 9CC406 - sample 36: + sample 35: time = 1792000 flags = 1 data = length 2560, hash A1532233 - sample 37: + sample 36: time = 1824000 flags = 1 data = length 2560, hash 98E49039 - sample 38: + sample 37: time = 1856000 flags = 1 data = length 2560, hash 3F8B6DC0 - sample 39: + sample 38: time = 1888000 flags = 1 data = length 2560, hash 4E7BF79F - sample 40: + sample 39: time = 1920000 flags = 1 data = length 2560, hash 6DD6F2D7 - sample 41: + sample 40: time = 1952000 flags = 1 data = length 2560, hash A05C0EC2 - sample 42: + sample 41: time = 1984000 flags = 1 data = length 2560, hash 10C62F30 - sample 43: + sample 42: time = 2016000 flags = 1 data = length 2560, hash EE4F848A diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump index 452d8eea13d..40d1be3d0b8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 2013977 + duration = 2048000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(1006988) = [[timeUs=1006988, position=101524]] - getPosition(2013977) = [[timeUs=2013977, position=203237]] + getPosition(1024000) = [[timeUs=1024000, position=101524]] + getPosition(2048000) = [[timeUs=2048000, position=203237]] numberOfTracks = 1 track 1900: - total output bytes = 56320 - sample count = 22 + total output bytes = 58880 + sample count = 23 format 0: peakBitrate = 640000 id = 1/1900 @@ -16,90 +16,94 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: + time = 1312000 + flags = 1 + data = length 2560, hash 6B0842D7 + sample 1: time = 1344000 flags = 1 data = length 2560, hash 9FE87594 - sample 1: + sample 2: time = 1376000 flags = 1 data = length 2560, hash 8E62CE19 - sample 2: + sample 3: time = 1408000 flags = 1 data = length 2560, hash 5FDC4084 - sample 3: + sample 4: time = 1440000 flags = 1 data = length 2560, hash C32DAEE1 - sample 4: + sample 5: time = 1472000 flags = 1 data = length 2560, hash BBEFB568 - sample 5: + sample 6: time = 1504000 flags = 1 data = length 2560, hash 20504279 - sample 6: + sample 7: time = 1536000 flags = 1 data = length 2560, hash 3B8192D2 - sample 7: + sample 8: time = 1568000 flags = 1 data = length 2560, hash 4206B48 - sample 8: + sample 9: time = 1600000 flags = 1 data = length 2560, hash B195AB53 - sample 9: + sample 10: time = 1632000 flags = 1 data = length 2560, hash 3AA8E25F - sample 10: + sample 11: time = 1664000 flags = 1 data = length 2560, hash BC227D7B - sample 11: + sample 12: time = 1696000 flags = 1 data = length 2560, hash 6A34F7EA - sample 12: + sample 13: time = 1728000 flags = 1 data = length 2560, hash F1E731C4 - sample 13: + sample 14: time = 1760000 flags = 1 data = length 2560, hash 9CC406 - sample 14: + sample 15: time = 1792000 flags = 1 data = length 2560, hash A1532233 - sample 15: + sample 16: time = 1824000 flags = 1 data = length 2560, hash 98E49039 - sample 16: + sample 17: time = 1856000 flags = 1 data = length 2560, hash 3F8B6DC0 - sample 17: + sample 18: time = 1888000 flags = 1 data = length 2560, hash 4E7BF79F - sample 18: + sample 19: time = 1920000 flags = 1 data = length 2560, hash 6DD6F2D7 - sample 19: + sample 20: time = 1952000 flags = 1 data = length 2560, hash A05C0EC2 - sample 20: + sample 21: time = 1984000 flags = 1 data = length 2560, hash 10C62F30 - sample 21: + sample 22: time = 2016000 flags = 1 data = length 2560, hash EE4F848A diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump index 8da152a79ff..65e4364e5d8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.3.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 2013977 + duration = 2048000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(1006988) = [[timeUs=1006988, position=101524]] - getPosition(2013977) = [[timeUs=2013977, position=203237]] + getPosition(1024000) = [[timeUs=1024000, position=101524]] + getPosition(2048000) = [[timeUs=2048000, position=203237]] numberOfTracks = 1 track 1900: - total output bytes = 5120 - sample count = 2 + total output bytes = 7680 + sample count = 3 format 0: peakBitrate = 640000 id = 1/1900 @@ -16,10 +16,14 @@ track 1900: channelCount = 6 sampleRate = 48000 sample 0: + time = 1952000 + flags = 1 + data = length 2560, hash A05C0EC2 + sample 1: time = 1984000 flags = 1 data = length 2560, hash 10C62F30 - sample 1: + sample 2: time = 2016000 flags = 1 data = length 2560, hash EE4F848A diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump index ef5e2476d2d..1fe8cf48cf2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.2.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 766 + duration = 767 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(383) = [[timeUs=383, position=23128]] - getPosition(766) = [[timeUs=766, position=46445]] + getPosition(383) = [[timeUs=383, position=23099]] + getPosition(767) = [[timeUs=767, position=46446]] numberOfTracks = 2 track 192: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump index 59dabce6295..eae9829022c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 766 + duration = 767 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(383) = [[timeUs=383, position=23128]] - getPosition(766) = [[timeUs=766, position=46445]] + getPosition(383) = [[timeUs=383, position=23099]] + getPosition(767) = [[timeUs=767, position=46446]] numberOfTracks = 2 track 192: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump index 5edc0b708af..6990679ae2f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.unknown_length.dump @@ -13,19 +13,19 @@ track 192: channelCount = 1 sampleRate = 44100 sample 0: - time = 29088 + time = 29089 flags = 1 data = length 417, hash 5C710F78 sample 1: - time = 55210 + time = 55211 flags = 1 data = length 418, hash 79CF71F8 sample 2: - time = 81332 + time = 81333 flags = 1 data = length 418, hash 79CF71F8 sample 3: - time = 107454 + time = 107455 flags = 1 data = length 418, hash 79CF71F8 track 224: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump index 8e996b6f31e..ec918262629 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25709]] - getPosition(66733) = [[timeUs=66733, position=51606]] + getPosition(50050) = [[timeUs=50050, position=25709]] + getPosition(100100) = [[timeUs=100100, position=51606]] numberOfTracks = 2 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump index 8e996b6f31e..ec918262629 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.1.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25709]] - getPosition(66733) = [[timeUs=66733, position=51606]] + getPosition(50050) = [[timeUs=50050, position=25709]] + getPosition(100100) = [[timeUs=100100, position=51606]] numberOfTracks = 2 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump index 8e996b6f31e..4faac5a179e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25709]] - getPosition(66733) = [[timeUs=66733, position=51606]] + getPosition(50050) = [[timeUs=50050, position=25709]] + getPosition(100100) = [[timeUs=100100, position=51606]] numberOfTracks = 2 track 256: - total output bytes = 45026 - sample count = 2 + total output bytes = 6203 + sample count = 0 format 0: id = 1/256 sampleMimeType = video/mpeg2 @@ -16,14 +16,6 @@ track 256: height = 426 initializationData: data = length 22, hash CE183139 - sample 0: - time = 33366 - flags = 1 - data = length 20711, hash 34341E8 - sample 1: - time = 66733 - flags = 0 - data = length 18112, hash EC44B35B track 257: total output bytes = 5015 sample count = 4 @@ -35,11 +27,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump index f0fd81369fe..22a3233ad69 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25709]] - getPosition(66733) = [[timeUs=66733, position=51606]] + getPosition(50050) = [[timeUs=50050, position=25709]] + getPosition(100100) = [[timeUs=100100, position=51606]] numberOfTracks = 2 track 256: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump index a3101e564eb..ce1652966d2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ts.unknown_length.dump @@ -14,7 +14,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -32,11 +32,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: 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 4acc09c7f8c..a5ee249890b 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 960000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(480000) = [[timeUs=480000, position=21958]] - getPosition(960000) = [[timeUs=960000, position=44104]] + getPosition(500000) = [[timeUs=500000, position=21958]] + getPosition(1000000) = [[timeUs=1000000, position=44104]] numberOfTracks = 1 track 256: total output bytes = 39002 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 068d08fae85..9fbbdbe95b0 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 960000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(480000) = [[timeUs=480000, position=21958]] - getPosition(960000) = [[timeUs=960000, position=44104]] + getPosition(500000) = [[timeUs=500000, position=21958]] + getPosition(1000000) = [[timeUs=1000000, position=44104]] numberOfTracks = 1 track 256: total output bytes = 27354 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 beabaa70f5d..ced93f13491 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 960000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(480000) = [[timeUs=480000, position=21958]] - getPosition(960000) = [[timeUs=960000, position=44104]] + getPosition(500000) = [[timeUs=500000, position=21958]] + getPosition(1000000) = [[timeUs=1000000, position=44104]] numberOfTracks = 1 track 256: - total output bytes = 13592 - sample count = 9 + total output bytes = 13814 + sample count = 10 format 0: id = 1/256 sampleMimeType = video/mp4v-es @@ -17,38 +17,42 @@ track 256: initializationData: data = length 47, hash 7696BF67 sample 0: + time = 600000 + flags = 0 + data = length 222, hash F0F812FD + sample 1: time = 640000 flags = 0 data = length 222, hash 18472E8C - sample 1: + sample 2: time = 680000 flags = 0 data = length 222, hash 1457FE1C - sample 2: + sample 3: time = 720000 flags = 0 data = length 222, hash 3BA719AB - sample 3: + sample 4: time = 760000 flags = 0 data = length 222, hash 37B7E93B - sample 4: + sample 5: time = 800000 flags = 0 data = length 222, hash 5F0704CA - sample 5: + sample 6: time = 840000 flags = 0 data = length 222, hash 5B17D45A - sample 6: + sample 7: time = 880000 flags = 0 data = length 222, hash 8266EFE9 - sample 7: + sample 8: time = 920000 flags = 0 data = length 222, hash 7E77BF79 - sample 8: + sample 9: time = 960000 flags = 1 data = length 11769, hash D94C80C0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump index a841f09df58..fab9bd2d5e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 960000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(480000) = [[timeUs=480000, position=21958]] - getPosition(960000) = [[timeUs=960000, position=44104]] + getPosition(500000) = [[timeUs=500000, position=21958]] + getPosition(1000000) = [[timeUs=1000000, position=44104]] numberOfTracks = 1 track 256: total output bytes = 0 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 366338fe96c..445d2c33466 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 900000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(450000) = [[timeUs=450000, position=23030]] - getPosition(900000) = [[timeUs=900000, position=46248]] + getPosition(500000) = [[timeUs=500000, position=23030]] + getPosition(1000000) = [[timeUs=1000000, position=46248]] numberOfTracks = 1 track 256: total output bytes = 41614 @@ -22,7 +22,7 @@ track 256: data = length 29, hash A220FDE0 data = length 9, hash D971CD89 sample 0: - time = 66666 + time = 66667 flags = 1 data = length 856, hash E3FC14FA sample 1: @@ -30,7 +30,7 @@ track 256: flags = 0 data = length 3330, hash ACE433CC sample 2: - time = 166666 + time = 166667 flags = 0 data = length 6849, hash 2762E298 sample 3: @@ -46,7 +46,7 @@ track 256: flags = 0 data = length 1209, hash B137200F sample 6: - time = 366666 + time = 366667 flags = 0 data = length 476, hash 1D70B27E sample 7: @@ -54,7 +54,7 @@ track 256: flags = 0 data = length 325, hash D3FB2CC2 sample 8: - time = 266666 + time = 266667 flags = 0 data = length 89, hash F66C5D60 sample 9: @@ -70,7 +70,7 @@ track 256: flags = 0 data = length 302, hash 5432E85C sample 12: - time = 466666 + time = 466667 flags = 0 data = length 302, hash 95A21C90 sample 13: @@ -82,7 +82,7 @@ track 256: flags = 0 data = length 198, hash 114E22D9 sample 15: - time = 666666 + time = 666667 flags = 0 data = length 303, hash C2C45716 sample 16: @@ -90,7 +90,7 @@ track 256: flags = 0 data = length 168, hash 1B048DCA sample 17: - time = 566666 + time = 566667 flags = 0 data = length 98, hash 3AA3B8B4 sample 18: @@ -106,7 +106,7 @@ track 256: flags = 1 data = length 11235, hash 8EDDEB9 sample 21: - time = 866666 + time = 866667 flags = 0 data = length 358, hash 797276E4 sample 22: @@ -114,7 +114,7 @@ track 256: flags = 0 data = length 336, hash B92DBED9 sample 23: - time = 766666 + time = 766667 flags = 0 data = length 105, hash 223F3D12 sample 24: @@ -134,7 +134,7 @@ track 256: flags = 0 data = length 84, hash 54E55CB4 sample 28: - time = 966666 + time = 966667 flags = 0 data = length 93, hash B6B6263C sample 29: 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 afbcb23e5d1..d8518097c81 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 900000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(450000) = [[timeUs=450000, position=23030]] - getPosition(900000) = [[timeUs=900000, position=46248]] + getPosition(500000) = [[timeUs=500000, position=23030]] + getPosition(1000000) = [[timeUs=1000000, position=46248]] numberOfTracks = 1 track 256: - total output bytes = 25812 - sample count = 21 + total output bytes = 25901 + sample count = 22 format 0: id = 1/256 sampleMimeType = video/avc @@ -22,86 +22,90 @@ track 256: data = length 29, hash A220FDE0 data = length 9, hash D971CD89 sample 0: + time = 266667 + flags = 0 + data = length 89, hash F66C5D60 + sample 1: time = 333333 flags = 0 data = length 177, hash 7E6DB5B7 - sample 1: + sample 2: time = 400000 flags = 1 data = length 11054, hash 1FC7442D - sample 2: + sample 3: time = 533333 flags = 0 data = length 302, hash 5432E85C - sample 3: - time = 466666 + sample 4: + time = 466667 flags = 0 data = length 302, hash 95A21C90 - sample 4: + sample 5: time = 433333 flags = 0 data = length 96, hash 8C98DBB8 - sample 5: + sample 6: time = 500000 flags = 0 data = length 198, hash 114E22D9 - sample 6: - time = 666666 + sample 7: + time = 666667 flags = 0 data = length 303, hash C2C45716 - sample 7: + sample 8: time = 600000 flags = 0 data = length 168, hash 1B048DCA - sample 8: - time = 566666 + sample 9: + time = 566667 flags = 0 data = length 98, hash 3AA3B8B4 - sample 9: + sample 10: time = 633333 flags = 0 data = length 108, hash 4F67E6F8 - sample 10: + sample 11: time = 700000 flags = 0 data = length 110, hash 625A9B91 - sample 11: + sample 12: time = 733333 flags = 1 data = length 11235, hash 8EDDEB9 - sample 12: - time = 866666 + sample 13: + time = 866667 flags = 0 data = length 358, hash 797276E4 - sample 13: + sample 14: time = 800000 flags = 0 data = length 336, hash B92DBED9 - sample 14: - time = 766666 + sample 15: + time = 766667 flags = 0 data = length 105, hash 223F3D12 - sample 15: + sample 16: time = 833333 flags = 0 data = length 106, hash DF8D1552 - sample 16: + sample 17: time = 1000000 flags = 0 data = length 235, hash 6127527D - sample 17: + sample 18: time = 933333 flags = 0 data = length 109, hash E8E69F9F - sample 18: + sample 19: time = 900000 flags = 0 data = length 84, hash 54E55CB4 - sample 19: - time = 966666 + sample 20: + time = 966667 flags = 0 data = length 93, hash B6B6263C - sample 20: + sample 21: time = 1033333 flags = 0 data = length 234, hash A48D3D90 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 ce18263dd80..29e8ad134d3 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 900000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(450000) = [[timeUs=450000, position=23030]] - getPosition(900000) = [[timeUs=900000, position=46248]] + getPosition(500000) = [[timeUs=500000, position=23030]] + getPosition(1000000) = [[timeUs=1000000, position=46248]] numberOfTracks = 1 track 256: - total output bytes = 13114 - sample count = 12 + total output bytes = 13212 + sample count = 13 format 0: id = 1/256 sampleMimeType = video/avc @@ -22,50 +22,54 @@ track 256: data = length 29, hash A220FDE0 data = length 9, hash D971CD89 sample 0: + time = 566667 + flags = 0 + data = length 98, hash 3AA3B8B4 + sample 1: time = 633333 flags = 0 data = length 108, hash 4F67E6F8 - sample 1: + sample 2: time = 700000 flags = 0 data = length 110, hash 625A9B91 - sample 2: + sample 3: time = 733333 flags = 1 data = length 11235, hash 8EDDEB9 - sample 3: - time = 866666 + sample 4: + time = 866667 flags = 0 data = length 358, hash 797276E4 - sample 4: + sample 5: time = 800000 flags = 0 data = length 336, hash B92DBED9 - sample 5: - time = 766666 + sample 6: + time = 766667 flags = 0 data = length 105, hash 223F3D12 - sample 6: + sample 7: time = 833333 flags = 0 data = length 106, hash DF8D1552 - sample 7: + sample 8: time = 1000000 flags = 0 data = length 235, hash 6127527D - sample 8: + sample 9: time = 933333 flags = 0 data = length 109, hash E8E69F9F - sample 9: + sample 10: time = 900000 flags = 0 data = length 84, hash 54E55CB4 - sample 10: - time = 966666 + sample 11: + time = 966667 flags = 0 data = length 93, hash B6B6263C - sample 11: + sample 12: time = 1033333 flags = 0 data = length 234, hash A48D3D90 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 f8372491d6e..5b2972d1c20 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 900000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(450000) = [[timeUs=450000, position=23030]] - getPosition(900000) = [[timeUs=900000, position=46248]] + getPosition(500000) = [[timeUs=500000, position=23030]] + getPosition(1000000) = [[timeUs=1000000, position=46248]] numberOfTracks = 1 track 256: - total output bytes = 412 - sample count = 3 + total output bytes = 328 + sample count = 2 format 0: id = 1/256 sampleMimeType = video/avc @@ -22,14 +22,10 @@ track 256: data = length 29, hash A220FDE0 data = length 9, hash D971CD89 sample 0: - time = 900000 - flags = 0 - data = length 84, hash 54E55CB4 - sample 1: - time = 966666 + time = 966667 flags = 0 data = length 93, hash B6B6263C - sample 2: + sample 1: time = 1033333 flags = 0 data = length 234, hash A48D3D90 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 8406fb34de5..09a89a0b623 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 @@ -19,7 +19,7 @@ track 256: data = length 29, hash A220FDE0 data = length 9, hash D971CD89 sample 0: - time = 66666 + time = 66667 flags = 1 data = length 856, hash E3FC14FA sample 1: @@ -27,7 +27,7 @@ track 256: flags = 0 data = length 3330, hash ACE433CC sample 2: - time = 166666 + time = 166667 flags = 0 data = length 6849, hash 2762E298 sample 3: @@ -43,7 +43,7 @@ track 256: flags = 0 data = length 1209, hash B137200F sample 6: - time = 366666 + time = 366667 flags = 0 data = length 476, hash 1D70B27E sample 7: @@ -51,7 +51,7 @@ track 256: flags = 0 data = length 325, hash D3FB2CC2 sample 8: - time = 266666 + time = 266667 flags = 0 data = length 89, hash F66C5D60 sample 9: @@ -67,7 +67,7 @@ track 256: flags = 0 data = length 302, hash 5432E85C sample 12: - time = 466666 + time = 466667 flags = 0 data = length 302, hash 95A21C90 sample 13: @@ -79,7 +79,7 @@ track 256: flags = 0 data = length 198, hash 114E22D9 sample 15: - time = 666666 + time = 666667 flags = 0 data = length 303, hash C2C45716 sample 16: @@ -87,7 +87,7 @@ track 256: flags = 0 data = length 168, hash 1B048DCA sample 17: - time = 566666 + time = 566667 flags = 0 data = length 98, hash 3AA3B8B4 sample 18: @@ -103,7 +103,7 @@ track 256: flags = 1 data = length 11235, hash 8EDDEB9 sample 21: - time = 866666 + time = 866667 flags = 0 data = length 358, hash 797276E4 sample 22: @@ -111,7 +111,7 @@ track 256: flags = 0 data = length 336, hash B92DBED9 sample 23: - time = 766666 + time = 766667 flags = 0 data = length 105, hash 223F3D12 sample 24: @@ -131,7 +131,7 @@ track 256: flags = 0 data = length 84, hash 54E55CB4 sample 28: - time = 966666 + time = 966667 flags = 0 data = length 93, hash B6B6263C sample 29: 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 88149be1a2c..a223a6654c4 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 0 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(0) = [[timeUs=0, position=0]] - getPosition(0) = [[timeUs=0, position=0]] + getPosition(50050) = [[timeUs=50050, position=17225]] + getPosition(100100) = [[timeUs=100100, position=34639]] numberOfTracks = 2 track 256: total output bytes = 13650 @@ -30,7 +30,7 @@ track 256: flags = 0 data = length 813, hash 99F7B4FA sample 2: - time = 133466 + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -52,23 +52,23 @@ track 257: flags = 1 data = length 2048, hash 88866F81 sample 2: - time = 89955 + time = 89956 flags = 1 data = length 2048, hash 88866F81 sample 3: - time = 101566 + time = 101567 flags = 1 data = length 2048, hash 88866F81 sample 4: - time = 113177 + time = 113178 flags = 1 data = length 2048, hash 88866F81 sample 5: - time = 124777 + time = 124778 flags = 1 data = length 2048, hash 88866F81 sample 6: - time = 136388 + time = 136389 flags = 1 data = length 2048, hash 88866F81 sample 7: 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 82dc922fa3c..45d7b49b89f 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 @@ -27,7 +27,7 @@ track 256: flags = 0 data = length 813, hash 99F7B4FA sample 2: - time = 133466 + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -49,23 +49,23 @@ track 257: flags = 1 data = length 2048, hash 88866F81 sample 2: - time = 89955 + time = 89956 flags = 1 data = length 2048, hash 88866F81 sample 3: - time = 101566 + time = 101567 flags = 1 data = length 2048, hash 88866F81 sample 4: - time = 113177 + time = 113178 flags = 1 data = length 2048, hash 88866F81 sample 5: - time = 124777 + time = 124778 flags = 1 data = length 2048, hash 88866F81 sample 6: - time = 136388 + time = 136389 flags = 1 data = length 2048, hash 88866F81 sample 7: 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 14fdeb2b08e..e11f0e76820 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=9545]] - getPosition(66733) = [[timeUs=66733, position=19279]] + getPosition(50050) = [[timeUs=50050, position=9545]] + getPosition(100100) = [[timeUs=100100, position=19279]] numberOfTracks = 2 track 256: total output bytes = 13650 @@ -30,7 +30,7 @@ track 256: flags = 0 data = length 813, hash 99F7B4FA sample 2: - time = 133466 + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -52,11 +52,11 @@ track 257: flags = 1 data = length 1254, hash 73FB07B8 sample 2: - time = 118977 + time = 118978 flags = 1 data = length 1254, hash 73FB07B8 sample 3: - time = 145099 + time = 145100 flags = 1 data = length 1254, hash 73FB07B8 tracksEnded = true 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 14fdeb2b08e..e11f0e76820 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=9545]] - getPosition(66733) = [[timeUs=66733, position=19279]] + getPosition(50050) = [[timeUs=50050, position=9545]] + getPosition(100100) = [[timeUs=100100, position=19279]] numberOfTracks = 2 track 256: total output bytes = 13650 @@ -30,7 +30,7 @@ track 256: flags = 0 data = length 813, hash 99F7B4FA sample 2: - time = 133466 + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -52,11 +52,11 @@ track 257: flags = 1 data = length 1254, hash 73FB07B8 sample 2: - time = 118977 + time = 118978 flags = 1 data = length 1254, hash 73FB07B8 sample 3: - time = 145099 + time = 145100 flags = 1 data = length 1254, hash 73FB07B8 tracksEnded = true 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 14fdeb2b08e..1e3be4bdd38 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=9545]] - getPosition(66733) = [[timeUs=66733, position=19279]] + getPosition(50050) = [[timeUs=50050, position=9545]] + getPosition(100100) = [[timeUs=100100, position=19279]] numberOfTracks = 2 track 256: - total output bytes = 13650 - sample count = 3 + total output bytes = 1256 + sample count = 2 format 0: id = 1/256 sampleMimeType = video/avc @@ -22,15 +22,11 @@ track 256: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 sample 0: - time = 66733 - flags = 1 - data = length 12394, hash A39F5311 - sample 1: time = 100100 flags = 0 data = length 813, hash 99F7B4FA - sample 2: - time = 133466 + sample 1: + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -52,11 +48,11 @@ track 257: flags = 1 data = length 1254, hash 73FB07B8 sample 2: - time = 118977 + time = 118978 flags = 1 data = length 1254, hash 73FB07B8 sample 3: - time = 145099 + time = 145100 flags = 1 data = length 1254, hash 73FB07B8 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump index 5c8e3738567..16c6e5c9f28 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_mpeg_audio.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=9545]] - getPosition(66733) = [[timeUs=66733, position=19279]] + getPosition(50050) = [[timeUs=50050, position=9545]] + getPosition(100100) = [[timeUs=100100, position=19279]] numberOfTracks = 2 track 256: total output bytes = 0 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 1d9e0d4154c..8f8935c24f5 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 @@ -27,7 +27,7 @@ track 256: flags = 0 data = length 813, hash 99F7B4FA sample 2: - time = 133466 + time = 133467 flags = 0 data = length 442, hash A7367ECF track 257: @@ -49,11 +49,11 @@ track 257: flags = 1 data = length 1254, hash 73FB07B8 sample 2: - time = 118977 + time = 118978 flags = 1 data = length 1254, hash 73FB07B8 sample 3: - time = 145099 + time = 145100 flags = 1 data = length 1254, hash 73FB07B8 tracksEnded = true 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 efc4982d764..0eb0728f38d 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=6420]] - getPosition(66733) = [[timeUs=66733, position=13028]] + getPosition(50050) = [[timeUs=50050, position=6420]] + getPosition(100100) = [[timeUs=100100, position=13028]] numberOfTracks = 1 track 256: total output bytes = 12451 @@ -30,11 +30,11 @@ track 256: flags = 1 data = length 10938, hash 68420875 sample 2: - time = 133466 + time = 133467 flags = 0 data = length 6, hash 34E6CF79 sample 3: - time = 133466 + time = 133467 flags = 0 data = length 518, hash 546C177 sample 4: 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 efc4982d764..0eb0728f38d 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=6420]] - getPosition(66733) = [[timeUs=66733, position=13028]] + getPosition(50050) = [[timeUs=50050, position=6420]] + getPosition(100100) = [[timeUs=100100, position=13028]] numberOfTracks = 1 track 256: total output bytes = 12451 @@ -30,11 +30,11 @@ track 256: flags = 1 data = length 10938, hash 68420875 sample 2: - time = 133466 + time = 133467 flags = 0 data = length 6, hash 34E6CF79 sample 3: - time = 133466 + time = 133467 flags = 0 data = length 518, hash 546C177 sample 4: 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 efc4982d764..24958f7435a 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 @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=6420]] - getPosition(66733) = [[timeUs=66733, position=13028]] + getPosition(50050) = [[timeUs=50050, position=6420]] + getPosition(100100) = [[timeUs=100100, position=13028]] numberOfTracks = 1 track 256: - total output bytes = 12451 - sample count = 5 + total output bytes = 779 + sample count = 3 format 0: id = 1/256 sampleMimeType = video/avc @@ -22,22 +22,14 @@ track 256: data = length 29, hash 4C2CAE9C data = length 9, hash D971CD89 sample 0: - time = 66733 - flags = 0 - data = length 734, hash AF0D9485 - sample 1: - time = 66733 - flags = 1 - data = length 10938, hash 68420875 - sample 2: - time = 133466 + time = 133467 flags = 0 data = length 6, hash 34E6CF79 - sample 3: - time = 133466 + sample 1: + time = 133467 flags = 0 data = length 518, hash 546C177 - sample 4: + sample 2: time = 100100 flags = 0 data = length 254, hash 36EBDA1 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 8f744992d89..5a202767cff 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=6420]] - getPosition(66733) = [[timeUs=66733, position=13028]] + getPosition(50050) = [[timeUs=50050, position=6420]] + getPosition(100100) = [[timeUs=100100, position=13028]] numberOfTracks = 1 track 256: total output bytes = 255 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 938a3dcffc8..bb6d9b08855 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 @@ -27,11 +27,11 @@ track 256: flags = 1 data = length 10938, hash 68420875 sample 2: - time = 133466 + time = 133467 flags = 0 data = length 6, hash 34E6CF79 sample 3: - time = 133466 + time = 133467 flags = 0 data = length 518, hash 546C177 sample 4: 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 45887e7d8f4..7929befb69b 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 900000 + duration = 1000000 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(450000) = [[timeUs=450000, position=11421]] - getPosition(900000) = [[timeUs=900000, position=23030]] + getPosition(500000) = [[timeUs=500000, position=11421]] + getPosition(1000000) = [[timeUs=1000000, position=23030]] numberOfTracks = 1 track 256: total output bytes = 19364 @@ -22,7 +22,7 @@ track 256: initializationData: data = length 83, hash 7F428 sample 0: - time = 66666 + time = 66667 flags = 1 data = length 2517, hash 85352308 sample 1: @@ -30,7 +30,7 @@ track 256: flags = 0 data = length 1226, hash 11D564DA sample 2: - time = 266666 + time = 266667 flags = 0 data = length 7817, hash 50D15703 sample 3: @@ -42,7 +42,7 @@ track 256: flags = 0 data = length 1065, hash 8720A939 sample 5: - time = 166666 + time = 166667 flags = 0 data = length 105, hash 3A3A582D sample 6: @@ -54,7 +54,7 @@ track 256: flags = 0 data = length 303, hash 41B28452 sample 8: - time = 366666 + time = 366667 flags = 0 data = length 144, hash 60BBCD4C sample 9: @@ -78,11 +78,11 @@ track 256: flags = 0 data = length 275, hash 27430DB sample 14: - time = 466666 + time = 466667 flags = 0 data = length 185, hash 97389E88 sample 15: - time = 566666 + time = 566667 flags = 0 data = length 278, hash 5819FEBB sample 16: @@ -90,7 +90,7 @@ track 256: flags = 0 data = length 264, hash 8545F36A sample 17: - time = 666666 + time = 666667 flags = 0 data = length 213, hash 52C7574A sample 18: @@ -114,7 +114,7 @@ track 256: flags = 0 data = length 210, hash 5D050FE8 sample 23: - time = 766666 + time = 766667 flags = 0 data = length 102, hash ED3BD5C9 sample 24: @@ -122,7 +122,7 @@ track 256: flags = 0 data = length 110, hash CF65ED37 sample 25: - time = 866666 + time = 866667 flags = 0 data = length 118, hash BA0156BF sample 26: @@ -130,7 +130,7 @@ track 256: flags = 0 data = length 260, hash ED6ABC1D sample 27: - time = 966666 + time = 966667 flags = 0 data = length 141, hash 9787F33A sample 28: 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 2080994316b..396a61c0c5d 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 @@ -19,7 +19,7 @@ track 256: initializationData: data = length 83, hash 7F428 sample 0: - time = 66666 + time = 66667 flags = 1 data = length 2517, hash 85352308 sample 1: @@ -27,7 +27,7 @@ track 256: flags = 0 data = length 1226, hash 11D564DA sample 2: - time = 266666 + time = 266667 flags = 0 data = length 7817, hash 50D15703 sample 3: @@ -39,7 +39,7 @@ track 256: flags = 0 data = length 1065, hash 8720A939 sample 5: - time = 166666 + time = 166667 flags = 0 data = length 105, hash 3A3A582D sample 6: @@ -51,7 +51,7 @@ track 256: flags = 0 data = length 303, hash 41B28452 sample 8: - time = 366666 + time = 366667 flags = 0 data = length 144, hash 60BBCD4C sample 9: @@ -75,11 +75,11 @@ track 256: flags = 0 data = length 275, hash 27430DB sample 14: - time = 466666 + time = 466667 flags = 0 data = length 185, hash 97389E88 sample 15: - time = 566666 + time = 566667 flags = 0 data = length 278, hash 5819FEBB sample 16: @@ -87,7 +87,7 @@ track 256: flags = 0 data = length 264, hash 8545F36A sample 17: - time = 666666 + time = 666667 flags = 0 data = length 213, hash 52C7574A sample 18: @@ -111,7 +111,7 @@ track 256: flags = 0 data = length 210, hash 5D050FE8 sample 23: - time = 766666 + time = 766667 flags = 0 data = length 102, hash ED3BD5C9 sample 24: @@ -119,7 +119,7 @@ track 256: flags = 0 data = length 110, hash CF65ED37 sample 25: - time = 866666 + time = 866667 flags = 0 data = length 118, hash BA0156BF sample 26: @@ -127,7 +127,7 @@ track 256: flags = 0 data = length 260, hash ED6ABC1D sample 27: - time = 966666 + time = 966667 flags = 0 data = length 141, hash 9787F33A sample 28: 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 02463f0ca72..ecc34778534 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 1000000 + duration = 1066667 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(500000) = [[timeUs=500000, position=7134]] - getPosition(1000000) = [[timeUs=1000000, position=14457]] + getPosition(533333) = [[timeUs=533333, position=7134]] + getPosition(1066667) = [[timeUs=1066667, position=14457]] numberOfTracks = 1 track 256: total output bytes = 10004 @@ -22,7 +22,7 @@ track 256: initializationData: data = length 146, hash 61554FEF sample 0: - time = 266666 + time = 266667 flags = 1 data = length 7464, hash EBF8518B sample 1: @@ -34,7 +34,7 @@ track 256: flags = 0 data = length 465, hash 2B469969 sample 3: - time = 466666 + time = 466667 flags = 0 data = length 177, hash 79777966 sample 4: @@ -54,7 +54,7 @@ track 256: flags = 0 data = length 49, hash F9A023E1 sample 8: - time = 666666 + time = 666667 flags = 0 data = length 58, hash 74F1E9D9 sample 9: @@ -66,11 +66,11 @@ track 256: flags = 0 data = length 87, hash 1A1C57E4 sample 11: - time = 866666 + time = 866667 flags = 0 data = length 65, hash 59F937BE sample 12: - time = 1066666 + time = 1066667 flags = 0 data = length 94, hash 5D02AC81 sample 13: @@ -82,7 +82,7 @@ track 256: flags = 0 data = length 46, hash CE770A40 sample 15: - time = 1266666 + time = 1266667 flags = 0 data = length 7, hash 680F23CB sample 16: 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 2480556f0e0..34c223a4dbc 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 @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 1000000 + duration = 1066667 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(500000) = [[timeUs=500000, position=7134]] - getPosition(1000000) = [[timeUs=1000000, position=14457]] + getPosition(533333) = [[timeUs=533333, position=7134]] + getPosition(1066667) = [[timeUs=1066667, position=14457]] numberOfTracks = 1 track 256: total output bytes = 856 @@ -38,7 +38,7 @@ track 256: flags = 0 data = length 49, hash F9A023E1 sample 4: - time = 666666 + time = 666667 flags = 0 data = length 58, hash 74F1E9D9 sample 5: @@ -50,11 +50,11 @@ track 256: flags = 0 data = length 87, hash 1A1C57E4 sample 7: - time = 866666 + time = 866667 flags = 0 data = length 65, hash 59F937BE sample 8: - time = 1066666 + time = 1066667 flags = 0 data = length 94, hash 5D02AC81 sample 9: @@ -66,7 +66,7 @@ track 256: flags = 0 data = length 46, hash CE770A40 sample 11: - time = 1266666 + time = 1266667 flags = 0 data = length 7, hash 680F23CB sample 12: 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 746b08b182b..054578ddfd3 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 @@ -19,7 +19,7 @@ track 256: initializationData: data = length 146, hash 61554FEF sample 0: - time = 266666 + time = 266667 flags = 1 data = length 7464, hash EBF8518B sample 1: @@ -31,7 +31,7 @@ track 256: flags = 0 data = length 465, hash 2B469969 sample 3: - time = 466666 + time = 466667 flags = 0 data = length 177, hash 79777966 sample 4: @@ -51,7 +51,7 @@ track 256: flags = 0 data = length 49, hash F9A023E1 sample 8: - time = 666666 + time = 666667 flags = 0 data = length 58, hash 74F1E9D9 sample 9: @@ -63,11 +63,11 @@ track 256: flags = 0 data = length 87, hash 1A1C57E4 sample 11: - time = 866666 + time = 866667 flags = 0 data = length 65, hash 59F937BE sample 12: - time = 1066666 + time = 1066667 flags = 0 data = length 94, hash 5D02AC81 sample 13: @@ -79,7 +79,7 @@ track 256: flags = 0 data = length 46, hash CE770A40 sample 15: - time = 1266666 + time = 1266667 flags = 0 data = length 7, hash 680F23CB sample 16: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump index 51e3ce4c712..e97431e3234 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.0.dump @@ -1,9 +1,6 @@ seekMap: - isSeekable = true - duration = 0 - getPosition(0) = [[timeUs=0, position=0]] - getPosition(1) = [[timeUs=1, position=0]] - getPosition(0) = [[timeUs=0, position=0]] + isSeekable = false + duration = UNSET TIME getPosition(0) = [[timeUs=0, position=0]] numberOfTracks = 1 track 256: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump index b9564a3ffc2..bc389490cbe 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25887]] - getPosition(66733) = [[timeUs=66733, position=51963]] + getPosition(50050) = [[timeUs=50050, position=25887]] + getPosition(100100) = [[timeUs=100100, position=51963]] numberOfTracks = 3 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: @@ -57,15 +57,15 @@ track 600: sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 1: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 2: - time = 33366 + time = 33367 flags = 1 data = length 35, hash DFA3EF74 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump index b9564a3ffc2..bc389490cbe 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.1.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25887]] - getPosition(66733) = [[timeUs=66733, position=51963]] + getPosition(50050) = [[timeUs=50050, position=25887]] + getPosition(100100) = [[timeUs=100100, position=51963]] numberOfTracks = 3 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: @@ -57,15 +57,15 @@ track 600: sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 1: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 2: - time = 33366 + time = 33367 flags = 1 data = length 35, hash DFA3EF74 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump index b9564a3ffc2..5ac4eb46799 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25887]] - getPosition(66733) = [[timeUs=66733, position=51963]] + getPosition(50050) = [[timeUs=50050, position=25887]] + getPosition(100100) = [[timeUs=100100, position=51963]] numberOfTracks = 3 track 256: - total output bytes = 45026 - sample count = 2 + total output bytes = 6203 + sample count = 0 format 0: id = 1/256 sampleMimeType = video/mpeg2 @@ -16,14 +16,6 @@ track 256: height = 426 initializationData: data = length 22, hash CE183139 - sample 0: - time = 33366 - flags = 1 - data = length 20711, hash 34341E8 - sample 1: - time = 66733 - flags = 0 - data = length 18112, hash EC44B35B track 257: total output bytes = 5015 sample count = 4 @@ -35,11 +27,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: @@ -51,21 +43,9 @@ track 257: flags = 1 data = length 1254, hash 73FB07B8 track 600: - total output bytes = 105 - sample count = 3 + total output bytes = 0 + sample count = 0 format 0: sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 - sample 0: - time = 33366 - flags = 1 - data = length 35, hash A892AAAF - sample 1: - time = 33366 - flags = 1 - data = length 35, hash A892AAAF - sample 2: - time = 33366 - flags = 1 - data = length 35, hash DFA3EF74 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump index e96f346e298..e14ed4f6d23 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=25887]] - getPosition(66733) = [[timeUs=66733, position=51963]] + getPosition(50050) = [[timeUs=50050, position=25887]] + getPosition(100100) = [[timeUs=100100, position=51963]] numberOfTracks = 3 track 256: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump index 8c4012fb911..7a98a638310 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_scte35.ts.unknown_length.dump @@ -14,7 +14,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -32,11 +32,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: @@ -54,15 +54,15 @@ track 600: sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 1: - time = 33366 + time = 33367 flags = 1 data = length 35, hash A892AAAF sample 2: - time = 33366 + time = 33367 flags = 1 data = length 35, hash DFA3EF74 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.0.dump index f61ecb193a5..cafd4cc8a77 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.0.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=28281]] - getPosition(66733) = [[timeUs=66733, position=56751]] + getPosition(50050) = [[timeUs=50050, position=28281]] + getPosition(100100) = [[timeUs=100100, position=56751]] numberOfTracks = 2 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.1.dump index f61ecb193a5..cafd4cc8a77 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.1.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=28281]] - getPosition(66733) = [[timeUs=66733, position=56751]] + getPosition(50050) = [[timeUs=50050, position=28281]] + getPosition(100100) = [[timeUs=100100, position=56751]] numberOfTracks = 2 track 256: total output bytes = 45026 @@ -17,7 +17,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -35,11 +35,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.2.dump index f61ecb193a5..fc843d1e19e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.2.dump @@ -1,14 +1,14 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=28281]] - getPosition(66733) = [[timeUs=66733, position=56751]] + getPosition(50050) = [[timeUs=50050, position=28281]] + getPosition(100100) = [[timeUs=100100, position=56751]] numberOfTracks = 2 track 256: - total output bytes = 45026 - sample count = 2 + total output bytes = 6203 + sample count = 0 format 0: id = 1/256 sampleMimeType = video/mpeg2 @@ -16,14 +16,6 @@ track 256: height = 426 initializationData: data = length 22, hash CE183139 - sample 0: - time = 33366 - flags = 1 - data = length 20711, hash 34341E8 - sample 1: - time = 66733 - flags = 0 - data = length 18112, hash EC44B35B track 257: total output bytes = 5015 sample count = 4 @@ -35,11 +27,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.3.dump index 417481edc32..40dca3175c8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.3.dump @@ -1,10 +1,10 @@ seekMap: isSeekable = true - duration = 66733 + duration = 100100 getPosition(0) = [[timeUs=0, position=0]] getPosition(1) = [[timeUs=1, position=0]] - getPosition(33366) = [[timeUs=33366, position=28281]] - getPosition(66733) = [[timeUs=66733, position=56751]] + getPosition(50050) = [[timeUs=50050, position=28281]] + getPosition(100100) = [[timeUs=100100, position=56751]] numberOfTracks = 2 track 256: total output bytes = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump index a3101e564eb..ce1652966d2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_junk.unknown_length.dump @@ -14,7 +14,7 @@ track 256: initializationData: data = length 22, hash CE183139 sample 0: - time = 33366 + time = 33367 flags = 1 data = length 20711, hash 34341E8 sample 1: @@ -32,11 +32,11 @@ track 257: sampleRate = 44100 language = und sample 0: - time = 22455 + time = 22456 flags = 1 data = length 1253, hash 727FD1C6 sample 1: - time = 48577 + time = 48578 flags = 1 data = length 1254, hash 73FB07B8 sample 2: diff --git a/libraries/test_data/src/test/assets/media/ssa/.gitattributes b/libraries/test_data/src/test/assets/media/ssa/.gitattributes new file mode 100644 index 00000000000..5378fe089bc --- /dev/null +++ b/libraries/test_data/src/test/assets/media/ssa/.gitattributes @@ -0,0 +1 @@ +* -text \ No newline at end of file diff --git a/libraries/test_data/src/test/assets/media/subrip/.gitattributes b/libraries/test_data/src/test/assets/media/subrip/.gitattributes new file mode 100644 index 00000000000..5378fe089bc --- /dev/null +++ b/libraries/test_data/src/test/assets/media/subrip/.gitattributes @@ -0,0 +1 @@ +* -text \ No newline at end of file diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestUtil.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestUtil.java index 21fba35eeee..d9424e75d28 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestUtil.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/TestUtil.java @@ -432,6 +432,7 @@ public static SeekMap extractSeekMap( throw new IOException("EOF encountered without seekmap"); } if (output.seekMap != null) { + DataSourceUtil.closeQuietly(dataSource); return output.seekMap; } }