Set container MIME type for audio-only extractors

PiperOrigin-RevId: 696560053

libraries/decoder_flac/src/main/java/androidx/media3/decoder/flac/FlacExtractor.java

@@ -275,6 +275,7 @@ public final class FlacExtractor implements Extractor {
       FlacStreamMetadata streamMetadata, @Nullable Metadata metadata, TrackOutput output) {
     Format mediaFormat =
         new Format.Builder()
+            .setContainerMimeType(MimeTypes.AUDIO_FLAC)
             .setSampleMimeType(MimeTypes.AUDIO_RAW)
             .setAverageBitrate(streamMetadata.getDecodedBitrate())
             .setPeakBitrate(streamMetadata.getDecodedBitrate())

libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/MidiExtractor.java

@@ -123,6 +123,7 @@ public final class MidiExtractor implements Extractor, SeekMap {
     trackOutput.format(
         new Format.Builder()
             .setCodecs(MimeTypes.AUDIO_MIDI)
+            .setContainerMimeType(MimeTypes.AUDIO_MIDI)
             .setSampleMimeType(MimeTypes.AUDIO_EXOPLAYER_MIDI)
             .build());
     output.endTracks();

libraries/extractor/src/main/java/androidx/media3/extractor/amr/AmrExtractor.java

@@ -324,13 +324,15 @@ public final class AmrExtractor implements Extractor {
   private void maybeOutputFormat() {
     if (!hasOutputFormat) {
       hasOutputFormat = true;
-      String mimeType = isWideBand ? MimeTypes.AUDIO_AMR_WB : MimeTypes.AUDIO_AMR_NB;
+      String containerMimeType = isWideBand ? MimeTypes.AUDIO_AMR_WB : MimeTypes.AUDIO_AMR;
+      String sampleMimeType = isWideBand ? MimeTypes.AUDIO_AMR_WB : MimeTypes.AUDIO_AMR_NB;
       int sampleRate = isWideBand ? SAMPLE_RATE_WB : SAMPLE_RATE_NB;
       // Theoretical maximum frame size for a AMR frame.
       int maxInputSize = isWideBand ? frameSizeBytesByTypeWb[8] : frameSizeBytesByTypeNb[7];
       realTrackOutput.format(
           new Format.Builder()
-              .setSampleMimeType(mimeType)
+              .setContainerMimeType(containerMimeType)
+              .setSampleMimeType(sampleMimeType)
               .setMaxInputSize(maxInputSize)
               .setChannelCount(1)
               .setSampleRate(sampleRate)

libraries/extractor/src/main/java/androidx/media3/extractor/flac/FlacExtractor.java

@@ -23,7 +23,9 @@ import static java.lang.annotation.ElementType.TYPE_USE;
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
+import androidx.media3.common.Format;
 import androidx.media3.common.Metadata;
+import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.UnstableApi;
@@ -230,8 +232,9 @@ public final class FlacExtractor implements Extractor {
 
     Assertions.checkNotNull(flacStreamMetadata);
     minFrameSize = max(flacStreamMetadata.minFrameSize, FlacConstants.MIN_FRAME_HEADER_SIZE);
+    Format format = flacStreamMetadata.getFormat(streamMarkerAndInfoBlock, id3Metadata);
     castNonNull(trackOutput)
-        .format(flacStreamMetadata.getFormat(streamMarkerAndInfoBlock, id3Metadata));
+        .format(format.buildUpon().setContainerMimeType(MimeTypes.AUDIO_FLAC).build());
     castNonNull(trackOutput).durationUs(flacStreamMetadata.getDurationUs());
 
     state = STATE_GET_FRAME_START_MARKER;

libraries/extractor/src/main/java/androidx/media3/extractor/mp3/Mp3Extractor.java

@@ -24,6 +24,7 @@ import androidx.annotation.Nullable;
 import androidx.media3.common.C;
 import androidx.media3.common.Format;
 import androidx.media3.common.Metadata;
+import androidx.media3.common.MimeTypes;
 import androidx.media3.common.PlaybackException;
 import androidx.media3.common.Player;
 import androidx.media3.common.util.Assertions;
@@ -291,6 +292,7 @@ public final class Mp3Extractor implements Extractor {
       extractorOutput.seekMap(seeker);
       Format.Builder format =
           new Format.Builder()
+              .setContainerMimeType(MimeTypes.AUDIO_MPEG)
               .setSampleMimeType(synchronizedHeader.mimeType)
               .setMaxInputSize(MpegAudioUtil.MAX_FRAME_SIZE_BYTES)
               .setChannelCount(synchronizedHeader.channels)

libraries/extractor/src/main/java/androidx/media3/extractor/ogg/FlacReader.java

@@ -19,6 +19,8 @@ import static androidx.media3.common.util.Assertions.checkNotNull;
 import static androidx.media3.common.util.Assertions.checkState;
 
 import androidx.annotation.Nullable;
+import androidx.media3.common.Format;
+import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.ParsableByteArray;
 import androidx.media3.common.util.Util;
 import androidx.media3.extractor.ExtractorInput;
@@ -79,7 +81,8 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
       streamMetadata = new FlacStreamMetadata(data, 17);
       this.streamMetadata = streamMetadata;
       byte[] metadata = Arrays.copyOfRange(data, 9, packet.limit());
-      setupData.format = streamMetadata.getFormat(metadata, /* id3Metadata= */ null);
+      Format format = streamMetadata.getFormat(metadata, /* id3Metadata= */ null);
+      setupData.format = format.buildUpon().setContainerMimeType(MimeTypes.AUDIO_OGG).build();
       return true;
     }
 

libraries/extractor/src/main/java/androidx/media3/extractor/ogg/OpusReader.java

@@ -77,6 +77,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
       }
       setupData.format =
           new Format.Builder()
+              .setContainerMimeType(MimeTypes.AUDIO_OGG)
               .setSampleMimeType(MimeTypes.AUDIO_OPUS)
               .setChannelCount(channelCount)
               .setSampleRate(OpusUtil.SAMPLE_RATE)

libraries/extractor/src/main/java/androidx/media3/extractor/ogg/VorbisReader.java

@@ -119,6 +119,7 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
 
     setupData.format =
         new Format.Builder()
+            .setContainerMimeType(MimeTypes.AUDIO_OGG)
             .setSampleMimeType(MimeTypes.AUDIO_VORBIS)
             .setAverageBitrate(idHeader.bitrateNominal)
             .setPeakBitrate(idHeader.bitrateMaximum)

libraries/extractor/src/main/java/androidx/media3/extractor/wav/WavExtractor.java

@@ -320,6 +320,7 @@ public final class WavExtractor implements Extractor {
           max(bytesPerFrame, wavFormat.frameRateHz * bytesPerFrame / TARGET_SAMPLES_PER_SECOND);
       format =
           new Format.Builder()
+              .setContainerMimeType(MimeTypes.AUDIO_WAV)
               .setSampleMimeType(mimeType)
               .setAverageBitrate(constantBitrate)
               .setPeakBitrate(constantBitrate)

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb.amr.0.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 2834
   sample count = 218
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb.amr.unknown_length.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 2834
   sample count = 218
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 218
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 146
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 73
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_always_enabled.amr.unknown_length.dump

@@ -8,6 +8,7 @@ track 0:
   total output bytes = 2834
   sample count = 218
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 218
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 146
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 73
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 4360000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_cbr_seeking_enabled.amr.unknown_length.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 2834
   sample count = 218
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 220
   track duration = 4400000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 148
   track duration = 4400000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 75
   track duration = 4400000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 0
   track duration = 4400000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_nb_with_silence_frames.amr.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 220
   track duration = 4400000
   format 0:
+    containerMimeType = audio/amr
     sampleMimeType = audio/3gpp
     maxInputSize = 32
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb.amr.0.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 4056
   sample count = 169
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb.amr.unknown_length.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 4056
   sample count = 169
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 169
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 113
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 57
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_always_enabled.amr.unknown_length.dump

@@ -8,6 +8,7 @@ track 0:
   total output bytes = 4056
   sample count = 169
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 169
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 113
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 57
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 3380000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_cbr_seeking_enabled.amr.unknown_length.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 4056
   sample count = 169
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 170
   track duration = 3400000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 115
   track duration = 3400000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 58
   track duration = 3400000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 0
   track duration = 3400000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/amr/sample_wb_with_silence_frames.amr.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 170
   track duration = 3400000
   format 0:
+    containerMimeType = audio/amr-wb
     sampleMimeType = audio/amr-wb
     maxInputSize = 61
     channelCount = 1

libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 12
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_flac.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 12
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_flac.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     channelCount = 2
     sampleRate = 48000

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_min_max_frame_size_raw.unknown_length.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.0.dump

@@ -8,6 +8,7 @@ track 0:
   total output bytes = 164431
   sample count = 33
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_flac.unknown_length.dump

@@ -8,6 +8,7 @@ track 0:
   total output bytes = 164431
   sample count = 33
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.0.dump

@@ -10,6 +10,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_num_samples_raw.unknown_length.dump

@@ -10,6 +10,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.0.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 164431
   sample count = 33
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_flac.unknown_length.dump

@@ -7,6 +7,7 @@ track 0:
   total output bytes = 164431
   sample count = 33
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.0.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_no_seek_table_no_num_samples_raw.unknown_length.dump

@@ -9,6 +9,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 12
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 1
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_flac.unknown_length.dump

@@ -8,6 +8,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_one_metadata_block_raw.unknown_length.dump

@@ -10,6 +10,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_raw.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_raw.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_raw.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_raw.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_raw.unknown_length.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 27
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 6456
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 19
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 6456
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 10
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 6456
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 6456
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_flac.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 27
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 6456
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1408000
     peakBitrate = 1408000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 18432
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1408000
     peakBitrate = 1408000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 18432
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1408000
     peakBitrate = 1408000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 18432
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1408000
     peakBitrate = 1408000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 18432
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_uncommon_sample_rate_raw.unknown_length.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1408000
     peakBitrate = 1408000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 18432
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.0.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.1.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 23
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.2.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 12
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.3.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 2
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_flac.unknown_length.dump

@@ -11,6 +11,7 @@ track 0:
   sample count = 33
   track duration = 2741000
   format 0:
+    containerMimeType = audio/flac
     sampleMimeType = audio/flac
     maxInputSize = 5776
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.0.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.1.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.2.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2

libraries/test_data/src/test/assets/extractordumps/flac/bear_with_id3_disabled_raw.3.dump

@@ -13,6 +13,7 @@ track 0:
   format 0:
     averageBitrate = 1536000
     peakBitrate = 1536000
+    containerMimeType = audio/flac
     sampleMimeType = audio/raw
     maxInputSize = 16384
     channelCount = 2