Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eecadb9a authored by Andreas Huber's avatar Andreas Huber
Browse files

Adding support for the '.mxmf' MIDI file extension. 

Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
parent 397de169

media/java/android/media/MediaFile.java

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ public class MediaFile { 
        addFileType("IMY", FILE_TYPE_IMY, "audio/imelody");

        addFileType("RTX", FILE_TYPE_MID, "audio/midi");

        addFileType("OTA", FILE_TYPE_MID, "audio/midi");

        addFileType("MXMF", FILE_TYPE_MID, "audio/midi");

        

        addFileType("MPEG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);

        addFileType("MPG", FILE_TYPE_MP4, "video/mpeg", MtpConstants.FORMAT_MPEG);

media/libstagefright/StagefrightMediaScanner.cpp

+3 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static bool FileHasAcceptableExtension(const char *extension) { 
        ".mp3", ".mp4", ".m4a", ".3gp", ".3gpp", ".3g2", ".3gpp2",

        ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac",

        ".wav", ".amr", ".midi", ".xmf", ".rtttl", ".rtx", ".ota",

        ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac"

        ".mkv", ".mka", ".webm", ".ts", ".fl", ".flac", ".mxmf",

    };

    static const size_t kNumValidExtensions =

        sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);
@@ -124,7 +124,8 @@ status_t StagefrightMediaScanner::processFile( 
            || !strcasecmp(extension, ".xmf")

            || !strcasecmp(extension, ".rtttl")

            || !strcasecmp(extension, ".rtx")

            || !strcasecmp(extension, ".ota")) {

            || !strcasecmp(extension, ".ota")

            || !strcasecmp(extension, ".mxmf")) {

        status_t status = HandleMIDI(path, &client);

        if (status != OK) {

            return status;