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

Commit e63de4c6 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: update & pass graphic buffer properly to OMX 

Update graphic buffer must update the handle in the proper buffer.
E.g. if using emptyBuffer later, it must update the backup buffer
and use the backup buffer's metadata mode which may differ from the
codec buffer's mode.  Also use proper size for filled graphicbuffer.

Bug: 22775369
Change-Id: I9ec7032ed5db4c0636e2e2a4bad32022d251d66b
parent 855c2028

media/libstagefright/include/OMXNodeInstance.h

+6 −1
Original line number Diff line number Diff line
@@ -241,9 +241,14 @@ private: 
            OMX_BUFFERHEADERTYPE *header,

            OMX_U32 flags, OMX_TICKS timestamp, intptr_t debugAddr, int fenceFd);



    // Updates the graphic buffer handle in the metadata buffer for |buffer| and |header| to

    // |graphicBuffer|'s handle. If |updateCodecBuffer| is true, the update will happen in

    // the actual codec buffer (use this if not using emptyBuffer (with no _l) later to

    // pass the buffer to the codec, as only emptyBuffer copies the backup buffer to the codec

    // buffer.)

    status_t updateGraphicBufferInMeta_l(

            OMX_U32 portIndex, const sp<GraphicBuffer> &graphicBuffer,

            OMX::buffer_id buffer, OMX_BUFFERHEADERTYPE *header);

            OMX::buffer_id buffer, OMX_BUFFERHEADERTYPE *header, bool updateCodecBuffer);



    status_t createGraphicBufferSource(

            OMX_U32 portIndex, sp<IGraphicBufferConsumer> consumer /* nullable */,

media/libstagefright/omx/OMXNodeInstance.cpp

+29 −11
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ status_t OMXNodeInstance::useGraphicBuffer( 


status_t OMXNodeInstance::updateGraphicBufferInMeta_l(

        OMX_U32 portIndex, const sp<GraphicBuffer>& graphicBuffer,

        OMX::buffer_id buffer, OMX_BUFFERHEADERTYPE *header) {

        OMX::buffer_id buffer, OMX_BUFFERHEADERTYPE *header, bool updateCodecBuffer) {

    // No need to check |graphicBuffer| since NULL is valid for it as below.

    if (header == NULL) {

        ALOGE("b/25884056");
@@ -854,20 +854,27 @@ status_t OMXNodeInstance::updateGraphicBufferInMeta_l( 
    }



    BufferMeta *bufferMeta = (BufferMeta *)(header->pAppPrivate);

    sp<ABuffer> data = bufferMeta->getBuffer(

            header, !updateCodecBuffer /* backup */, false /* limit */);

    bufferMeta->setGraphicBuffer(graphicBuffer);

    if (mMetadataType[portIndex] == kMetadataBufferTypeGrallocSource

            && header->nAllocLen >= sizeof(VideoGrallocMetadata)) {

        VideoGrallocMetadata &metadata = *(VideoGrallocMetadata *)(header->pBuffer);

    MetadataBufferType metaType = mMetadataType[portIndex];

    // we use gralloc source only in the codec buffers

    if (metaType == kMetadataBufferTypeGrallocSource && !updateCodecBuffer) {

        metaType = kMetadataBufferTypeANWBuffer;

    }

    if (metaType == kMetadataBufferTypeGrallocSource

            && data->capacity() >= sizeof(VideoGrallocMetadata)) {

        VideoGrallocMetadata &metadata = *(VideoGrallocMetadata *)(data->data());

        metadata.eType = kMetadataBufferTypeGrallocSource;

        metadata.pHandle = graphicBuffer == NULL ? NULL : graphicBuffer->handle;

    } else if (mMetadataType[portIndex] == kMetadataBufferTypeANWBuffer

            && header->nAllocLen >= sizeof(VideoNativeMetadata)) {

        VideoNativeMetadata &metadata = *(VideoNativeMetadata *)(header->pBuffer);

    } else if (metaType == kMetadataBufferTypeANWBuffer

            && data->capacity() >= sizeof(VideoNativeMetadata)) {

        VideoNativeMetadata &metadata = *(VideoNativeMetadata *)(data->data());

        metadata.eType = kMetadataBufferTypeANWBuffer;

        metadata.pBuffer = graphicBuffer == NULL ? NULL : graphicBuffer->getNativeBuffer();

        metadata.nFenceFd = -1;

    } else {

        CLOG_BUFFER(updateGraphicBufferInMeta, "%s:%u, %#x bad type (%d) or size (%u)",

        CLOG_ERROR(updateGraphicBufferInMeta, BAD_VALUE, "%s:%u, %#x bad type (%d) or size (%u)",

            portString(portIndex), portIndex, buffer, mMetadataType[portIndex], header->nAllocLen);

        return BAD_VALUE;

    }
@@ -883,7 +890,10 @@ status_t OMXNodeInstance::updateGraphicBufferInMeta( 
        OMX::buffer_id buffer) {

    Mutex::Autolock autoLock(mLock);

    OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer);

    return updateGraphicBufferInMeta_l(portIndex, graphicBuffer, buffer, header);

    // update backup buffer for input, codec buffer for output

    return updateGraphicBufferInMeta_l(

            portIndex, graphicBuffer, buffer, header,

            portIndex == kPortIndexOutput /* updateCodecBuffer */);

}



status_t OMXNodeInstance::updateNativeHandleInMeta(
@@ -1388,7 +1398,9 @@ status_t OMXNodeInstance::emptyGraphicBuffer( 


    Mutex::Autolock autoLock(mLock);

    OMX::buffer_id buffer = findBufferID(header);

    status_t err = updateGraphicBufferInMeta_l(kPortIndexInput, graphicBuffer, buffer, header);

    status_t err = updateGraphicBufferInMeta_l(

            kPortIndexInput, graphicBuffer, buffer, header,

            true /* updateCodecBuffer */);

    if (err != OK) {

        CLOG_ERROR(emptyGraphicBuffer, err, FULL_BUFFER(

                (intptr_t)header->pBuffer, header, fenceFd));
@@ -1396,7 +1408,13 @@ status_t OMXNodeInstance::emptyGraphicBuffer( 
    }



    header->nOffset = 0;

    header->nFilledLen = graphicBuffer == NULL ? 0 : header->nAllocLen;

    if (graphicBuffer == NULL) {

        header->nFilledLen = 0;

    } else if (mMetadataType[kPortIndexInput] == kMetadataBufferTypeGrallocSource) {

        header->nFilledLen = sizeof(VideoGrallocMetadata);

    } else {

        header->nFilledLen = sizeof(VideoNativeMetadata);

    }

    return emptyBuffer_l(header, flags, timestamp, (intptr_t)header->pBuffer, fenceFd);

}