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

Commit 946f8dd2 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7 am:...

[automerger] Fix a race condition in OMXNodeInstance am: fe3708f7 am: dce12d18 am: ad0ec9b3 am: fc7a3a56 am: 25e9dff2 am: e8d5d152 am: 1ff39c65 am: e5d3086f am: 301a0078 am: 77c35f6c am: 22eab8fe
am: 58d53f6c

Change-Id: I977f6e8af49d8c38033f6e8c046deddda2b2df4f
parents 149cf6a4 58d53f6c
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1609,12 +1609,15 @@ status_t OMXNodeInstance::freeBuffer(
    }
    BufferMeta *buffer_meta = static_cast<BufferMeta *>(header->pAppPrivate);

    // Invalidate buffers in the client side first before calling OMX_FreeBuffer.
    // If not, pending events in the client side might access the buffers after free.
    invalidateBufferID(buffer);

    OMX_ERRORTYPE err = OMX_FreeBuffer(mHandle, portIndex, header);
    CLOG_IF_ERROR(freeBuffer, err, "%s:%u %#x", portString(portIndex), portIndex, buffer);

    delete buffer_meta;
    buffer_meta = NULL;
    invalidateBufferID(buffer);

    return StatusFromOMXError(err);
}