From 68c0b8115fa6450e00318c1a7e32d26b9a98b1e3 Mon Sep 17 00:00:00 2001 From: rohks Date: Fri, 15 Nov 2024 06:38:45 -0800 Subject: [PATCH] Set container MIME type for `Flv`, `Matroska`, and image extractors Image extractors (e.g., `PngExtractor`) use `SingleSampleExtractor` for extraction. PiperOrigin-RevId: 696869657 --- .../androidx/media3/extractor/SingleSampleExtractor.java | 6 +++++- .../media3/extractor/flv/AudioTagPayloadReader.java | 3 +++ .../media3/extractor/flv/VideoTagPayloadReader.java | 1 + .../androidx/media3/extractor/mkv/MatroskaExtractor.java | 6 ++++++ .../test/assets/extractordumps/avif/white-1x1.avif.0.dump | 1 + .../extractordumps/avif/white-1x1.avif.unknown_length.dump | 1 + .../bmp/non-motion-photo-shortened-cropped.bmp.0.dump | 1 + ...n-motion-photo-shortened-cropped.bmp.unknown_length.dump | 1 + .../flv/sample-with-key-frame-index.flv.0.dump | 1 + .../flv/sample-with-key-frame-index.flv.1.dump | 1 + .../flv/sample-with-key-frame-index.flv.2.dump | 1 + .../flv/sample-with-key-frame-index.flv.3.dump | 1 + .../flv/sample-with-key-frame-index.flv.unknown_length.dump | 1 + .../src/test/assets/extractordumps/flv/sample.flv.0.dump | 2 ++ .../extractordumps/flv/sample.flv.unknown_length.dump | 2 ++ .../test/assets/extractordumps/heif/sample_MP.heic.0.dump | 1 + .../extractordumps/heif/sample_MP.heic.unknown_length.dump | 1 + ...photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump | 1 + ...ed.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump | 1 + ...photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump | 1 + ...ed.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump | 1 + .../test/assets/extractordumps/mkv/full_blocks.mkv.0.dump | 1 + .../test/assets/extractordumps/mkv/full_blocks.mkv.1.dump | 1 + .../test/assets/extractordumps/mkv/full_blocks.mkv.2.dump | 1 + .../test/assets/extractordumps/mkv/full_blocks.mkv.3.dump | 1 + .../extractordumps/mkv/full_blocks.mkv.unknown_length.dump | 1 + .../src/test/assets/extractordumps/mkv/sample.mkv.0.dump | 2 ++ .../src/test/assets/extractordumps/mkv/sample.mkv.1.dump | 2 ++ .../src/test/assets/extractordumps/mkv/sample.mkv.2.dump | 2 ++ .../src/test/assets/extractordumps/mkv/sample.mkv.3.dump | 2 ++ .../extractordumps/mkv/sample.mkv.unknown_length.dump | 2 ++ .../mkv/sample_with_htc_rotation_track_name.mkv.0.dump | 2 ++ .../mkv/sample_with_htc_rotation_track_name.mkv.1.dump | 2 ++ .../mkv/sample_with_htc_rotation_track_name.mkv.2.dump | 2 ++ .../mkv/sample_with_htc_rotation_track_name.mkv.3.dump | 2 ++ ...ple_with_htc_rotation_track_name.mkv.unknown_length.dump | 2 ++ .../mkv/sample_with_null_terminated_srt.mkv.0.dump | 3 +++ .../mkv/sample_with_null_terminated_srt.mkv.1.dump | 3 +++ .../mkv/sample_with_null_terminated_srt.mkv.2.dump | 3 +++ .../mkv/sample_with_null_terminated_srt.mkv.3.dump | 3 +++ .../sample_with_null_terminated_srt.mkv.unknown_length.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.0.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.1.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.2.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.3.dump | 3 +++ ...th_null_terminated_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.0.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.1.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.2.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.3.dump | 3 +++ ...th_null_terminated_vtt_subtitles.mkv.unknown_length.dump | 3 +++ .../extractordumps/mkv/sample_with_opus_audio.mkv.0.dump | 1 + .../extractordumps/mkv/sample_with_opus_audio.mkv.1.dump | 1 + .../extractordumps/mkv/sample_with_opus_audio.mkv.2.dump | 1 + .../extractordumps/mkv/sample_with_opus_audio.mkv.3.dump | 1 + .../mkv/sample_with_opus_audio.mkv.unknown_length.dump | 1 + .../mkv/sample_with_overlapping_srt.mkv.0.dump | 3 +++ .../mkv/sample_with_overlapping_srt.mkv.1.dump | 3 +++ .../mkv/sample_with_overlapping_srt.mkv.2.dump | 3 +++ .../mkv/sample_with_overlapping_srt.mkv.3.dump | 3 +++ .../mkv/sample_with_overlapping_srt.mkv.unknown_length.dump | 3 +++ .../mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump | 3 +++ .../mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump | 3 +++ .../mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump | 3 +++ .../mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump | 3 +++ ...e_with_overlapping_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../assets/extractordumps/mkv/sample_with_srt.mkv.0.dump | 3 +++ .../assets/extractordumps/mkv/sample_with_srt.mkv.1.dump | 3 +++ .../assets/extractordumps/mkv/sample_with_srt.mkv.2.dump | 3 +++ .../assets/extractordumps/mkv/sample_with_srt.mkv.3.dump | 3 +++ .../mkv/sample_with_srt.mkv.unknown_length.dump | 3 +++ .../extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump | 3 +++ .../extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump | 3 +++ .../extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump | 3 +++ .../extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump | 3 +++ .../mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump | 2 ++ .../extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump | 2 ++ .../extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump | 2 ++ .../extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump | 2 ++ .../mkv/sample_with_vorbis_audio.mkv.unknown_length.dump | 2 ++ .../extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump | 3 +++ .../extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump | 3 +++ .../extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump | 3 +++ .../extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump | 3 +++ .../mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump | 3 +++ .../mkv/subsample_encrypted_altref.webm.0.dump | 1 + .../mkv/subsample_encrypted_altref.webm.unknown_length.dump | 1 + .../mkv/subsample_encrypted_noaltref.webm.0.dump | 1 + .../subsample_encrypted_noaltref.webm.unknown_length.dump | 1 + .../mkv_subtitle_transcoding/full_blocks.mkv.0.dump | 1 + .../mkv_subtitle_transcoding/full_blocks.mkv.1.dump | 1 + .../mkv_subtitle_transcoding/full_blocks.mkv.2.dump | 1 + .../mkv_subtitle_transcoding/full_blocks.mkv.3.dump | 1 + .../full_blocks.mkv.unknown_length.dump | 1 + .../sample_with_null_terminated_srt.mkv.0.dump | 3 +++ .../sample_with_null_terminated_srt.mkv.1.dump | 3 +++ .../sample_with_null_terminated_srt.mkv.2.dump | 3 +++ .../sample_with_null_terminated_srt.mkv.3.dump | 3 +++ .../sample_with_null_terminated_srt.mkv.unknown_length.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.0.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.1.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.2.dump | 3 +++ .../sample_with_null_terminated_ssa_subtitles.mkv.3.dump | 3 +++ ...th_null_terminated_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.0.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.1.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.2.dump | 3 +++ .../sample_with_null_terminated_vtt_subtitles.mkv.3.dump | 3 +++ ...th_null_terminated_vtt_subtitles.mkv.unknown_length.dump | 3 +++ .../sample_with_overlapping_srt.mkv.0.dump | 3 +++ .../sample_with_overlapping_srt.mkv.1.dump | 3 +++ .../sample_with_overlapping_srt.mkv.2.dump | 3 +++ .../sample_with_overlapping_srt.mkv.3.dump | 3 +++ .../sample_with_overlapping_srt.mkv.unknown_length.dump | 3 +++ .../sample_with_overlapping_ssa_subtitles.mkv.0.dump | 3 +++ .../sample_with_overlapping_ssa_subtitles.mkv.1.dump | 3 +++ .../sample_with_overlapping_ssa_subtitles.mkv.2.dump | 3 +++ .../sample_with_overlapping_ssa_subtitles.mkv.3.dump | 3 +++ ...e_with_overlapping_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump | 3 +++ .../mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump | 3 +++ .../mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump | 3 +++ .../mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump | 3 +++ .../sample_with_srt.mkv.unknown_length.dump | 3 +++ .../sample_with_ssa_subtitles.mkv.0.dump | 3 +++ .../sample_with_ssa_subtitles.mkv.1.dump | 3 +++ .../sample_with_ssa_subtitles.mkv.2.dump | 3 +++ .../sample_with_ssa_subtitles.mkv.3.dump | 3 +++ .../sample_with_ssa_subtitles.mkv.unknown_length.dump | 3 +++ .../sample_with_vtt_subtitles.mkv.0.dump | 3 +++ .../sample_with_vtt_subtitles.mkv.1.dump | 3 +++ .../sample_with_vtt_subtitles.mkv.2.dump | 3 +++ .../sample_with_vtt_subtitles.mkv.3.dump | 3 +++ .../sample_with_vtt_subtitles.mkv.unknown_length.dump | 3 +++ .../png/non-motion-photo-shortened.png.0.dump | 1 + .../png/non-motion-photo-shortened.png.unknown_length.dump | 1 + .../extractordumps/webp/ic_launcher_round.webp.0.dump | 1 + .../webp/ic_launcher_round.webp.unknown_length.dump | 1 + .../transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump | 1 + 140 files changed, 328 insertions(+), 1 deletion(-) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/SingleSampleExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/SingleSampleExtractor.java index 3c995bf0c8..0706070020 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/SingleSampleExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/SingleSampleExtractor.java @@ -138,7 +138,11 @@ public final class SingleSampleExtractor implements Extractor { @RequiresNonNull("this.extractorOutput") private void outputImageTrackAndSeekMap(String sampleMimeType) { trackOutput = extractorOutput.track(IMAGE_TRACK_ID, C.TRACK_TYPE_IMAGE); - trackOutput.format(new Format.Builder().setSampleMimeType(sampleMimeType).build()); + trackOutput.format( + new Format.Builder() + .setContainerMimeType(sampleMimeType) + .setSampleMimeType(sampleMimeType) + .build()); extractorOutput.endTracks(); extractorOutput.seekMap(new SingleSampleSeekMap(/* durationUs= */ C.TIME_UNSET)); state = STATE_READING; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/AudioTagPayloadReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/flv/AudioTagPayloadReader.java index 7380c6d55c..6f58907ce0 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/AudioTagPayloadReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/flv/AudioTagPayloadReader.java @@ -61,6 +61,7 @@ import java.util.Collections; int sampleRate = AUDIO_SAMPLING_RATE_TABLE[sampleRateIndex]; Format format = new Format.Builder() + .setContainerMimeType(MimeTypes.VIDEO_FLV) .setSampleMimeType(MimeTypes.AUDIO_MPEG) .setChannelCount(1) .setSampleRate(sampleRate) @@ -72,6 +73,7 @@ import java.util.Collections; audioFormat == AUDIO_FORMAT_ALAW ? MimeTypes.AUDIO_ALAW : MimeTypes.AUDIO_MLAW; Format format = new Format.Builder() + .setContainerMimeType(MimeTypes.VIDEO_FLV) .setSampleMimeType(mimeType) .setChannelCount(1) .setSampleRate(8000) @@ -105,6 +107,7 @@ import java.util.Collections; AacUtil.Config aacConfig = AacUtil.parseAudioSpecificConfig(audioSpecificConfig); Format format = new Format.Builder() + .setContainerMimeType(MimeTypes.VIDEO_FLV) .setSampleMimeType(MimeTypes.AUDIO_AAC) .setCodecs(aacConfig.codecs) .setChannelCount(aacConfig.channelCount) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java index 35fdc6f3e9..72b19761bf 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/flv/VideoTagPayloadReader.java @@ -90,6 +90,7 @@ import androidx.media3.extractor.TrackOutput; // Construct and output the format. Format format = new Format.Builder() + .setContainerMimeType(MimeTypes.VIDEO_FLV) .setSampleMimeType(MimeTypes.VIDEO_H264) .setCodecs(avcConfig.codecs) .setWidth(avcConfig.width) diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java index 9e500dfc88..ebff39266e 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java @@ -73,6 +73,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.UUID; import org.checkerframework.checker.nullness.qual.EnsuresNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull; @@ -441,6 +442,7 @@ public class MatroskaExtractor implements Extractor { private long timecodeScale = C.TIME_UNSET; private long durationTimecode = C.TIME_UNSET; private long durationUs = C.TIME_UNSET; + private boolean isWebm; // The track corresponding to the current TrackEntry element, or null. @Nullable private Track currentTrack; @@ -782,6 +784,7 @@ public class MatroskaExtractor implements Extractor { break; case ID_TRACK_ENTRY: currentTrack = new Track(); + currentTrack.isWebm = isWebm; break; case ID_MASTERING_METADATA: getCurrentTrack(id).hasColorInfo = true; @@ -1205,6 +1208,7 @@ public class MatroskaExtractor implements Extractor { throw ParserException.createForMalformedContainer( "DocType " + value + " not supported", /* cause= */ null); } + isWebm = Objects.equals(value, DOC_TYPE_WEBM); break; case ID_NAME: getCurrentTrack(id).name = value; @@ -2075,6 +2079,7 @@ public class MatroskaExtractor implements Extractor { private static final int DEFAULT_MAX_FALL = 200; // nits. // Common elements. + public boolean isWebm; public @MonotonicNonNull String name; public @MonotonicNonNull String codecId; public int number; @@ -2436,6 +2441,7 @@ public class MatroskaExtractor implements Extractor { Format format = formatBuilder .setId(trackId) + .setContainerMimeType(isWebm ? MimeTypes.VIDEO_WEBM : MimeTypes.VIDEO_MATROSKA) .setSampleMimeType(mimeType) .setMaxInputSize(maxInputSize) .setLanguage(language) diff --git a/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.0.dump b/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.0.dump index cc8f0789bb..324c3bfdc8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 295 sample count = 1 format 0: + containerMimeType = image/avif sampleMimeType = image/avif sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.unknown_length.dump index cc8f0789bb..324c3bfdc8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/avif/white-1x1.avif.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 295 sample count = 1 format 0: + containerMimeType = image/avif sampleMimeType = image/avif sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.0.dump b/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.0.dump index 3fbff654ba..d211389206 100644 --- a/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 69130 sample count = 1 format 0: + containerMimeType = image/bmp sampleMimeType = image/bmp sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.unknown_length.dump index 3fbff654ba..d211389206 100644 --- a/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/bmp/non-motion-photo-shortened-cropped.bmp.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 69130 sample count = 1 format 0: + containerMimeType = image/bmp sampleMimeType = image/bmp sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.0.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.0.dump index 9c6955a2b9..0091f04aab 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.0.dump @@ -10,6 +10,7 @@ track 9: total output bytes = 28759 sample count = 71 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.64000C width = 320 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.1.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.1.dump index 4b4b951052..4ae28112ce 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.1.dump @@ -10,6 +10,7 @@ track 9: total output bytes = 23490 sample count = 47 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.64000C width = 320 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.2.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.2.dump index b9224da535..9399374726 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.2.dump @@ -10,6 +10,7 @@ track 9: total output bytes = 12964 sample count = 23 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.64000C width = 320 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.3.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.3.dump index b9224da535..9399374726 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.3.dump @@ -10,6 +10,7 @@ track 9: total output bytes = 12964 sample count = 23 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.64000C width = 320 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.unknown_length.dump index 9c6955a2b9..0091f04aab 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample-with-key-frame-index.flv.unknown_length.dump @@ -10,6 +10,7 @@ track 9: total output bytes = 28759 sample count = 71 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.64000C width = 320 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.0.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.0.dump index d2a81d984c..10a87782c5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.0.dump @@ -7,6 +7,7 @@ track 8: total output bytes = 9529 sample count = 45 format 0: + containerMimeType = video/x-flv sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -197,6 +198,7 @@ track 9: total output bytes = 89502 sample count = 30 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.640034 width = 1080 diff --git a/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump index d2a81d984c..10a87782c5 100644 --- a/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/flv/sample.flv.unknown_length.dump @@ -7,6 +7,7 @@ track 8: total output bytes = 9529 sample count = 45 format 0: + containerMimeType = video/x-flv sampleMimeType = audio/mp4a-latm codecs = mp4a.40.2 channelCount = 1 @@ -197,6 +198,7 @@ track 9: total output bytes = 89502 sample count = 30 format 0: + containerMimeType = video/x-flv sampleMimeType = video/avc codecs = avc1.640034 width = 1080 diff --git a/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.0.dump b/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.0.dump index 79019ac9ed..225fbc691b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 57672 sample count = 1 format 0: + containerMimeType = image/heif sampleMimeType = image/heif sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.unknown_length.dump index 79019ac9ed..225fbc691b 100644 --- a/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/heif/sample_MP.heic.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 57672 sample count = 1 format 0: + containerMimeType = image/heif sampleMimeType = image/heif sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump index 7e18a3197d..5fa1729513 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 30000 sample count = 1 format 0: + containerMimeType = image/jpeg sampleMimeType = image/jpeg sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump index 7e18a3197d..5fa1729513 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 30000 sample count = 1 format 0: + containerMimeType = image/jpeg sampleMimeType = image/jpeg sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump index 97e12de582..3ac7488cd1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 140312 sample count = 1 format 0: + containerMimeType = image/jpeg sampleMimeType = image/jpeg sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump index 97e12de582..3ac7488cd1 100644 --- a/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg_JpegExtractor.FLAG_READ_IMAGE.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 140312 sample count = 1 format 0: + containerMimeType = image/jpeg sampleMimeType = image/jpeg sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump index 27bfe2f387..bda767c646 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump index 27bfe2f387..bda767c646 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump index 27bfe2f387..bda767c646 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump index 27bfe2f387..bda767c646 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump index 27bfe2f387..bda767c646 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/full_blocks.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump index 0f80782c2a..c0bf7afa95 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump index c8a800aee8..7f4ce38a73 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 22 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -113,6 +114,7 @@ track 2: sample count = 21 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump index c6769bb5ca..43b212293c 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 11 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -69,6 +70,7 @@ track 2: sample count = 10 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump index 32dfc5b576..48c34e1b99 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 0 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -25,6 +26,7 @@ track 2: sample count = 3 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump index 0f80782c2a..c0bf7afa95 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump index 96da57f7bd..de07728d68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -146,6 +147,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump index 96da57f7bd..de07728d68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -146,6 +147,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump index 96da57f7bd..de07728d68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -146,6 +147,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump index 96da57f7bd..de07728d68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -146,6 +147,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump index 96da57f7bd..de07728d68 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_htc_rotation_track_name.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -146,6 +147,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump index c4adbf92c2..25b7c0bbef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump index c4adbf92c2..25b7c0bbef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump index c4adbf92c2..25b7c0bbef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump index c4adbf92c2..25b7c0bbef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump index c4adbf92c2..25b7c0bbef 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump index 9ece878f1b..3d015ae2b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump index 9ece878f1b..3d015ae2b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump index 9ece878f1b..3d015ae2b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump index 9ece878f1b..3d015ae2b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump index 9ece878f1b..3d015ae2b3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump index 70564176a4..558b4210ba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump index 70564176a4..558b4210ba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump index 70564176a4..558b4210ba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump index 70564176a4..558b4210ba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump index 70564176a4..558b4210ba 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump index 6c211ba544..528342b521 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = audio/opus maxInputSize = 5760 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump index 6c211ba544..528342b521 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = audio/opus maxInputSize = 5760 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump index 6c211ba544..528342b521 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = audio/opus maxInputSize = 5760 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump index 6c211ba544..528342b521 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = audio/opus maxInputSize = 5760 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump index 6c211ba544..528342b521 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_opus_audio.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = audio/opus maxInputSize = 5760 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump index a3112d6a62..fde511dc24 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump index a3112d6a62..fde511dc24 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump index a3112d6a62..fde511dc24 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump index a3112d6a62..fde511dc24 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump index a3112d6a62..fde511dc24 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump index 83704f6a5b..780d074286 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump index 83704f6a5b..780d074286 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump index 83704f6a5b..780d074286 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump index 83704f6a5b..780d074286 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump index 83704f6a5b..780d074286 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump index 5bbcc39d9d..1f030fb977 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump index 5bbcc39d9d..1f030fb977 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump index 5bbcc39d9d..1f030fb977 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump index 5bbcc39d9d..1f030fb977 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump index 5bbcc39d9d..1f030fb977 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-subrip selectionFlags = [default] language = en diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump index df76c825d3..948340ecca 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump index df76c825d3..948340ecca 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump index df76c825d3..948340ecca 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump index df76c825d3..948340ecca 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump index df76c825d3..948340ecca 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/x-ssa selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump index 2c310f598b..f11d33f431 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 45 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/vorbis maxInputSize = 8192 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump index 2c310f598b..f11d33f431 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 45 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/vorbis maxInputSize = 8192 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump index 2c310f598b..f11d33f431 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 45 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/vorbis maxInputSize = 8192 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump index 2c310f598b..f11d33f431 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 45 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/vorbis maxInputSize = 8192 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump index 2c310f598b..f11d33f431 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vorbis_audio.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 45 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/vorbis maxInputSize = 8192 channelCount = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump index d745bd3c52..5bcf147d96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump index d745bd3c52..5bcf147d96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump index d745bd3c52..5bcf147d96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump index d745bd3c52..5bcf147d96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump index d745bd3c52..5bcf147d96 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/sample_with_vtt_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = text/vtt selectionFlags = [default] language = und diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump index c7eb2e7efd..329b7e13e6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.0.dump @@ -8,6 +8,7 @@ track 1: sample count = 1 format 0: id = 1 + containerMimeType = video/webm sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump index c7eb2e7efd..329b7e13e6 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_altref.webm.unknown_length.dump @@ -8,6 +8,7 @@ track 1: sample count = 1 format 0: id = 1 + containerMimeType = video/webm sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump index 5590cd98c2..9fbcf6340a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.0.dump @@ -8,6 +8,7 @@ track 1: sample count = 1 format 0: id = 1 + containerMimeType = video/webm sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump index 5590cd98c2..9fbcf6340a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv/subsample_encrypted_noaltref.webm.unknown_length.dump @@ -8,6 +8,7 @@ track 1: sample count = 1 format 0: id = 1 + containerMimeType = video/webm sampleMimeType = video/x-vnd.on2.vp9 width = 360 height = 240 diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.0.dump index 35544d6d1c..778664f715 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.1.dump index 35544d6d1c..778664f715 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.2.dump index 35544d6d1c..778664f715 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.3.dump index 35544d6d1c..778664f715 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.unknown_length.dump index 35544d6d1c..778664f715 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/full_blocks.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 3 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump index c70250ab63..98317515dd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump index c70250ab63..98317515dd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump index c70250ab63..98317515dd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump index c70250ab63..98317515dd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump index c70250ab63..98317515dd 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.0.dump index 2f036b6234..3b27b356e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.1.dump index 2f036b6234..3b27b356e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.2.dump index 2f036b6234..3b27b356e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.3.dump index 2f036b6234..3b27b356e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump index 2f036b6234..3b27b356e8 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.0.dump index 8f80ead618..ad47bd4c76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.1.dump index 8f80ead618..ad47bd4c76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.2.dump index 8f80ead618..ad47bd4c76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.3.dump index 8f80ead618..ad47bd4c76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump index 8f80ead618..ad47bd4c76 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_null_terminated_vtt_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.0.dump index da12543d34..9ca64fbb1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.1.dump index da12543d34..9ca64fbb1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.2.dump index da12543d34..9ca64fbb1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.3.dump index da12543d34..9ca64fbb1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.unknown_length.dump index da12543d34..9ca64fbb1e 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.0.dump index 9a1845b16a..59248ccdb2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.1.dump index 9a1845b16a..59248ccdb2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.2.dump index 9a1845b16a..59248ccdb2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.3.dump index 9a1845b16a..59248ccdb2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump index 9a1845b16a..59248ccdb2 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_overlapping_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 3 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump index c300df088a..bce0b6632a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump index c300df088a..bce0b6632a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump index c300df088a..bce0b6632a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump index c300df088a..bce0b6632a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump index c300df088a..bce0b6632a 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_srt.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = application/x-subrip selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.0.dump index 81ada8a440..a9b8653d9f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.1.dump index 81ada8a440..a9b8653d9f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.2.dump index 81ada8a440..a9b8653d9f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.3.dump index 81ada8a440..a9b8653d9f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.unknown_length.dump index 81ada8a440..a9b8653d9f 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_ssa_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/x-ssa selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.0.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.0.dump index b98b89dbe3..28510720c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.0.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.1.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.1.dump index b98b89dbe3..28510720c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.1.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.1.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.2.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.2.dump index b98b89dbe3..28510720c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.2.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.2.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.3.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.3.dump index b98b89dbe3..28510720c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.3.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.3.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.unknown_length.dump index b98b89dbe3..28510720c3 100644 --- a/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/mkv_subtitle_transcoding/sample_with_vtt_subtitles.mkv.unknown_length.dump @@ -11,6 +11,7 @@ track 1: sample count = 30 format 0: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080 @@ -145,6 +146,7 @@ track 2: sample count = 29 format 0: id = 2 + containerMimeType = video/x-matroska sampleMimeType = audio/ac3 channelCount = 1 sampleRate = 44100 @@ -271,6 +273,7 @@ track 3: sample count = 1 format 0: id = 3 + containerMimeType = video/x-matroska sampleMimeType = application/x-media3-cues codecs = text/vtt selectionFlags = [default] diff --git a/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.0.dump b/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.0.dump index 88ab3231a5..45f15ca125 100644 --- a/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 29063 sample count = 1 format 0: + containerMimeType = image/png sampleMimeType = image/png sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.unknown_length.dump index 88ab3231a5..45f15ca125 100644 --- a/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/png/non-motion-photo-shortened.png.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 29063 sample count = 1 format 0: + containerMimeType = image/png sampleMimeType = image/png sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.0.dump b/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.0.dump index fdf1a356ca..501ab0eabf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.0.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 7778 sample count = 1 format 0: + containerMimeType = image/webp sampleMimeType = image/webp sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.unknown_length.dump index fdf1a356ca..501ab0eabf 100644 --- a/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/webp/ic_launcher_round.webp.unknown_length.dump @@ -8,6 +8,7 @@ track 1024: total output bytes = 7778 sample count = 1 format 0: + containerMimeType = image/webp sampleMimeType = image/webp sample 0: time = 0 diff --git a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump index d4ddb7241e..bd50117042 100644 --- a/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump +++ b/libraries/test_data/src/test/assets/transformerdumps/mkv/sample_with_srt.mkv/noaudio.dump @@ -1,5 +1,6 @@ format video: id = 1 + containerMimeType = video/x-matroska sampleMimeType = video/avc codecs = avc1.640034 width = 1080