From 9847fcefb183e1cb09eb48e17a09577392b0e8f4 Mon Sep 17 00:00:00 2001 From: Lajos Molnar Date: Tue, 2 Jun 2015 19:40:57 -0700 Subject: stagefright: rename VideoGrallocMetadata.hHandle to pHandle This is so that it can be equivalent to the previously named VideoDecoderOutputMetaData struct. Bug: 13222807 Change-Id: I38831e19a76f49cc7e8385c079817c538d18f0ff --- media/libstagefright/omx/OMXNodeInstance.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/omx/OMXNodeInstance.cpp') diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 4ba4aeb..9e399f9 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -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 { -- cgit v1.1