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

Commit ad3b7e8d authored by Andreas Huber's avatar Andreas Huber
Browse files

Properly handle executing->idle in GraphicBufferSource 

ACodec has initiated the transition from exectuing->idle and is waiting
for the component to return all buffers so they can be freed.
It's counter productive and with some vendors harmful to submit additional
buffers to the component from this point on.

Change-Id: I332be254a1faf94902c77b5792a373ab447e44d3
related-to-bug: 11573543
parent f8a1169d

media/libstagefright/omx/GraphicBufferSource.cpp

+12 −0
Original line number Diff line number Diff line
@@ -148,6 +148,18 @@ void GraphicBufferSource::omxExecuting() { 
    }

}



void GraphicBufferSource::omxIdle() {

    ALOGV("omxIdle");



    Mutex::Autolock autoLock(mMutex);



    if (mExecuting) {

        // We are only interested in the transition from executing->idle,

        // not loaded->idle.

        mEndOfStream = mEndOfStreamSent = true;

    }

}



void GraphicBufferSource::omxLoaded(){

    Mutex::Autolock autoLock(mMutex);

    if (!mExecuting) {

media/libstagefright/omx/GraphicBufferSource.h

+5 −0
Original line number Diff line number Diff line
@@ -69,6 +69,11 @@ public: 
    // sitting in the BufferQueue, this will send them to the codec.

    void omxExecuting();



    // This is called when OMX transitions to OMX_StateIdle, indicating that

    // the codec is meant to return all buffers back to the client for them

    // to be freed. Do NOT submit any more buffers to the component.

    void omxIdle();



    // This is called when OMX transitions to OMX_StateLoaded, indicating that

    // we are shutting down.

    void omxLoaded();

media/libstagefright/omx/OMXNodeInstance.cpp

+12 −7
Original line number Diff line number Diff line
@@ -243,13 +243,18 @@ status_t OMXNodeInstance::freeNode(OMXMaster *master) { 
status_t OMXNodeInstance::sendCommand(

        OMX_COMMANDTYPE cmd, OMX_S32 param) {

    const sp<GraphicBufferSource>& bufferSource(getGraphicBufferSource());

    if (bufferSource != NULL

            && cmd == OMX_CommandStateSet

            && param == OMX_StateLoaded) {

        // Initiating transition from Executing -> Loaded

    if (bufferSource != NULL && cmd == OMX_CommandStateSet) {

        if (param == OMX_StateIdle) {

            // Initiating transition from Executing -> Idle

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

            // submit any more buffers to the codec.

            bufferSource->omxIdle();

        } else if (param == OMX_StateLoaded) {

            // Initiating transition from Idle/Executing -> Loaded

            // Buffers are about to be freed.

            bufferSource->omxLoaded();

            setGraphicBufferSource(NULL);

        }



        // fall through

    }