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

Commit 2927be99 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger] Merge changes from topic... 

[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into cw-f-dev am: d2467b8d am: 2217a6ce

Change-Id: I04c0263ce364f21c014e5efa0b6bc2215796db92
parents 8a082383 2217a6ce

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);