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

Commit 11e9ddc2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-447544c9-42cd-4c45-a7c6-4f09361c94db-for-git_oc-dr1-release-42... 

release-request-447544c9-42cd-4c45-a7c6-4f09361c94db-for-git_oc-dr1-release-4277755 snap-temp-L90500000093605838

Change-Id: Iee0c88abe2424d6240d5e093c15577e3b9c10add
parents a2358fc5 7709475e

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+7 −2
Original line number Diff line number Diff line
@@ -214,6 +214,13 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer( 
    Mutex::Autolock autoLock(mLock);

    CHECK_LT(portIndex, mPorts.size());



    PortInfo *port = &mPorts.editItemAt(portIndex);

    if (size < port->mDef.nBufferSize) {

        ALOGE("b/63522430, Buffer size is too small.");

        android_errorWriteLog(0x534e4554, "63522430");

        return OMX_ErrorBadParameter;

    }



    *header = new OMX_BUFFERHEADERTYPE;

    (*header)->nSize = sizeof(OMX_BUFFERHEADERTYPE);

    (*header)->nVersion.s.nVersionMajor = 1;
@@ -236,8 +243,6 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::useBuffer( 
    (*header)->nOutputPortIndex = portIndex;

    (*header)->nInputPortIndex = portIndex;



    PortInfo *port = &mPorts.editItemAt(portIndex);



    CHECK(mState == OMX_StateLoaded || port->mDef.bEnabled == OMX_FALSE);



    CHECK_LT(port->mBuffers.size(), port->mDef.nBufferCountActual);