Set container MIME type in Mp4Extractor and FragmentedMp4Extractor

PiperOrigin-RevId: 696513199

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/FragmentedMp4Extractor.java

@@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkState;
 import static androidx.media3.common.util.Util.castNonNull;
 import static androidx.media3.common.util.Util.nullSafeArrayCopy;
 import static androidx.media3.extractor.mp4.BoxParser.parseTraks;
+import static androidx.media3.extractor.mp4.MimeTypeResolver.getContainerMimeType;
 import static java.lang.Math.max;
 import static java.lang.annotation.ElementType.TYPE_USE;
 
@@ -461,7 +462,8 @@ public class FragmentedMp4Extractor implements Extractor {
                   /* sampleDescriptionIndex= */ 0,
                   /* duration= */ 0,
                   /* size= */ 0,
-                  /* flags= */ 0));
+                  /* flags= */ 0),
+              getContainerMimeType(sideloadedTrack.format));
       trackBundles.put(0, bundle);
       extractorOutput.endTracks();
     }
@@ -687,6 +689,7 @@ public class FragmentedMp4Extractor implements Extractor {
     int trackCount = sampleTables.size();
     if (trackBundles.size() == 0) {
       // We need to create the track bundles.
+      String containerMimeType = getContainerMimeType(sampleTables);
       for (int i = 0; i < trackCount; i++) {
         TrackSampleTable sampleTable = sampleTables.get(i);
         Track track = sampleTable.track;
@@ -694,7 +697,10 @@ public class FragmentedMp4Extractor implements Extractor {
         output.durationUs(track.durationUs);
         TrackBundle trackBundle =
             new TrackBundle(
-                output, sampleTable, getDefaultSampleValues(defaultSampleValuesArray, track.id));
+                output,
+                sampleTable,
+                getDefaultSampleValues(defaultSampleValuesArray, track.id),
+                containerMimeType);
         trackBundles.put(track.id, trackBundle);
         durationUs = max(durationUs, track.durationUs);
       }
@@ -1844,6 +1850,7 @@ public class FragmentedMp4Extractor implements Extractor {
     public int currentTrackRunIndex;
     public int firstSampleToOutputIndex;
 
+    private final String containerMimeType;
     private final ParsableByteArray encryptionSignalByte;
     private final ParsableByteArray defaultInitializationVector;
 
@@ -1852,10 +1859,12 @@ public class FragmentedMp4Extractor implements Extractor {
     public TrackBundle(
         TrackOutput output,
         TrackSampleTable moovSampleTable,
-        DefaultSampleValues defaultSampleValues) {
+        DefaultSampleValues defaultSampleValues,
+        String containerMimeType) {
       this.output = output;
       this.moovSampleTable = moovSampleTable;
       this.defaultSampleValues = defaultSampleValues;
+      this.containerMimeType = containerMimeType;
       fragment = new TrackFragment();
       scratch = new ParsableByteArray();
       encryptionSignalByte = new ParsableByteArray(1);
@@ -1866,7 +1875,9 @@ public class FragmentedMp4Extractor implements Extractor {
     public void reset(TrackSampleTable moovSampleTable, DefaultSampleValues defaultSampleValues) {
       this.moovSampleTable = moovSampleTable;
       this.defaultSampleValues = defaultSampleValues;
-      output.format(moovSampleTable.track.format);
+      Format format =
+          moovSampleTable.track.format.buildUpon().setContainerMimeType(containerMimeType).build();
+      output.format(format);
       resetFragmentInfo();
     }
 
@@ -1878,7 +1889,13 @@ public class FragmentedMp4Extractor implements Extractor {
       @Nullable String schemeType = encryptionBox != null ? encryptionBox.schemeType : null;
       DrmInitData updatedDrmInitData = drmInitData.copyWithSchemeType(schemeType);
       Format format =
-          moovSampleTable.track.format.buildUpon().setDrmInitData(updatedDrmInitData).build();
+          moovSampleTable
+              .track
+              .format
+              .buildUpon()
+              .setContainerMimeType(containerMimeType)
+              .setDrmInitData(updatedDrmInitData)
+              .build();
       output.format(format);
     }
 

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/MimeTypeResolver.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.media3.extractor.mp4;
+
+import androidx.annotation.Nullable;
+import androidx.media3.common.Format;
+import androidx.media3.common.MimeTypes;
+import java.util.List;
+import java.util.Objects;
+
+/** A helper class for resolving the MIME type of an MP4 container based on its tracks. */
+/* package */ final class MimeTypeResolver {
+
+  /**
+   * Determines the container MIME type based on a single track's {@link Format}.
+   *
+   * <p>This method should only be used when there is a single track available to determine the
+   * container MIME type. If multiple tracks are present, use {@link #getContainerMimeType(List)}
+   * instead.
+   *
+   * <p>The container MIME type is determined by the guidelines specified in:
+   *
+   * <ul>
+   *   <li><a href="https://www.rfc-editor.org/rfc/rfc4337.html#section-2">RFC 4337, Section 2</a>.
+   *   <li>HEIC as specified in ISO/IEC 23008-12, E.2, often treated as HEIF for compatibility.
+   *   <li><a href="https://aomediacodec.github.io/av1-avif/#mime-registration">AVIF spec</a>.
+   * </ul>
+   *
+   * @param format The {@link Format} instance representing a single track's format.
+   * @return The inferred container MIME type for the track's format.
+   */
+  public static String getContainerMimeType(Format format) {
+    @Nullable String sampleMimeType = format.sampleMimeType;
+
+    if (MimeTypes.isVideo(sampleMimeType)) {
+      return MimeTypes.VIDEO_MP4;
+    }
+
+    if (MimeTypes.isAudio(sampleMimeType)) {
+      return MimeTypes.AUDIO_MP4;
+    }
+
+    if (MimeTypes.isImage(sampleMimeType)) {
+      if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_HEIC)) {
+        return MimeTypes.IMAGE_HEIF;
+      } else if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_AVIF)) {
+        return MimeTypes.IMAGE_AVIF;
+      }
+    }
+
+    return MimeTypes.APPLICATION_MP4;
+  }
+
+  /**
+   * Determines the container MIME type for an MP4 file based on its tracks.
+   *
+   * <p>The container MIME type is determined by the guidelines specified in:
+   *
+   * <ul>
+   *   <li><a href="https://www.rfc-editor.org/rfc/rfc4337.html#section-2">RFC 4337, Section 2</a>.
+   *   <li>HEIC as specified in ISO/IEC 23008-12, E.2, often treated as HEIF for compatibility.
+   *   <li><a href="https://aomediacodec.github.io/av1-avif/#mime-registration">AVIF spec</a>.
+   * </ul>
+   *
+   * @param trackSampleTables A list of {@link TrackSampleTable} instances, each representing a
+   *     track with {@link Format} information for an MP4 file.
+   * @return The inferred container MIME type for the MP4 file.
+   */
+  public static String getContainerMimeType(List<TrackSampleTable> trackSampleTables) {
+    boolean hasAudio = false;
+    @Nullable String imageMimeType = null;
+
+    for (TrackSampleTable trackSampleTable : trackSampleTables) {
+      @Nullable String sampleMimeType = trackSampleTable.track.format.sampleMimeType;
+
+      if (MimeTypes.isVideo(sampleMimeType)) {
+        return MimeTypes.VIDEO_MP4;
+      }
+
+      if (MimeTypes.isAudio(sampleMimeType)) {
+        hasAudio = true;
+      } else if (MimeTypes.isImage(sampleMimeType)) {
+        if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_HEIC)) {
+          imageMimeType = MimeTypes.IMAGE_HEIF;
+        } else if (Objects.equals(sampleMimeType, MimeTypes.IMAGE_AVIF)) {
+          imageMimeType = MimeTypes.IMAGE_AVIF;
+        }
+      }
+    }
+
+    if (hasAudio) {
+      return MimeTypes.AUDIO_MP4;
+    } else if (imageMimeType != null) {
+      return imageMimeType;
+    }
+
+    return MimeTypes.APPLICATION_MP4;
+  }
+
+  private MimeTypeResolver() {}
+}

libraries/extractor/src/main/java/androidx/media3/extractor/mp4/Mp4Extractor.java

@@ -30,6 +30,7 @@ import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_DEPTH_METADA
 import static androidx.media3.container.Mp4Util.EDITABLE_TRACK_TYPE_SHARP;
 import static androidx.media3.extractor.mp4.BoxParser.parseTraks;
 import static androidx.media3.extractor.mp4.MetadataUtil.findMdtaMetadataEntryWithKey;
+import static androidx.media3.extractor.mp4.MimeTypeResolver.getContainerMimeType;
 import static androidx.media3.extractor.mp4.Sniffer.BRAND_HEIC;
 import static androidx.media3.extractor.mp4.Sniffer.BRAND_QUICKTIME;
 import static java.lang.Math.max;
@@ -708,6 +709,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
               trackSampleTables.size()));
     }
     int trackIndex = 0;
+    String containerMimeType = getContainerMimeType(trackSampleTables);
     for (int i = 0; i < trackSampleTables.size(); i++) {
       TrackSampleTable trackSampleTable = trackSampleTables.get(i);
       if (trackSampleTable.sampleCount == 0) {
@@ -761,6 +763,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
           slowMotionMetadataEntries.isEmpty() ? null : new Metadata(slowMotionMetadataEntries),
           udtaMetadata,
           mvhdMetadata);
+      formatBuilder.setContainerMimeType(containerMimeType);
       mp4Track.trackOutput.format(formatBuilder.build());
 
       if (track.type == C.TRACK_TYPE_VIDEO && firstVideoTrackIndex == C.INDEX_UNSET) {

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -268,6 +269,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -296,6 +298,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -537,6 +540,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -212,6 +213,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -240,6 +242,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -401,6 +404,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -128,6 +129,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -156,6 +158,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -233,6 +236,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -44,6 +45,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -72,6 +74,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -85,6 +88,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895

libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 867000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64000A
     maxInputSize = 3895

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -152,6 +153,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -92,6 +93,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -32,6 +33,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -152,6 +153,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -92,6 +93,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -32,6 +33,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/bt601.mov.unknown_length.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     peakBitrate = 200000
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294
@@ -200,6 +201,7 @@ track 1:
   track duration = 1020100
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.4D001E
     maxInputSize = 25345

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -211,6 +212,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -238,6 +240,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -399,6 +402,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -127,6 +128,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -154,6 +156,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -231,6 +234,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -43,6 +44,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -70,6 +72,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -83,6 +86,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -211,6 +212,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -238,6 +240,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -399,6 +402,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -127,6 +128,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -154,6 +156,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -231,6 +234,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -43,6 +44,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -70,6 +72,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -83,6 +86,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 2100700
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 229249
@@ -267,6 +268,7 @@ track 1:
   track duration = 466800
   format 0:
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = video/hevc
     codecs = hvc1.1.6.L153
     maxInputSize = 151345
@@ -294,6 +296,7 @@ track 2:
   track duration = 2100700
   format 0:
     id = 3
+    containerMimeType = video/mp4
     sampleMimeType = application/microvideo-meta-stream
     maxInputSize = 480
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]
@@ -535,6 +538,7 @@ track 3:
   track duration = 1133700
   format 0:
     id = 4
+    containerMimeType = video/mp4
     sampleMimeType = application/motionphoto-image-meta
     maxInputSize = 89
     metadata = entries=[Mp4Timestamp: creation time=3784612704, modification time=3784612704, timescale=10000]

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample.mp4_with_flag_read_Editable_video_tracks

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722
@@ -153,6 +154,7 @@ track 1:
   format 0:
     peakBitrate = 200000
     id = 2
+    containerMimeType = video/mp4
     sampleMimeType = audio/mp4a-latm
     codecs = mp4a.40.2
     maxInputSize = 294

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_18byte_nclx_colr.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 1001000
   format 0:
     id = 1
+    containerMimeType = video/mp4
     sampleMimeType = video/avc
     codecs = avc1.64001F
     maxInputSize = 36722

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.0.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.1.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.2.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.3.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3.mp4.unknown_length.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     maxInputSize = 1566
     channelCount = 6

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.0.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.1.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.2.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.3.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac3_fragmented.mp4.unknown_length.dump

@@ -14,6 +14,7 @@ track 0:
     averageBitrate = 384000
     peakBitrate = 384000
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac3
     channelCount = 6
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 622
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.reading_within_gop_sample_dependencies.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_fragmented.mp4.unknown_length.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 760000
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.0.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.1.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.2.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21

libraries/test_data/src/test/assets/extractordumps/mp4/sample_ac4_level4.mp4.reading_within_gop_sample_dependencies.3.dump

@@ -12,6 +12,7 @@ track 0:
   track duration = 853333
   format 0:
     id = 1
+    containerMimeType = audio/mp4
     sampleMimeType = audio/ac4
     maxInputSize = 8158
     channelCount = 21