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

Commit aae3f86c authored by Lajos Molnar's avatar Lajos Molnar
Browse files

DO NOT MERGE: Fix build for libstagefright 

Bug: 15987446
Change-Id: I6a13e1f73b067b733e2592e12ee21210d4c4d476
parent 782be1ec

media/libstagefright/ACodec.cpp

+3 −9
Original line number Diff line number Diff line
@@ -652,15 +652,9 @@ status_t ACodec::configureOutputBuffersFromNativeWindow( 
        err = mOMX->setParameter(

                mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));



        if (err == OK) {

            *minUndequeuedBuffers += extraBuffers;

            break;

        }



        ALOGW("[%s] setting nBufferCountActual to %u failed: %d",

        if (err != OK) {

            ALOGE("[%s] setting nBufferCountActual to %u failed: %d",

                    mComponentName.c_str(), newBufferCount, err);

        /* exit condition */

        if (extraBuffers == 0) {

            return err;

        }

    }

media/libstagefright/OMXCodec.cpp

+3 −9
Original line number Diff line number Diff line
@@ -1806,15 +1806,9 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { 
        err = mOMX->setParameter(

                mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));



        if (err == OK) {

            minUndequeuedBufs += extraBuffers;

            break;

        }



        CODEC_LOGW("setting nBufferCountActual to %u failed: %d",

        if (err != OK) {

            ALOGE("setting nBufferCountActual to %u failed: %d",

                    newBufferCount, err);

        /* exit condition */

        if (extraBuffers == 0) {

            return err;

        }

    }