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

Commit 1581d8e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Start submitting buffers during idle->executing transition" into main... 

Merge "Start submitting buffers during idle->executing transition" into main am: 3f1fd467 am: 0fee8602

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2892781



Change-Id: I456f301f320266518bd9d290e36edd23634c93e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c16773e0 0fee8602

media/libstagefright/omx/OMXNodeInstance.cpp

+4 −7
Original line number Original line Diff line number Diff line
@@ -626,6 +626,10 @@ status_t OMXNodeInstance::sendCommand( 
            // ACodec is waiting for all buffers to be returned, do NOT

            // ACodec is waiting for all buffers to be returned, do NOT

            // submit any more buffers to the codec.

            // submit any more buffers to the codec.

            bufferSource->onOmxIdle();

            bufferSource->onOmxIdle();

        } else if (param == OMX_StateExecuting) {

            // Initiating transition from Idle -> Executing

            // Start submitting buffers to codec.

            bufferSource->onOmxExecuting();

        } else if (param == OMX_StateLoaded) {

        } else if (param == OMX_StateLoaded) {

            // Initiating transition from Idle/Executing -> Loaded

            // Initiating transition from Idle/Executing -> Loaded

            // Buffers are about to be freed.

            // Buffers are about to be freed.
@@ -2404,13 +2408,6 @@ void OMXNodeInstance::onEvent( 
            asString(event), event, arg1String, arg1, arg2String, arg2);

            asString(event), event, arg1String, arg1, arg2String, arg2);

    const sp<IOMXBufferSource> bufferSource(getBufferSource());

    const sp<IOMXBufferSource> bufferSource(getBufferSource());





    if (bufferSource != NULL

            && event == OMX_EventCmdComplete

            && arg1 == OMX_CommandStateSet

            && arg2 == OMX_StateExecuting) {

        bufferSource->onOmxExecuting();

    }



    // allow configuration if we return to the loaded state

    // allow configuration if we return to the loaded state

    if (event == OMX_EventCmdComplete

    if (event == OMX_EventCmdComplete

            && arg1 == OMX_CommandStateSet

            && arg1 == OMX_CommandStateSet