diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java b/libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java index 13f1391cae..d23d0d607f 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java @@ -262,6 +262,7 @@ public final class DtsUtil { * @param trackId The track identifier to set on the format. * @param language The language to set on the format. * @param roleFlags The role flags to set on the format. + * @param containerMimeType The MIME type of the container to set on the format. * @param drmInitData {@link DrmInitData} to be included in the format. * @return The DTS format parsed from data in the header. */ @@ -270,6 +271,7 @@ public final class DtsUtil { @Nullable String trackId, @Nullable String language, @C.RoleFlags int roleFlags, + String containerMimeType, @Nullable DrmInitData drmInitData) { ParsableBitArray frameBits = getNormalizedFrame(frame); frameBits.skipBits(32 + 1 + 5 + 1 + 7 + 14); // SYNC, FTYPE, SHORT, CPF, NBLKS, FSIZE @@ -286,6 +288,7 @@ public final class DtsUtil { channelCount += frameBits.readBits(2) > 0 ? 1 : 0; // LFF return new Format.Builder() .setId(trackId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.AUDIO_DTS) .setAverageBitrate(bitrate) .setChannelCount(channelCount) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Extractor.java index a7bb6e0ac5..ed13e9a69a 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Extractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Extractor.java @@ -20,6 +20,7 @@ import static androidx.media3.extractor.metadata.id3.Id3Decoder.ID3_TAG; import static androidx.media3.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR; import androidx.media3.common.C; +import androidx.media3.common.MimeTypes; import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.UnstableApi; import androidx.media3.extractor.Ac3Util; @@ -55,7 +56,7 @@ public final class Ac3Extractor implements Extractor { /** Creates a new extractor for AC-3 bitstreams. */ public Ac3Extractor() { - reader = new Ac3Reader(); + reader = new Ac3Reader(MimeTypes.AUDIO_AC3); sampleData = new ParsableByteArray(MAX_SYNC_FRAME_SIZE); } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Reader.java index e0fd72e6f0..5173d8c22d 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Reader.java @@ -61,6 +61,7 @@ public final class Ac3Reader implements ElementaryStreamReader { private final ParsableByteArray headerScratchBytes; @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private @MonotonicNonNull String formatId; private @MonotonicNonNull TrackOutput output; @@ -79,9 +80,13 @@ public final class Ac3Reader implements ElementaryStreamReader { // Used when reading the samples. private long timeUs; - /** Constructs a new reader for (E-)AC-3 elementary streams. */ - public Ac3Reader() { - this(null, /* roleFlags= */ 0); + /** + * Constructs a new reader for (E-)AC-3 elementary streams. + * + * @param containerMimeType The MIME type of the container holding the stream. + */ + public Ac3Reader(String containerMimeType) { + this(null, /* roleFlags= */ 0, containerMimeType); } /** @@ -89,14 +94,17 @@ public final class Ac3Reader implements ElementaryStreamReader { * * @param language Track language. * @param roleFlags Track role flags. + * @param containerMimeType The MIME type of the container holding the stream. */ - public Ac3Reader(@Nullable String language, @C.RoleFlags int roleFlags) { + public Ac3Reader( + @Nullable String language, @C.RoleFlags int roleFlags, String containerMimeType) { headerScratchBits = new ParsableBitArray(new byte[HEADER_SIZE]); headerScratchBytes = new ParsableByteArray(headerScratchBits.data); state = STATE_FINDING_SYNC; timeUs = C.TIME_UNSET; this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; } @Override @@ -215,6 +223,7 @@ public final class Ac3Reader implements ElementaryStreamReader { Format.Builder formatBuilder = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(frameInfo.mimeType) .setChannelCount(frameInfo.channelCount) .setSampleRate(frameInfo.sampleRate) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Extractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Extractor.java index d85fc2a0c4..b40e2b0222 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Extractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Extractor.java @@ -22,6 +22,7 @@ import static androidx.media3.extractor.metadata.id3.Id3Decoder.ID3_TAG; import static androidx.media3.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_INDICATOR; import androidx.media3.common.C; +import androidx.media3.common.MimeTypes; import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.UnstableApi; import androidx.media3.extractor.Ac4Util; @@ -63,7 +64,7 @@ public final class Ac4Extractor implements Extractor { /** Creates a new extractor for AC-4 bitstreams. */ public Ac4Extractor() { - reader = new Ac4Reader(); + reader = new Ac4Reader(MimeTypes.AUDIO_AC4); sampleData = new ParsableByteArray(READ_BUFFER_SIZE); } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Reader.java index c9b6773b51..0d97e8a6e7 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Reader.java @@ -58,6 +58,7 @@ public final class Ac4Reader implements ElementaryStreamReader { private final ParsableByteArray headerScratchBytes; @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private @MonotonicNonNull String formatId; private @MonotonicNonNull TrackOutput output; @@ -77,9 +78,13 @@ public final class Ac4Reader implements ElementaryStreamReader { // Used when reading the samples. private long timeUs; - /** Constructs a new reader for AC-4 elementary streams. */ - public Ac4Reader() { - this(null, /* roleFlags= */ 0); + /** + * Constructs a new reader for AC-4 elementary streams. + * + * @param containerMimeType The MIME type of the container holding the stream. + */ + public Ac4Reader(String containerMimeType) { + this(null, /* roleFlags= */ 0, containerMimeType); } /** @@ -87,8 +92,10 @@ public final class Ac4Reader implements ElementaryStreamReader { * * @param language Track language. * @param roleFlags Track role flags. + * @param containerMimeType The MIME type of the container holding the stream. */ - public Ac4Reader(@Nullable String language, @C.RoleFlags int roleFlags) { + public Ac4Reader( + @Nullable String language, @C.RoleFlags int roleFlags, String containerMimeType) { headerScratchBits = new ParsableBitArray(new byte[Ac4Util.HEADER_SIZE_FOR_PARSER]); headerScratchBytes = new ParsableByteArray(headerScratchBits.data); state = STATE_FINDING_SYNC; @@ -98,6 +105,7 @@ public final class Ac4Reader implements ElementaryStreamReader { timeUs = C.TIME_UNSET; this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; } @Override @@ -216,6 +224,7 @@ public final class Ac4Reader implements ElementaryStreamReader { format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.AUDIO_AC4) .setChannelCount(frameInfo.channelCount) .setSampleRate(frameInfo.sampleRate) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsExtractor.java index 547a56eaea..eebd809977 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsExtractor.java @@ -22,6 +22,7 @@ import static java.lang.annotation.ElementType.TYPE_USE; import androidx.annotation.IntDef; import androidx.media3.common.C; +import androidx.media3.common.MimeTypes; import androidx.media3.common.ParserException; import androidx.media3.common.PlaybackException; import androidx.media3.common.Player; @@ -133,7 +134,7 @@ public final class AdtsExtractor implements Extractor { flags |= FLAG_ENABLE_CONSTANT_BITRATE_SEEKING; } this.flags = flags; - reader = new AdtsReader(true); + reader = new AdtsReader(true, MimeTypes.AUDIO_AAC); packetBuffer = new ParsableByteArray(MAX_PACKET_SIZE); averageFrameSize = C.LENGTH_UNSET; firstFramePosition = C.INDEX_UNSET; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsReader.java index b2c8c5a67c..7c55fc6977 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsReader.java @@ -72,6 +72,7 @@ public final class AdtsReader implements ElementaryStreamReader { private final ParsableByteArray id3HeaderBuffer; @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private @MonotonicNonNull String formatId; private @MonotonicNonNull TrackOutput output; @@ -104,20 +105,25 @@ public final class AdtsReader implements ElementaryStreamReader { /** * @param exposeId3 True if the reader should expose ID3 information. + * @param containerMimeType The MIME type of the container holding the stream. */ - public AdtsReader(boolean exposeId3) { - this(exposeId3, null, /* roleFlags= */ 0); + public AdtsReader(boolean exposeId3, String containerMimeType) { + this(exposeId3, null, /* roleFlags= */ 0, containerMimeType); } /** * @param exposeId3 True if the reader should expose ID3 information. * @param language Track language. * @param roleFlags Track role flags. + * @param containerMimeType The MIME type of the container holding the stream. */ - public AdtsReader(boolean exposeId3, @Nullable String language, @C.RoleFlags int roleFlags) { + public AdtsReader( + boolean exposeId3, + @Nullable String language, + @C.RoleFlags int roleFlags, + String containerMimeType) { adtsScratch = new ParsableBitArray(new byte[HEADER_SIZE + CRC_SIZE]); id3HeaderBuffer = new ParsableByteArray(Arrays.copyOf(ID3_IDENTIFIER, ID3_HEADER_SIZE)); - setFindingSampleState(); firstFrameVersion = VERSION_UNSET; firstFrameSampleRateIndex = C.INDEX_UNSET; sampleDurationUs = C.TIME_UNSET; @@ -125,6 +131,8 @@ public final class AdtsReader implements ElementaryStreamReader { this.exposeId3 = exposeId3; this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; + setFindingSampleState(); } /** Returns whether an integer matches an ADTS SYNC word. */ @@ -150,6 +158,7 @@ public final class AdtsReader implements ElementaryStreamReader { id3Output.format( new Format.Builder() .setId(idGenerator.getFormatId()) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.APPLICATION_ID3) .build()); } else { @@ -507,6 +516,7 @@ public final class AdtsReader implements ElementaryStreamReader { Format format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.AUDIO_AAC) .setCodecs(aacConfig.codecs) .setChannelCount(aacConfig.channelCount) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DefaultTsPayloadReaderFactory.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DefaultTsPayloadReaderFactory.java index 2f309076ec..d2aae227d6 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DefaultTsPayloadReaderFactory.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DefaultTsPayloadReaderFactory.java @@ -151,20 +151,26 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact switch (streamType) { case TsExtractor.TS_STREAM_TYPE_MPA: case TsExtractor.TS_STREAM_TYPE_MPA_LSF: - return new PesReader(new MpegAudioReader(esInfo.language, esInfo.getRoleFlags())); + return new PesReader( + new MpegAudioReader(esInfo.language, esInfo.getRoleFlags(), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_AAC_ADTS: return isSet(FLAG_IGNORE_AAC_STREAM) ? null - : new PesReader(new AdtsReader(false, esInfo.language, esInfo.getRoleFlags())); + : new PesReader( + new AdtsReader( + false, esInfo.language, esInfo.getRoleFlags(), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_AAC_LATM: return isSet(FLAG_IGNORE_AAC_STREAM) ? null - : new PesReader(new LatmReader(esInfo.language, esInfo.getRoleFlags())); + : new PesReader( + new LatmReader(esInfo.language, esInfo.getRoleFlags(), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_AC3: case TsExtractor.TS_STREAM_TYPE_E_AC3: - return new PesReader(new Ac3Reader(esInfo.language, esInfo.getRoleFlags())); + return new PesReader( + new Ac3Reader(esInfo.language, esInfo.getRoleFlags(), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_AC4: - return new PesReader(new Ac4Reader(esInfo.language, esInfo.getRoleFlags())); + return new PesReader( + new Ac4Reader(esInfo.language, esInfo.getRoleFlags(), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_HDMV_DTS: if (!isSet(FLAG_ENABLE_HDMV_DTS_AUDIO_STREAMS)) { return null; @@ -173,15 +179,23 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact case TsExtractor.TS_STREAM_TYPE_DTS: case TsExtractor.TS_STREAM_TYPE_DTS_HD: return new PesReader( - new DtsReader(esInfo.language, esInfo.getRoleFlags(), DtsReader.EXTSS_HEADER_SIZE_MAX)); + new DtsReader( + esInfo.language, + esInfo.getRoleFlags(), + DtsReader.EXTSS_HEADER_SIZE_MAX, + MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_DTS_UHD: return new PesReader( - new DtsReader(esInfo.language, esInfo.getRoleFlags(), DtsReader.FTOC_MAX_HEADER_SIZE)); + new DtsReader( + esInfo.language, + esInfo.getRoleFlags(), + DtsReader.FTOC_MAX_HEADER_SIZE, + MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_H262: case TsExtractor.TS_STREAM_TYPE_DC2_H262: - return new PesReader(new H262Reader(buildUserDataReader(esInfo))); + return new PesReader(new H262Reader(buildUserDataReader(esInfo), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_H263: - return new PesReader(new H263Reader(buildUserDataReader(esInfo))); + return new PesReader(new H263Reader(buildUserDataReader(esInfo), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_H264: return isSet(FLAG_IGNORE_H264_STREAM) ? null @@ -189,21 +203,28 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact new H264Reader( buildSeiReader(esInfo), isSet(FLAG_ALLOW_NON_IDR_KEYFRAMES), - isSet(FLAG_DETECT_ACCESS_UNITS))); + isSet(FLAG_DETECT_ACCESS_UNITS), + MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_H265: - return new PesReader(new H265Reader(buildSeiReader(esInfo))); + return new PesReader(new H265Reader(buildSeiReader(esInfo), MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_SPLICE_INFO: return isSet(FLAG_IGNORE_SPLICE_INFO_STREAM) ? null - : new SectionReader(new PassthroughSectionPayloadReader(MimeTypes.APPLICATION_SCTE35)); + : new SectionReader( + new PassthroughSectionPayloadReader( + /* sampleMimeType= */ MimeTypes.APPLICATION_SCTE35, + /* containerMimeType= */ MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_ID3: - return new PesReader(new Id3Reader()); + return new PesReader(new Id3Reader(MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_DVBSUBS: - return new PesReader(new DvbSubtitleReader(esInfo.dvbSubtitleInfos)); + return new PesReader(new DvbSubtitleReader(esInfo.dvbSubtitleInfos, MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_AIT: - return new SectionReader(new PassthroughSectionPayloadReader(MimeTypes.APPLICATION_AIT)); + return new SectionReader( + new PassthroughSectionPayloadReader( + /* sampleMimeType= */ MimeTypes.APPLICATION_AIT, + /* containerMimeType= */ MimeTypes.VIDEO_MP2T)); case TsExtractor.TS_STREAM_TYPE_MHAS: - return new PesReader(new MpeghReader()); + return new PesReader(new MpeghReader(MimeTypes.VIDEO_MP2T)); default: return null; } @@ -219,7 +240,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact * @return A {@link SeiReader} for closed caption tracks. */ private SeiReader buildSeiReader(EsInfo esInfo) { - return new SeiReader(getClosedCaptionFormats(esInfo)); + return new SeiReader(getClosedCaptionFormats(esInfo), MimeTypes.VIDEO_MP2T); } /** @@ -232,7 +253,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact * @return A {@link UserDataReader} for closed caption tracks. */ private UserDataReader buildUserDataReader(EsInfo esInfo) { - return new UserDataReader(getClosedCaptionFormats(esInfo)); + return new UserDataReader(getClosedCaptionFormats(esInfo), MimeTypes.VIDEO_MP2T); } /** diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java index 6f9968936e..fa9afcbf49 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java @@ -69,6 +69,7 @@ public final class DtsReader implements ElementaryStreamReader { @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private @MonotonicNonNull String formatId; private @MonotonicNonNull TrackOutput output; @@ -96,8 +97,13 @@ public final class DtsReader implements ElementaryStreamReader { * @param language Track language. * @param roleFlags Track role flags. * @param maxHeaderSize Maximum size of the header in a frame. + * @param containerMimeType The MIME type of the container holding the stream. */ - public DtsReader(@Nullable String language, @C.RoleFlags int roleFlags, int maxHeaderSize) { + public DtsReader( + @Nullable String language, + @C.RoleFlags int roleFlags, + int maxHeaderSize, + String containerMimeType) { headerScratchBytes = new ParsableByteArray(new byte[maxHeaderSize]); state = STATE_FINDING_SYNC; timeUs = C.TIME_UNSET; @@ -106,6 +112,7 @@ public final class DtsReader implements ElementaryStreamReader { uhdHeaderSize = C.LENGTH_UNSET; this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; } @Override @@ -266,7 +273,8 @@ public final class DtsReader implements ElementaryStreamReader { private void parseCoreHeader() { byte[] frameData = headerScratchBytes.getData(); if (format == null) { - format = DtsUtil.parseDtsFormat(frameData, formatId, language, roleFlags, null); + format = + DtsUtil.parseDtsFormat(frameData, formatId, language, roleFlags, containerMimeType, null); output.format(format); } sampleSize = DtsUtil.getDtsFrameSize(frameData); @@ -313,6 +321,7 @@ public final class DtsReader implements ElementaryStreamReader { format = formatBuilder .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(dtsHeader.mimeType) .setChannelCount(dtsHeader.channelCount) .setSampleRate(dtsHeader.sampleRate) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DvbSubtitleReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DvbSubtitleReader.java index 02d111c855..4e2d9467be 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DvbSubtitleReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DvbSubtitleReader.java @@ -35,6 +35,7 @@ import java.util.List; public final class DvbSubtitleReader implements ElementaryStreamReader { private final List subtitleInfos; + private final String containerMimeType; private final TrackOutput[] outputs; private boolean writingSample; @@ -44,9 +45,11 @@ public final class DvbSubtitleReader implements ElementaryStreamReader { /** * @param subtitleInfos Information about the DVB subtitles associated to the stream. + * @param containerMimeType The MIME type of the container holding the stream. */ - public DvbSubtitleReader(List subtitleInfos) { + public DvbSubtitleReader(List subtitleInfos, String containerMimeType) { this.subtitleInfos = subtitleInfos; + this.containerMimeType = containerMimeType; outputs = new TrackOutput[subtitleInfos.size()]; sampleTimeUs = C.TIME_UNSET; } @@ -66,6 +69,7 @@ public final class DvbSubtitleReader implements ElementaryStreamReader { output.format( new Format.Builder() .setId(idGenerator.getFormatId()) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.APPLICATION_DVBSUBS) .setInitializationData(Collections.singletonList(subtitleInfo.initializationData)) .setLanguage(subtitleInfo.language) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java index 1358dbaf42..4bc08b44e4 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java @@ -52,6 +52,7 @@ public final class H262Reader implements ElementaryStreamReader { new double[] {24000d / 1001, 24, 25, 30000d / 1001, 30, 50, 60000d / 1001, 60}; @Nullable private final UserDataReader userDataReader; + private final String containerMimeType; @Nullable private final ParsableByteArray userDataParsable; // State that should be reset on seek. @@ -74,12 +75,13 @@ public final class H262Reader implements ElementaryStreamReader { private boolean sampleIsKeyframe; private boolean sampleHasPicture; - public H262Reader() { - this(null); + public H262Reader(String containerMimeType) { + this(null, containerMimeType); } - /* package */ H262Reader(@Nullable UserDataReader userDataReader) { + /* package */ H262Reader(@Nullable UserDataReader userDataReader, String containerMimeType) { this.userDataReader = userDataReader; + this.containerMimeType = containerMimeType; prefixFlags = new boolean[4]; csdBuffer = new CsdBuffer(128); if (userDataReader != null) { @@ -162,7 +164,8 @@ public final class H262Reader implements ElementaryStreamReader { int bytesAlreadyPassed = lengthToStartCode < 0 ? -lengthToStartCode : 0; if (csdBuffer.onStartCode(startCodeValue, bytesAlreadyPassed)) { // The csd data is complete, so we can decode and output the media format. - Pair result = parseCsdBuffer(csdBuffer, checkNotNull(formatId)); + Pair result = + parseCsdBuffer(csdBuffer, checkNotNull(formatId), containerMimeType); output.format(result.first); frameDurationUs = result.second; hasOutputFormat = true; @@ -231,10 +234,12 @@ public final class H262Reader implements ElementaryStreamReader { * * @param csdBuffer The csd buffer. * @param formatId The id for the generated format. + * @param containerMimeType The MIME type of the container for the generated format. * @return A pair consisting of the {@link Format} and the frame duration in microseconds, or 0 if * the duration could not be determined. */ - private static Pair parseCsdBuffer(CsdBuffer csdBuffer, String formatId) { + private static Pair parseCsdBuffer( + CsdBuffer csdBuffer, String formatId, String containerMimeType) { byte[] csdData = Arrays.copyOf(csdBuffer.data, csdBuffer.length); int firstByte = csdData[4] & 0xFF; @@ -263,6 +268,7 @@ public final class H262Reader implements ElementaryStreamReader { Format format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.VIDEO_MPEG2) .setWidth(width) .setHeight(height) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java index 5c9d03eab9..c76ff9add4 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java @@ -65,6 +65,7 @@ public final class H263Reader implements ElementaryStreamReader { private static final int VIDEO_OBJECT_LAYER_SHAPE_RECTANGULAR = 0; @Nullable private final UserDataReader userDataReader; + private final String containerMimeType; @Nullable private final ParsableByteArray userDataParsable; // State that should be reset on seek. @@ -85,12 +86,13 @@ public final class H263Reader implements ElementaryStreamReader { private long pesTimeUs; /** Creates a new reader. */ - public H263Reader() { - this(null); + public H263Reader(String containerMimeType) { + this(null, containerMimeType); } - /* package */ H263Reader(@Nullable UserDataReader userDataReader) { + /* package */ H263Reader(@Nullable UserDataReader userDataReader, String containerMimeType) { this.userDataReader = userDataReader; + this.containerMimeType = containerMimeType; prefixFlags = new boolean[4]; csdBuffer = new CsdBuffer(128); pesTimeUs = C.TIME_UNSET; @@ -178,7 +180,11 @@ public final class H263Reader implements ElementaryStreamReader { if (csdBuffer.onStartCode(startCodeValue, bytesAlreadyPassed)) { // The csd data is complete, so we can decode and output the media format. output.format( - parseCsdBuffer(csdBuffer, csdBuffer.volStartPosition, checkNotNull(formatId))); + parseCsdBuffer( + csdBuffer, + csdBuffer.volStartPosition, + checkNotNull(formatId), + containerMimeType)); hasOutputFormat = true; } } @@ -231,9 +237,11 @@ public final class H263Reader implements ElementaryStreamReader { * @param csdBuffer The buffer to parse. * @param volStartPosition The byte offset of the start of the video object layer in the buffer. * @param formatId The ID for the generated format. + * @param containerMimeType The MIME type of the container for the generated format. * @return The {@link Format} of the media represented in the buffer. */ - private static Format parseCsdBuffer(CsdBuffer csdBuffer, int volStartPosition, String formatId) { + private static Format parseCsdBuffer( + CsdBuffer csdBuffer, int volStartPosition, String formatId, String containerMimeType) { byte[] csdData = Arrays.copyOf(csdBuffer.data, csdBuffer.length); ParsableBitArray buffer = new ParsableBitArray(csdData); buffer.skipBytes(volStartPosition); @@ -308,6 +316,7 @@ public final class H263Reader implements ElementaryStreamReader { buffer.skipBit(); // interlaced return new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.VIDEO_MP4V) .setWidth(videoObjectLayerWidth) .setHeight(videoObjectLayerHeight) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java index d3468fcb1e..e151ecfde3 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java @@ -48,6 +48,7 @@ public final class H264Reader implements ElementaryStreamReader { private final SeiReader seiReader; private final boolean allowNonIdrKeyframes; private final boolean detectAccessUnits; + private final String containerMimeType; private final NalUnitTargetBuffer sps; private final NalUnitTargetBuffer pps; private final NalUnitTargetBuffer sei; @@ -76,11 +77,17 @@ public final class H264Reader implements ElementaryStreamReader { * synchronization samples (key-frames). * @param detectAccessUnits Whether to split the input stream into access units (samples) based on * slice headers. Pass {@code false} if the stream contains access unit delimiters (AUDs). + * @param containerMimeType The MIME type of the container holding the stream. */ - public H264Reader(SeiReader seiReader, boolean allowNonIdrKeyframes, boolean detectAccessUnits) { + public H264Reader( + SeiReader seiReader, + boolean allowNonIdrKeyframes, + boolean detectAccessUnits, + String containerMimeType) { this.seiReader = seiReader; this.allowNonIdrKeyframes = allowNonIdrKeyframes; this.detectAccessUnits = detectAccessUnits; + this.containerMimeType = containerMimeType; prefixFlags = new boolean[3]; sps = new NalUnitTargetBuffer(NalUnitUtil.H264_NAL_UNIT_TYPE_SPS, 128); pps = new NalUnitTargetBuffer(NalUnitUtil.H264_NAL_UNIT_TYPE_PPS, 128); @@ -216,6 +223,7 @@ public final class H264Reader implements ElementaryStreamReader { output.format( new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.VIDEO_H264) .setCodecs(codecs) .setWidth(spsData.width) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java index 3b6ba333f7..ce9b75ad03 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/H265Reader.java @@ -41,6 +41,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; public final class H265Reader implements ElementaryStreamReader { private final SeiReader seiReader; + private final String containerMimeType; private @MonotonicNonNull String formatId; private @MonotonicNonNull TrackOutput output; @@ -66,9 +67,11 @@ public final class H265Reader implements ElementaryStreamReader { /** * @param seiReader An SEI reader for consuming closed caption channels. + * @param containerMimeType The MIME type of the container holding the stream. */ - public H265Reader(SeiReader seiReader) { + public H265Reader(SeiReader seiReader, String containerMimeType) { this.seiReader = seiReader; + this.containerMimeType = containerMimeType; prefixFlags = new boolean[3]; vps = new NalUnitTargetBuffer(NalUnitUtil.H265_NAL_UNIT_TYPE_VPS, 128); sps = new NalUnitTargetBuffer(NalUnitUtil.H265_NAL_UNIT_TYPE_SPS, 128); @@ -202,7 +205,7 @@ public final class H265Reader implements ElementaryStreamReader { sps.endNalUnit(discardPadding); pps.endNalUnit(discardPadding); if (vps.isCompleted() && sps.isCompleted() && pps.isCompleted()) { - Format format = parseMediaFormat(formatId, vps, sps, pps); + Format format = parseMediaFormat(formatId, vps, sps, pps, containerMimeType); output.format(format); checkState(format.maxNumReorderSamples != Format.NO_VALUE); seiReader.setReorderingQueueSize(format.maxNumReorderSamples); @@ -231,7 +234,8 @@ public final class H265Reader implements ElementaryStreamReader { @Nullable String formatId, NalUnitTargetBuffer vps, NalUnitTargetBuffer sps, - NalUnitTargetBuffer pps) { + NalUnitTargetBuffer pps, + String containerMimeType) { // Build codec-specific data. byte[] csdData = new byte[vps.nalLength + sps.nalLength + pps.nalLength]; System.arraycopy(vps.nalData, 0, csdData, 0, vps.nalLength); @@ -256,6 +260,7 @@ public final class H265Reader implements ElementaryStreamReader { } return new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.VIDEO_H265) .setCodecs(codecs) .setWidth(spsData.width) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Id3Reader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Id3Reader.java index 002dd33657..1959b48878 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Id3Reader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/Id3Reader.java @@ -38,6 +38,7 @@ public final class Id3Reader implements ElementaryStreamReader { private static final String TAG = "Id3Reader"; + private final String containerMimeType; private final ParsableByteArray id3Header; private @MonotonicNonNull TrackOutput output; @@ -50,7 +51,8 @@ public final class Id3Reader implements ElementaryStreamReader { private int sampleSize; private int sampleBytesRead; - public Id3Reader() { + public Id3Reader(String containerMimeType) { + this.containerMimeType = containerMimeType; id3Header = new ParsableByteArray(ID3_HEADER_LENGTH); sampleTimeUs = C.TIME_UNSET; } @@ -68,6 +70,7 @@ public final class Id3Reader implements ElementaryStreamReader { output.format( new Format.Builder() .setId(idGenerator.getFormatId()) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.APPLICATION_ID3) .build()); } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/LatmReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/LatmReader.java index ae3a4ae386..4133fdcd50 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/LatmReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/LatmReader.java @@ -50,6 +50,7 @@ public final class LatmReader implements ElementaryStreamReader { @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private final ParsableByteArray sampleDataBuffer; private final ParsableBitArray sampleBitArray; @@ -80,10 +81,13 @@ public final class LatmReader implements ElementaryStreamReader { /** * @param language Track language. * @param roleFlags Track role flags. + * @param containerMimeType The MIME type of the container holding the stream. */ - public LatmReader(@Nullable String language, @C.RoleFlags int roleFlags) { + public LatmReader( + @Nullable String language, @C.RoleFlags int roleFlags, String containerMimeType) { this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; sampleDataBuffer = new ParsableByteArray(INITIAL_BUFFER_SIZE); sampleBitArray = new ParsableBitArray(sampleDataBuffer.getData()); timeUs = C.TIME_UNSET; @@ -214,6 +218,7 @@ public final class LatmReader implements ElementaryStreamReader { Format format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.AUDIO_AAC) .setCodecs(codecs) .setChannelCount(channelCount) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpegAudioReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpegAudioReader.java index 928f9d1a65..b64b4f1323 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpegAudioReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpegAudioReader.java @@ -45,6 +45,7 @@ public final class MpegAudioReader implements ElementaryStreamReader { private final MpegAudioUtil.Header header; @Nullable private final String language; private final @C.RoleFlags int roleFlags; + private final String containerMimeType; private @MonotonicNonNull TrackOutput output; private @MonotonicNonNull String formatId; @@ -63,11 +64,12 @@ public final class MpegAudioReader implements ElementaryStreamReader { // The timestamp to attach to the next sample in the current packet. private long timeUs; - public MpegAudioReader() { - this(null, /* roleFlags= */ 0); + public MpegAudioReader(String containerMimeType) { + this(null, /* roleFlags= */ 0, containerMimeType); } - public MpegAudioReader(@Nullable String language, @C.RoleFlags int roleFlags) { + public MpegAudioReader( + @Nullable String language, @C.RoleFlags int roleFlags, String containerMimeType) { state = STATE_FINDING_HEADER; // The first byte of an MPEG Audio frame header is always 0xFF. headerScratch = new ParsableByteArray(4); @@ -76,6 +78,7 @@ public final class MpegAudioReader implements ElementaryStreamReader { timeUs = C.TIME_UNSET; this.language = language; this.roleFlags = roleFlags; + this.containerMimeType = containerMimeType; } @Override @@ -197,6 +200,7 @@ public final class MpegAudioReader implements ElementaryStreamReader { Format format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(header.mimeType) .setMaxInputSize(MpegAudioUtil.MAX_FRAME_SIZE_BYTES) .setChannelCount(header.channels) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java index d2dd1a3b4a..ab21b19dfe 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/MpeghReader.java @@ -60,6 +60,7 @@ public final class MpeghReader implements ElementaryStreamReader { private static final int MIN_MHAS_PACKET_HEADER_SIZE = 2; private static final int MAX_MHAS_PACKET_HEADER_SIZE = 15; + private final String containerMimeType; private final ParsableByteArray headerScratchBytes; private final ParsableBitArray headerScratchBits; private final ParsableByteArray dataScratchBytes; @@ -89,8 +90,13 @@ public final class MpeghReader implements ElementaryStreamReader { private long mainStreamLabel; private boolean configFound; - /** Constructs a new reader for MPEG-H elementary streams. */ - public MpeghReader() { + /** + * Constructs a new reader for MPEG-H elementary streams. + * + * @param containerMimeType The MIME type of the container holding the stream. + */ + public MpeghReader(String containerMimeType) { + this.containerMimeType = containerMimeType; state = STATE_FINDING_SYNC; headerScratchBytes = new ParsableByteArray(new byte[MAX_MHAS_PACKET_HEADER_SIZE], MIN_MHAS_PACKET_HEADER_SIZE); @@ -344,6 +350,7 @@ public final class MpeghReader implements ElementaryStreamReader { Format format = new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(MimeTypes.AUDIO_MPEGH_MHM1) .setSampleRate(samplingRate) .setCodecs(codecs) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PassthroughSectionPayloadReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PassthroughSectionPayloadReader.java index b1176b47a3..39d38e66a0 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PassthroughSectionPayloadReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PassthroughSectionPayloadReader.java @@ -42,10 +42,17 @@ public final class PassthroughSectionPayloadReader implements SectionPayloadRead /** * Create a new PassthroughSectionPayloadReader. * - * @param mimeType The MIME type set as {@link Format#sampleMimeType} on the created output track. + * @param sampleMimeType The MIME type set as {@link Format#sampleMimeType} on the created output + * track. + * @param containerMimeType The MIME type set as {@link Format#containerMimeType} on the created + * output track. */ - public PassthroughSectionPayloadReader(String mimeType) { - this.format = new Format.Builder().setSampleMimeType(mimeType).build(); + public PassthroughSectionPayloadReader(String sampleMimeType, String containerMimeType) { + this.format = + new Format.Builder() + .setContainerMimeType(containerMimeType) + .setSampleMimeType(sampleMimeType) + .build(); } @Override diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PsExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PsExtractor.java index eb3a4418fe..7773140371 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PsExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/PsExtractor.java @@ -18,6 +18,7 @@ package androidx.media3.extractor.ts; import android.util.SparseArray; import androidx.annotation.Nullable; import androidx.media3.common.C; +import androidx.media3.common.MimeTypes; import androidx.media3.common.ParserException; import androidx.media3.common.util.Assertions; import androidx.media3.common.util.ParsableBitArray; @@ -239,15 +240,15 @@ public final class PsExtractor implements Extractor { // Private stream, used for AC3 audio. // NOTE: This may need further parsing to determine if its DTS, but that's likely only // valid for DVDs. - elementaryStreamReader = new Ac3Reader(); + elementaryStreamReader = new Ac3Reader(MimeTypes.VIDEO_PS); foundAudioTrack = true; lastTrackPosition = input.getPosition(); } else if ((streamId & AUDIO_STREAM_MASK) == AUDIO_STREAM) { - elementaryStreamReader = new MpegAudioReader(); + elementaryStreamReader = new MpegAudioReader(MimeTypes.VIDEO_PS); foundAudioTrack = true; lastTrackPosition = input.getPosition(); } else if ((streamId & VIDEO_STREAM_MASK) == VIDEO_STREAM) { - elementaryStreamReader = new H262Reader(); + elementaryStreamReader = new H262Reader(MimeTypes.VIDEO_PS); foundVideoTrack = true; lastTrackPosition = input.getPosition(); } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java index 8975af9fc0..36c089950b 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java @@ -34,14 +34,17 @@ import java.util.List; public final class SeiReader { private final List closedCaptionFormats; + private final String containerMimeType; private final TrackOutput[] outputs; private final ReorderingSeiMessageQueue reorderingSeiMessageQueue; /** * @param closedCaptionFormats A list of formats for the closed caption channels to expose. + * @param containerMimeType The MIME type of the container holding the SEI buffers. */ - public SeiReader(List closedCaptionFormats) { + public SeiReader(List closedCaptionFormats, String containerMimeType) { this.closedCaptionFormats = closedCaptionFormats; + this.containerMimeType = containerMimeType; outputs = new TrackOutput[closedCaptionFormats.size()]; reorderingSeiMessageQueue = new ReorderingSeiMessageQueue( @@ -63,6 +66,7 @@ public final class SeiReader { output.format( new Format.Builder() .setId(formatId) + .setContainerMimeType(containerMimeType) .setSampleMimeType(channelMimeType) .setSelectionFlags(channelFormat.selectionFlags) .setLanguage(channelFormat.language) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java index ea44946265..523c128138 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java @@ -32,10 +32,12 @@ import java.util.List; private static final int USER_DATA_START_CODE = 0x0001B2; private final List closedCaptionFormats; + private final String containerMimeType; private final TrackOutput[] outputs; - public UserDataReader(List closedCaptionFormats) { + public UserDataReader(List closedCaptionFormats, String containerMimeType) { this.closedCaptionFormats = closedCaptionFormats; + this.containerMimeType = containerMimeType; outputs = new TrackOutput[closedCaptionFormats.size()]; } @@ -53,6 +55,7 @@ import java.util.List; output.format( new Format.Builder() .setId(idGenerator.getFormatId()) + .setContainerMimeType(containerMimeType) .setSampleMimeType(channelMimeType) .setSelectionFlags(channelFormat.selectionFlags) .setLanguage(channelFormat.language) diff --git a/libraries/extractor/src/test/java/androidx/media3/extractor/ts/AdtsReaderTest.java b/libraries/extractor/src/test/java/androidx/media3/extractor/ts/AdtsReaderTest.java index cbdfd1872c..4d2f21e42b 100644 --- a/libraries/extractor/src/test/java/androidx/media3/extractor/ts/AdtsReaderTest.java +++ b/libraries/extractor/src/test/java/androidx/media3/extractor/ts/AdtsReaderTest.java @@ -19,6 +19,7 @@ import static androidx.media3.extractor.ts.TsPayloadReader.FLAG_DATA_ALIGNMENT_I import static java.lang.Math.min; import androidx.media3.common.C; +import androidx.media3.common.MimeTypes; import androidx.media3.common.ParserException; import androidx.media3.common.util.ParsableByteArray; import androidx.media3.extractor.ts.TsPayloadReader.TrackIdGenerator; @@ -74,7 +75,7 @@ public class AdtsReaderTest { FakeExtractorOutput fakeExtractorOutput = new FakeExtractorOutput(); adtsOutput = fakeExtractorOutput.track(0, C.TRACK_TYPE_AUDIO); id3Output = fakeExtractorOutput.track(1, C.TRACK_TYPE_METADATA); - adtsReader = new AdtsReader(true); + adtsReader = new AdtsReader(true, MimeTypes.AUDIO_AAC); TrackIdGenerator idGenerator = new TrackIdGenerator(0, 1); adtsReader.createTracks(fakeExtractorOutput, idGenerator); data = new ParsableByteArray(TEST_DATA); diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.0.dump index 8aad7940f2..bebe321376 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.0.dump @@ -10,6 +10,7 @@ track 0: averageBitrate = 384000 peakBitrate = 384000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump index 8aad7940f2..bebe321376 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac3.unknown_length.dump @@ -10,6 +10,7 @@ track 0: averageBitrate = 384000 peakBitrate = 384000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.0.dump index 3b82b0bd2d..f16e65c4fa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.0.dump @@ -8,6 +8,7 @@ track 0: sample count = 19 format 0: id = 0 + containerMimeType = audio/ac4 sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump index 3b82b0bd2d..f16e65c4fa 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.ac4.unknown_length.dump @@ -8,6 +8,7 @@ track 0: sample count = 19 format 0: id = 0 + containerMimeType = audio/ac4 sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.0.dump index ddfea3e99b..c6c2c124cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.0.dump @@ -8,6 +8,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -595,5 +596,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump index ddfea3e99b..c6c2c124cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.adts.unknown_length.dump @@ -8,6 +8,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -595,5 +596,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.0.dump index f8be0e618c..6d73b407a5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.0.dump @@ -9,6 +9,7 @@ track 0: format 0: peakBitrate = 6000000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump index f8be0e618c..6d73b407a5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample.eac3.unknown_length.dump @@ -9,6 +9,7 @@ track 0: format 0: peakBitrate = 6000000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump index 143245058f..5f5e7a41e0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.0.dump @@ -13,6 +13,7 @@ track 189: averageBitrate = 96000 peakBitrate = 96000 id = 189 + containerMimeType = video/mp2p sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump index 62c215256f..52e6ab7e5a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ps.unknown_length.dump @@ -10,6 +10,7 @@ track 189: averageBitrate = 96000 peakBitrate = 96000 id = 189 + containerMimeType = video/mp2p sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 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 f3ac4e2018..cdccbb14c0 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 @@ -13,6 +13,7 @@ track 1900: averageBitrate = 384000 peakBitrate = 384000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 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 9f141492b2..072135741b 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 @@ -13,6 +13,7 @@ track 1900: averageBitrate = 384000 peakBitrate = 384000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 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 e6cea3993f..fc484edbb9 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 @@ -13,6 +13,7 @@ track 1900: averageBitrate = 384000 peakBitrate = 384000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 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 da9814ead3..72eac97316 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 @@ -13,6 +13,7 @@ track 1900: averageBitrate = 384000 peakBitrate = 384000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump index f992ac64e8..7cb055582d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac3.ts.unknown_length.dump @@ -10,6 +10,7 @@ track 1900: averageBitrate = 384000 peakBitrate = 384000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac3 channelCount = 6 sampleRate = 48000 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 80978a8483..85dd8f102b 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 @@ -11,6 +11,7 @@ track 1900: sample count = 19 format 0: id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 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 f9bb28919c..15b8e12e6c 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 @@ -11,6 +11,7 @@ track 1900: sample count = 12 format 0: id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 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 3c90f502a5..9d9bc55366 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 @@ -11,6 +11,7 @@ track 1900: sample count = 6 format 0: id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 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 87199300c7..fd3f790a32 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 @@ -11,6 +11,7 @@ track 1900: sample count = 0 format 0: id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump index 3982b407bd..9f9ae77e7d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ac4.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 1900: sample count = 19 format 0: id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/ac4 channelCount = 2 sampleRate = 48000 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 3a305ed662..3d8e261c37 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 @@ -9,6 +9,7 @@ track 330: format 0: peakBitrate = 128000 id = 1031/330 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 2 sampleRate = 48000 @@ -93,6 +94,7 @@ track 370: total output bytes = 1413 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/vnd.dvb.ait subsampleOffsetUs = -43622564033 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump index 3a305ed662..3d8e261c37 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_ait.ts.unknown_length.dump @@ -9,6 +9,7 @@ track 330: format 0: peakBitrate = 128000 id = 1031/330 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 2 sampleRate = 48000 @@ -93,6 +94,7 @@ track 370: total output bytes = 1413 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/vnd.dvb.ait subsampleOffsetUs = -43622564033 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump index e3aaa10d42..277882d3b4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.0.dump @@ -11,6 +11,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -598,5 +599,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump index ab3d2feefd..45bacf1147 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.1.dump @@ -11,6 +11,7 @@ track 0: sample count = 94 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -398,5 +399,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump index 2330cdc3ce..f99165803c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.2.dump @@ -11,6 +11,7 @@ track 0: sample count = 49 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -218,5 +219,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump index ae07524dad..67f3b43eb6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.3.dump @@ -11,6 +11,7 @@ track 0: sample count = 1 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -26,5 +27,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump index ddfea3e99b..c6c2c124cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs.adts.unknown_length.dump @@ -8,6 +8,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -595,5 +596,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump index b94049c6be..66d38dc4de 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.0.dump @@ -11,6 +11,7 @@ track 0: sample count = 143 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -594,5 +595,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump index 79805d78f7..83c0dfe9c8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.1.dump @@ -11,6 +11,7 @@ track 0: sample count = 93 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -394,5 +395,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump index 7c6278eca1..d00b2f09c2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.2.dump @@ -11,6 +11,7 @@ track 0: sample count = 48 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -214,5 +215,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump index 518bcf4a3b..79ca447ac1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.3.dump @@ -11,6 +11,7 @@ track 0: sample count = 0 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -22,5 +23,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump index 0af445910d..1325cbf9df 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_cbs_truncated.adts.unknown_length.dump @@ -8,6 +8,7 @@ track 0: sample count = 143 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -591,5 +592,6 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 tracksEnded = true diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.0.dump index c365cd4e31..71173dbc54 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.0.dump @@ -12,6 +12,7 @@ track 257: format 0: averageBitrate = 768000 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.1.dump index 3971920a3f..1a46f1b0b1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.1.dump @@ -12,6 +12,7 @@ track 257: format 0: averageBitrate = 768000 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.2.dump index 96942653e0..99cf0e0b97 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.2.dump @@ -12,6 +12,7 @@ track 257: format 0: averageBitrate = 768000 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.3.dump index ab45b1bd00..b26bbd0454 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.3.dump @@ -12,6 +12,7 @@ track 257: format 0: averageBitrate = 768000 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.unknown_length.dump index 1150cbacfb..eef76685bf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts.ts.unknown_length.dump @@ -9,6 +9,7 @@ track 257: format 0: averageBitrate = 768000 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.0.dump index 7d6271f027..71355e448f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.0.dump @@ -11,6 +11,7 @@ track 257: sample count = 11 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.hd;profile=lbr channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.1.dump index affd4f713b..88ff0d6554 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.1.dump @@ -11,6 +11,7 @@ track 257: sample count = 8 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.hd;profile=lbr channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.2.dump index d9803a8904..80cb4f6b5f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.2.dump @@ -11,6 +11,7 @@ track 257: sample count = 5 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.hd;profile=lbr channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.3.dump index 7c2f06ab6b..cf1c4d4903 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.3.dump @@ -11,6 +11,7 @@ track 257: sample count = 0 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.hd;profile=lbr channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.unknown_length.dump index 00eb0c5d24..2154bcfeb0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_hd.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 257: sample count = 11 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.hd;profile=lbr channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.0.dump index a87dc4b897..ea6db05847 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.0.dump @@ -11,6 +11,7 @@ track 257: sample count = 234 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.uhd;profile=p2 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.1.dump index 1c4379b259..c315e570cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.1.dump @@ -11,6 +11,7 @@ track 257: sample count = 161 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.uhd;profile=p2 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.2.dump index d4f5dcac85..f1c28d0aa6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.2.dump @@ -11,6 +11,7 @@ track 257: sample count = 83 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.uhd;profile=p2 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.3.dump index 7250b07952..88b0def917 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.3.dump @@ -11,6 +11,7 @@ track 257: sample count = 5 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.uhd;profile=p2 channelCount = 2 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.unknown_length.dump index 0900c65dc1..4b3fd94f1f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_dts_uhd.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 257: sample count = 234 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts.uhd;profile=p2 channelCount = 2 sampleRate = 48000 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 2ccaceef7f..a761e2cc59 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 6000000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 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 ccf162fc31..f7b11ea184 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 6000000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 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 286fc25b16..4a3e5ae5ef 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 6000000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 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 cfbfae20b6..87fe569a76 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 6000000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump index 4bb8650d72..b5aa0907c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3.ts.unknown_length.dump @@ -9,6 +9,7 @@ track 1900: format 0: peakBitrate = 6000000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3 channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump index 5a8f918105..6fc36afe9e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.0.dump @@ -9,6 +9,7 @@ track 0: format 0: peakBitrate = 640000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump index 5a8f918105..6fc36afe9e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ec3.unknown_length.dump @@ -9,6 +9,7 @@ track 0: format 0: peakBitrate = 640000 id = 0 + containerMimeType = audio/ac3 sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 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 2fc2f49280..973c7efd4d 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 640000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 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 771c5216c5..b2d0ed9590 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 640000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 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 452d8eea13..8d55bcfd10 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 640000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 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 8da152a79f..f65a8e3237 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 @@ -12,6 +12,7 @@ track 1900: format 0: peakBitrate = 640000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump index 82ce1d24bb..0ee3d98ff6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_eac3joc.ts.unknown_length.dump @@ -9,6 +9,7 @@ track 1900: format 0: peakBitrate = 640000 id = 1/1900 + containerMimeType = video/mp2t sampleMimeType = audio/eac3-joc channelCount = 6 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump index d62351650b..e3c559fcb5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.0.dump @@ -11,6 +11,7 @@ track 192: sample count = 4 format 0: id = 192 + containerMimeType = video/mp2p sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -36,6 +37,7 @@ track 224: sample count = 2 format 0: id = 224 + containerMimeType = video/mp2p sampleMimeType = video/mpeg2 width = 640 height = 426 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump index 9bdd929c42..da2c7c09cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h262_mpeg_audio.ps.1.dump @@ -11,6 +11,7 @@ track 192: sample count = 0 format 0: id = 192 + containerMimeType = video/mp2p sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -20,6 +21,7 @@ track 224: sample count = 1 format 0: id = 224 + containerMimeType = video/mp2p sampleMimeType = video/mpeg2 width = 640 height = 426 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 ef5e2476d2..94e7710df3 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 @@ -11,6 +11,7 @@ track 192: sample count = 0 format 0: id = 192 + containerMimeType = video/mp2p sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -20,6 +21,7 @@ track 224: sample count = 0 format 0: id = 224 + containerMimeType = video/mp2p sampleMimeType = video/mpeg2 width = 640 height = 426 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 59dabce629..c8db47e226 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 @@ -11,6 +11,7 @@ track 192: sample count = 0 format 0: id = 192 + containerMimeType = video/mp2p sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -20,6 +21,7 @@ track 224: sample count = 0 format 0: id = 224 + containerMimeType = video/mp2p sampleMimeType = video/mpeg2 width = 640 height = 426 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 5edc0b708a..210ceb561f 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 @@ -8,6 +8,7 @@ track 192: sample count = 4 format 0: id = 192 + containerMimeType = video/mp2p sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -33,6 +34,7 @@ track 224: sample count = 2 format 0: id = 224 + containerMimeType = video/mp2p sampleMimeType = video/mpeg2 width = 640 height = 426 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 8e996b6f31..4973d81b84 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 8e996b6f31..4973d81b84 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 8e996b6f31..4973d81b84 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 f0fd81369f..cb2948a90d 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 @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -21,6 +22,7 @@ track 257: sample count = 2 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 a3101e564e..50140fd39c 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 @@ -8,6 +8,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -26,6 +27,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 4acc09c7f8..955f0a2da0 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 @@ -11,6 +11,7 @@ track 256: sample count = 25 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mp4v-es width = 640 height = 360 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 068d08fae8..5dbbb60c95 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 @@ -11,6 +11,7 @@ track 256: sample count = 19 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mp4v-es width = 640 height = 360 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 beabaa70f5..78048913c4 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 @@ -11,6 +11,7 @@ track 256: sample count = 9 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mp4v-es width = 640 height = 360 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 a841f09df5..aa91e511b9 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 @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mp4v-es width = 640 height = 360 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump index 3a4f911622..00ebf65410 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h263.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 256: sample count = 25 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mp4v-es width = 640 height = 360 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 a18a3e9f69..987838940c 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 @@ -11,6 +11,7 @@ track 256: sample count = 30 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001F maxNumReorderSamples = 2 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 3ef988bedb..8e355211af 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 @@ -11,6 +11,7 @@ track 256: sample count = 21 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001F maxNumReorderSamples = 2 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 3223082bd3..248be645ef 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 @@ -11,6 +11,7 @@ track 256: sample count = 12 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001F maxNumReorderSamples = 2 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 7dcd79baaf..ce21726d16 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 @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001F maxNumReorderSamples = 2 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 96e695fa5d..126d799cb2 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 @@ -8,6 +8,7 @@ track 256: sample count = 30 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001F maxNumReorderSamples = 2 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 8637d0bd5b..fdf75f86af 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 @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -40,6 +41,7 @@ track 257: format 0: averageBitrate = 1411500 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 1 sampleRate = 44100 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 1780f4b7b7..43467d144c 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 @@ -8,6 +8,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -37,6 +38,7 @@ track 257: format 0: averageBitrate = 1411500 id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/vnd.dts channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.0.dump index 99771370f8..034060e27d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.0.dump @@ -11,6 +11,7 @@ track 256: sample count = 30 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64101F maxNumReorderSamples = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.1.dump index 6a4cdf0f9d..07a792ca3d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.1.dump @@ -11,6 +11,7 @@ track 256: sample count = 21 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64101F maxNumReorderSamples = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.2.dump index a338669be1..c443e2505d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.2.dump @@ -11,6 +11,7 @@ track 256: sample count = 12 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64101F maxNumReorderSamples = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.3.dump index 81e4208f96..13edbf7c0b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.3.dump @@ -11,6 +11,7 @@ track 256: sample count = 1 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64101F maxNumReorderSamples = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.unknown_length.dump index 2716c2296f..ccfd77888b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h264_iframes_only.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 256: sample count = 30 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64101F maxNumReorderSamples = 0 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 cef36a704b..cbd80cc48e 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 @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -39,6 +40,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 cef36a704b..cbd80cc48e 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 @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -39,6 +40,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 cef36a704b..cbd80cc48e 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 @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -39,6 +40,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 e02529f42c..416192bbc4 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 @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -27,6 +28,7 @@ track 257: sample count = 0 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 f6138fe930..d1af58a736 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 @@ -8,6 +8,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 @@ -36,6 +37,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 68843e4b34..9598078d26 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 @@ -11,6 +11,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 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 68843e4b34..9598078d26 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 @@ -11,6 +11,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 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 68843e4b34..9598078d26 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 @@ -11,6 +11,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 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 356acbec44..46decb13f7 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 @@ -11,6 +11,7 @@ track 256: sample count = 1 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 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 b84fbcb37e..4135b30a2f 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 @@ -8,6 +8,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/avc codecs = avc1.64001E maxNumReorderSamples = 2 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 78fb519ab1..d76ba6534d 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 @@ -11,6 +11,7 @@ track 256: sample count = 31 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L90.90 maxNumReorderSamples = 2 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump index b1a846b82a..22b6561a76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.1.dump @@ -11,6 +11,7 @@ track 256: sample count = 22 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L90.90 maxNumReorderSamples = 2 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump index cb25ac9c4f..e846815e79 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.2.dump @@ -11,6 +11,7 @@ track 256: sample count = 13 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L90.90 maxNumReorderSamples = 2 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump index 17247b3733..a1950d6c3e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265.ts.3.dump @@ -11,6 +11,7 @@ track 256: sample count = 4 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L90.90 maxNumReorderSamples = 2 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 8536851528..76847cf55a 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 @@ -8,6 +8,7 @@ track 256: sample count = 31 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L90.90 maxNumReorderSamples = 2 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 0e5b36704f..fc41d68958 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 @@ -11,6 +11,7 @@ track 256: sample count = 17 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L63.90 maxNumReorderSamples = 4 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 0f15afef1a..7fcf1600db 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 @@ -11,6 +11,7 @@ track 256: sample count = 13 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L63.90 maxNumReorderSamples = 4 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump index 93b6484b50..05c1694be8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.2.dump @@ -11,6 +11,7 @@ track 256: sample count = 8 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L63.90 maxNumReorderSamples = 4 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump index b78f655dda..998213733f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_h265_rps_pred.ts.3.dump @@ -11,6 +11,7 @@ track 256: sample count = 3 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L63.90 maxNumReorderSamples = 4 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 208b5951e5..86cdb8ef21 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 @@ -8,6 +8,7 @@ track 256: sample count = 17 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/hevc codecs = hvc1.1.6.L63.90 maxNumReorderSamples = 4 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 51e3ce4c71..20390e29bd 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 @@ -11,6 +11,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mp4a-latm codecs = mp4a.40.5 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump index e97431e323..6240605056 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_latm.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 256: sample count = 5 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mp4a-latm codecs = mp4a.40.5 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.0.dump index 2659604267..7a673b7b7b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.0.dump @@ -11,6 +11,7 @@ track 256: sample count = 42 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.1.dump index 2659604267..7a673b7b7b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.1.dump @@ -11,6 +11,7 @@ track 256: sample count = 42 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.2.dump index bf8ed25b17..09c8a78381 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.2.dump @@ -11,6 +11,7 @@ track 256: sample count = 27 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.3.dump index 42d68e1e98..df803a3a43 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.3.dump @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.unknown_length.dump index 61a26f2629..b45e1160eb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpeg_audio_with_audio_type.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 256: sample count = 42 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.0.dump index 26777c7a16..8ba97ddf30 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.1.dump index 5fdd308537..9bb418afea 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.2.dump index 5fdd308537..9bb418afea 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.3.dump index 18dc3d7ebb..1904b9ee90 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.unknown_length.dump index 03b5c58259..6a28da8fba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.0.dump index 039faf8cff..ff4c9fb2ef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.1.dump index 27c35eb1c2..e52a0fbd1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.2.dump index 27c35eb1c2..e52a0fbd1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.3.dump index 27c35eb1c2..e52a0fbd1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.unknown_length.dump index 5b9588c73f..751b7cad31 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_setrai_unsetdai.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.0.dump index b4f62bba30..10e26b9bde 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.1.dump index cba6c772ec..2cbcc2dde4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.2.dump index cba6c772ec..2cbcc2dde4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.3.dump index 1de3d72dbc..a7c5a7b93a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.unknown_length.dump index 5946cf31c1..34fc783bce 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_cont_splitheader.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.0.dump index 3eb50b4910..9663fd69ff 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.1.dump index eceb3380e1..de91d68b3b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.2.dump index eceb3380e1..de91d68b3b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.3.dump index cf1b4867de..e176f5e9e3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.unknown_length.dump index 2b3e089279..d2a2d758ed 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_multi.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.0.dump index b4f62bba30..10e26b9bde 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.1.dump index cba6c772ec..2cbcc2dde4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.2.dump index cba6c772ec..2cbcc2dde4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.3.dump index 1de3d72dbc..a7c5a7b93a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.unknown_length.dump index 5946cf31c1..34fc783bce 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_cicp1_single.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.0.dump index 6331d45623..4c900f7516 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -253,6 +255,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.1.dump index 80a270d4a8..fb3f17a405 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 733, hash 5199F868 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.2.dump index 640cb9f9da..ad9a127449 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.3.dump index d3b657ed0d..037f449d58 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.unknown_length.dump index 6968e9c75a..5a3c26bab1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_cont.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -129,6 +130,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -250,6 +252,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.0.dump index 184a2b6a8d..9d705419a0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -253,6 +255,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.1.dump index 61ed15edb9..c2985c3b92 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 733, hash 5199F868 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.2.dump index 1eaddbe905..52f5e1801d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.3.dump index e06e0fac83..433bd9d992 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.unknown_length.dump index 07eb8f0ad3..5f1bcc1b8e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_multi.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -129,6 +130,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -250,6 +252,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.0.dump index d78191aea8..ad0eaff8cb 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -253,6 +255,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.1.dump index 8b6772d843..f48e37595c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 733, hash 5199F868 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.2.dump index 08b70e594e..668b7ad30a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.3.dump index d3b657ed0d..037f449d58 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.unknown_length.dump index 91883b87a9..ed2d09bffd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_bl_configchange_single.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.10 sampleRate = 48000 @@ -129,6 +130,7 @@ track 32: data = length 143, hash C1C83A77 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 @@ -250,6 +252,7 @@ track 32: data = length 733, hash 5199F868 format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.11 sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.0.dump index 472ff92dcf..28b471ee7c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.1.dump index b74486a031..737f99b212 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.2.dump index b74486a031..737f99b212 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.3.dump index 1fab9157ca..ce3082aa44 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.unknown_length.dump index 460bebafaf..af64244499 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_cont.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.0.dump index 4725da74ca..cf45490efc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.1.dump index 0f50b41355..71c88d3084 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.2.dump index 0f50b41355..71c88d3084 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.3.dump index 3f9ddc6deb..08edd78cdf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.unknown_length.dump index 71b6c10397..97b5e1dffc 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_multi.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.0.dump index f95411bdd7..2043ef2cc2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.1.dump index 4b6dcc5c3b..02b535d034 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.2.dump index 4b6dcc5c3b..02b535d034 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 5 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.3.dump index 4ae27d88c6..00276dc25f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.unknown_length.dump index cc6fe0abb0..a38f0abeec 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_cicp1_single.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.0.dump index c370a424e9..427255f35d 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -259,6 +261,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.1.dump index 036f9779fa..a6b0955347 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 744, hash 6725112B format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.2.dump index f1fe1044bf..3e62f5043f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.3.dump index af20138024..95f5a1ff96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.unknown_length.dump index 903b77201c..ae3b312a26 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_cont.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -256,6 +258,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.0.dump index 4244b6d155..e35c8d75df 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -259,6 +261,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.1.dump index b3b0cddfd5..cf45698197 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 744, hash 6725112B format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.2.dump index c7f8039281..02257cbb45 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.3.dump index 12608b5867..91bec09ed1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.unknown_length.dump index e06c74b735..d0683541f2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_multi.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -256,6 +258,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.0.dump index 619a5fb5e9..aa1ec8075f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.0.dump @@ -11,6 +11,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -259,6 +261,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.1.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.1.dump index 7eb8d3ab7d..9c244fd225 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.1.dump @@ -11,6 +11,7 @@ track 32: sample count = 58 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -135,6 +136,7 @@ track 32: data = length 744, hash 6725112B format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.2.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.2.dump index ce3dfaef5a..afe4518a85 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.2.dump @@ -11,6 +11,7 @@ track 32: sample count = 29 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.3.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.3.dump index af20138024..95f5a1ff96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.3.dump @@ -11,6 +11,7 @@ track 32: sample count = 0 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.unknown_length.dump index 5c4442490d..7be0ba621f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_mpegh_lcbl_configchange_single.ts.unknown_length.dump @@ -8,6 +8,7 @@ track 32: sample count = 87 format 0: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0B sampleRate = 48000 @@ -132,6 +133,7 @@ track 32: data = length 141, hash C14F9501 format 1: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 @@ -256,6 +258,7 @@ track 32: data = length 744, hash 6725112B format 2: id = 1/32 + containerMimeType = video/mp2t sampleMimeType = audio/mhm1 codecs = mhm1.0C sampleRate = 48000 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 b9564a3ffc..c7080e8c5b 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -54,6 +56,7 @@ track 600: total output bytes = 105 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: 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 b9564a3ffc..c7080e8c5b 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -54,6 +56,7 @@ track 600: total output bytes = 105 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: 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 b9564a3ffc..c7080e8c5b 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -54,6 +56,7 @@ track 600: total output bytes = 105 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: 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 e96f346e29..8f030b5890 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 @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -21,6 +22,7 @@ track 257: sample count = 2 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -38,6 +40,7 @@ track 600: total output bytes = 0 sample count = 0 format 0: + containerMimeType = video/mp2t sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 tracksEnded = true 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 8c4012fb91..a6a56f0126 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 @@ -8,6 +8,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -26,6 +27,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 @@ -51,6 +53,7 @@ track 600: total output bytes = 105 sample count = 3 format 0: + containerMimeType = video/mp2t sampleMimeType = application/x-scte35 subsampleOffsetUs = -1400000 sample 0: diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump index 1f5d510b2e..6df3274679 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.0.dump @@ -8,6 +8,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -595,6 +596,7 @@ track 1: sample count = 2 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump index 1f5d510b2e..6df3274679 100644 --- a/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/ts/sample_with_id3.adts.unknown_length.dump @@ -8,6 +8,7 @@ track 0: sample count = 144 format 0: id = 0 + containerMimeType = audio/mp4a-latm sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -595,6 +596,7 @@ track 1: sample count = 2 format 0: id = 1 + containerMimeType = audio/mp4a-latm sampleMimeType = application/id3 sample 0: time = 0 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 f61ecb193a..11cf27995e 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 f61ecb193a..11cf27995e 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 f61ecb193a..11cf27995e 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 @@ -11,6 +11,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -29,6 +30,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 417481edc3..48964acfda 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 @@ -11,6 +11,7 @@ track 256: sample count = 0 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -21,6 +22,7 @@ track 257: sample count = 2 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1 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 a3101e564e..50140fd39c 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 @@ -8,6 +8,7 @@ track 256: sample count = 2 format 0: id = 1/256 + containerMimeType = video/mp2t sampleMimeType = video/mpeg2 width = 640 height = 426 @@ -26,6 +27,7 @@ track 257: sample count = 4 format 0: id = 1/257 + containerMimeType = video/mp2t sampleMimeType = audio/mpeg-L2 maxInputSize = 4096 channelCount = 1