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

Commit 186e9c45 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "stagefright: rename VideoGrallocMetadata.hHandle to pHandle" into mnc-dev

parents 9c21131f 9847fcef

media/libstagefright/ACodec.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() { 
        ALOGV("replaced oldest buffer #%u with age %u (%p/%p stored in %p)",

                (unsigned)(oldest - &mBuffers[kPortIndexOutput][0]),

                mDequeueCounter - oldest->mDequeuedAt,

                grallocMeta->hHandle,

                grallocMeta->pHandle,

                oldest->mGraphicBuffer->handle, oldest->mData->base());

    } else if (mOutputMetadataType == kMetadataBufferTypeANWBuffer) {

        VideoNativeMetadata *nativeMeta =
@@ -4945,7 +4945,7 @@ bool ACodec::BaseState::onOMXFillBufferDone( 
                VideoNativeMetadata &nativeMeta = *(VideoNativeMetadata *)info->mData->data();

                if (info->mData->size() >= sizeof(grallocMeta)

                        && grallocMeta.eType == kMetadataBufferTypeGrallocSource) {

                    handle = (native_handle_t *)grallocMeta.hHandle;

                    handle = (native_handle_t *)grallocMeta.pHandle;

                } else if (info->mData->size() >= sizeof(nativeMeta)

                        && nativeMeta.eType == kMetadataBufferTypeANWBuffer) {

                    handle = (native_handle_t *)nativeMeta.pBuffer->handle;

media/libstagefright/omx/GraphicBufferSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -275,10 +275,10 @@ void GraphicBufferSource::codecBufferEmptied(OMX_BUFFERHEADERTYPE* header, int f 
        if (type == kMetadataBufferTypeGrallocSource

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

            VideoGrallocMetadata &grallocMeta = *(VideoGrallocMetadata *)data;

            if (grallocMeta.hHandle != codecBuffer.mGraphicBuffer->handle) {

            if (grallocMeta.pHandle != codecBuffer.mGraphicBuffer->handle) {

                // should never happen

                ALOGE("codecBufferEmptied: buffer's handle is %p, expected %p",

                        grallocMeta.hHandle, codecBuffer.mGraphicBuffer->handle);

                        grallocMeta.pHandle, codecBuffer.mGraphicBuffer->handle);

                CHECK(!"codecBufferEmptied: mismatched buffer");

            }

        } else if (type == kMetadataBufferTypeANWBuffer

media/libstagefright/omx/OMXNodeInstance.cpp

+2 −2
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ status_t OMXNodeInstance::updateGraphicBufferInMeta_l( 
            && header->nAllocLen >= sizeof(VideoGrallocMetadata)) {

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

        metadata.eType = kMetadataBufferTypeGrallocSource;

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

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

    } else if (mMetadataType[portIndex] == kMetadataBufferTypeANWBuffer

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

        VideoNativeMetadata &metadata = *(VideoNativeMetadata *)(header->pBuffer);
@@ -1113,7 +1113,7 @@ status_t OMXNodeInstance::emptyBuffer( 
        VideoNativeMetadata &backupMeta = *(VideoNativeMetadata *)backup->base();

        VideoGrallocMetadata &codecMeta = *(VideoGrallocMetadata *)codec->base();

        ALOGV("converting ANWB %p to handle %p", backupMeta.pBuffer, backupMeta.pBuffer->handle);

        codecMeta.hHandle = backupMeta.pBuffer->handle;

        codecMeta.pHandle = backupMeta.pBuffer->handle;

        codecMeta.eType = kMetadataBufferTypeGrallocSource;

        header->nFilledLen = sizeof(codecMeta);

    } else {

media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ const uint8_t *SoftVideoEncoderOMXComponent::extractGraphicBuffer( 
        }



        VideoGrallocMetadata &grallocMeta = *(VideoGrallocMetadata *)(src);

        handle = grallocMeta.hHandle;

        handle = grallocMeta.pHandle;

        // assume HAL_PIXEL_FORMAT_RGBA_8888

        // there is no way to get the src stride without the graphic buffer

        format = HAL_PIXEL_FORMAT_RGBA_8888;