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

Commit e2ec61b2 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "StagefrightMediaScanner: Call endFile() for MIDI and OGG files."

parents e3bef7c4 dc1a26eb

media/libstagefright/StagefrightMediaScanner.cpp

+10 −8
Original line number Diff line number Diff line
@@ -172,14 +172,16 @@ status_t StagefrightMediaScanner::processFile( 
            || !strcasecmp(extension, ".rtttl")

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

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

        return HandleMIDI(path, &client);

        status_t status = HandleMIDI(path, &client);

        if (status != OK) {

            return status;

        }



    if (!strcasecmp(extension, ".ogg")) {

        return HandleOGG(path, &client);

    } else if (!strcasecmp(extension, ".ogg")) {

        status_t status = HandleOGG(path, &client);

        if (status != OK) {

            return status;

        }



    if (mRetriever->setDataSource(path) == OK

    } else if (mRetriever->setDataSource(path) == OK

            && mRetriever->setMode(

                METADATA_MODE_METADATA_RETRIEVAL_ONLY) == OK) {

        const char *value;