Add a custom MIME type for MIDI

PiperOrigin-RevId: 466032455
DiceTechnology · Oct 19, 2022 · 3aa99d5 · 3aa99d5
1 parent 273cf08
commit 3aa99d5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
@@ -89,11 +89,14 @@ 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";
+
+  public static final String AUDIO_EXOPLAYER_MIDI = BASE_TYPE_AUDIO + "/x-exoplayer-midi";
+
   public static final String AUDIO_UNKNOWN = BASE_TYPE_AUDIO + "/x-unknown";
 
   // text/ MIME types

diff --git a/testdata/src/test/assets/extractordumps/midi/Twinkle.mid.0.dump b/testdata/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/testdata/src/test/assets/extractordumps/midi/Twinkle.mid.unknown_length.dump b/testdata/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/testdata/src/test/assets/extractordumps/midi/mid_note_tempo_changes_simple.mid.dump b/testdata/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/testdata/src/test/assets/extractordumps/midi/multi_note_tempo_changes.mid.dump b/testdata/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/testdata/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump b/testdata/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