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

Commit 2ae1f524 authored by Marco Nelissen's avatar Marco Nelissen
Browse files

Add missing extensions, fix scan of bad media files. 

Update extensions list in StagefrightMediaScanner.
Mark files that fail to scan as non-media files.

Bug: 31900187
Bug: 32045229
Bug: 77656952
Bug: 78682917
Change-Id: I78f21b044f3a038d6e78dbe9f461f650650afe8b
(cherry picked from commit 9abe5ee5)
parent c3d554d4

media/libstagefright/StagefrightMediaScanner.cpp

+7 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ static bool FileHasAcceptableExtension(const char *extension) { 
        ".mpeg", ".ogg", ".mid", ".smf", ".imy", ".wma", ".aac",

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

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

        ".avi", ".mpeg", ".mpg", ".awb", ".mpga", ".mov"

        ".avi", ".mpeg", ".mpg", ".awb", ".mpga", ".mov",

        ".m4v", ".oga"

    };

    static const size_t kNumValidExtensions =

        sizeof(kValidExtensions) / sizeof(kValidExtensions[0]);
@@ -62,6 +63,11 @@ MediaScanResult StagefrightMediaScanner::processFile( 
    client.setLocale(locale());

    client.beginFile();

    MediaScanResult result = processFileInternal(path, mimeType, client);

    ALOGV("result: %d", result);

    if (mimeType == NULL && result != MEDIA_SCAN_RESULT_OK) {

        ALOGW("media scan failed for %s", path);

        client.setMimeType("application/octet-stream");

    }

    client.endFile();

    return result;

}