diff --git a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java index 28928ba15a..859773b2a6 100644 --- a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java +++ b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java @@ -91,11 +91,15 @@ public final class MimeTypes { public static final String AUDIO_AMR_NB = BASE_TYPE_AUDIO + "/3gpp"; public static final String AUDIO_AMR_WB = BASE_TYPE_AUDIO + "/amr-wb"; public static final String AUDIO_FLAC = BASE_TYPE_AUDIO + "/flac"; - public static final String AUDIO_MIDI = BASE_TYPE_AUDIO + "/midi"; public static final String AUDIO_ALAC = BASE_TYPE_AUDIO + "/alac"; public static final String AUDIO_MSGSM = BASE_TYPE_AUDIO + "/gsm"; public static final String AUDIO_OGG = BASE_TYPE_AUDIO + "/ogg"; public static final String AUDIO_WAV = BASE_TYPE_AUDIO + "/wav"; + public static final String AUDIO_MIDI = BASE_TYPE_AUDIO + "/midi"; + + @UnstableApi + public static final String AUDIO_EXOPLAYER_MIDI = BASE_TYPE_AUDIO + "/x-exoplayer-midi"; + @UnstableApi public static final String AUDIO_UNKNOWN = BASE_TYPE_AUDIO + "/x-unknown"; // text/ MIME types diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump index 4aaff5e9a1..0e660017e4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump @@ -8,7 +8,8 @@ track 0: total output bytes = 96 sample count = 96 format 0: - sampleMimeType = audio/midi + sampleMimeType = audio/x-exoplayer-midi + codecs = audio/midi sample 0: time = 0 flags = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump index 4aaff5e9a1..0e660017e4 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump @@ -8,7 +8,8 @@ track 0: total output bytes = 96 sample count = 96 format 0: - sampleMimeType = audio/midi + sampleMimeType = audio/x-exoplayer-midi + codecs = audio/midi sample 0: time = 0 flags = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/mid_note_tempo_changes_simple.mid.dump b/libraries/test_data/src/test/assets/extractordumps/midi/mid_note_tempo_changes_simple.mid.dump index b5020c0196..639be7c871 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/mid_note_tempo_changes_simple.mid.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/mid_note_tempo_changes_simple.mid.dump @@ -8,7 +8,8 @@ track 0: total output bytes = 43 sample count = 19 format 0: - sampleMimeType = audio/midi + sampleMimeType = audio/x-exoplayer-midi + codecs = audio/midi sample 0: time = 0 flags = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/multi_note_tempo_changes.mid.dump b/libraries/test_data/src/test/assets/extractordumps/midi/multi_note_tempo_changes.mid.dump index bdc7bdea28..0542bd5814 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/multi_note_tempo_changes.mid.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/multi_note_tempo_changes.mid.dump @@ -8,7 +8,8 @@ track 0: total output bytes = 78 sample count = 31 format 0: - sampleMimeType = audio/midi + sampleMimeType = audio/x-exoplayer-midi + codecs = audio/midi sample 0: time = 0 flags = 1 diff --git a/libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump b/libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump index 1f006f540c..81739c85a0 100644 --- a/libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump +++ b/libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump @@ -8,7 +8,8 @@ track 0: total output bytes = 31 sample count = 23 format 0: - sampleMimeType = audio/midi + sampleMimeType = audio/x-exoplayer-midi + codecs = audio/midi sample 0: time = 0 flags = -2147483647