Set container MIME type for Flv, Matroska, and image extractors

Image extractors (e.g., `PngExtractor`) use `SingleSampleExtractor`
for extraction.

PiperOrigin-RevId: 696869657

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;

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)

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)

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)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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]

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]

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]

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]

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]

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]

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]

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]

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]

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]