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

Commit 59ae56a5 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

IOMX: allow configuration after going to loaded state am: e03b2283 

am: 66b557b3

Change-Id: I9a82c1682fecc9ab5ad2c6f5f2240a2be3dd11d1
parents 38cd617b 66b557b3

media/libstagefright/omx/OMXNodeInstance.cpp

+8 −2
Original line number Diff line number Diff line
@@ -391,8 +391,7 @@ status_t OMXNodeInstance::freeNode(OMXMaster *master) { 
status_t OMXNodeInstance::sendCommand(

        OMX_COMMANDTYPE cmd, OMX_S32 param) {

    if (cmd == OMX_CommandStateSet) {

        // We do not support returning from unloaded state, so there are no configurations past

        // first StateSet command.

        // There are no configurations past first StateSet command.

        mSailed = true;

    }

    const sp<GraphicBufferSource> bufferSource(getGraphicBufferSource());
@@ -1689,6 +1688,13 @@ void OMXNodeInstance::onEvent( 
            && arg2 == OMX_StateExecuting) {

        bufferSource->omxExecuting();

    }



    // allow configuration if we return to the loaded state

    if (event == OMX_EventCmdComplete

            && arg1 == OMX_CommandStateSet

            && arg2 == OMX_StateLoaded) {

        mSailed = false;

    }

}



// static