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

Commit 93d14080 authored by android-build-team Robot's avatar android-build-team Robot Committed by android-build-merger
Browse files

Merge "Add missing extensions, fix scan of bad media files." into pi-dev 

am: 58a1c16f

Change-Id: I70ac10adc9af410c9c3d73488dd92831c7aac373
parents 49393cdc 58a1c16f

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;

}