diff options
author | Lajos Molnar <lajos@google.com> | 2015-06-02 19:40:57 -0700 |
---|---|---|
committer | Lajos Molnar <lajos@google.com> | 2015-06-02 19:42:38 -0700 |
commit | 9847fcefb183e1cb09eb48e17a09577392b0e8f4 (patch) | |
tree | c4ebb66267c1283ee00d991d40365c5e3afa30b4 | |
parent | 15ab4996019387f27a48b81cb4774c21502bc0e5 (diff) | |
download | frameworks_av-9847fcefb183e1cb09eb48e17a09577392b0e8f4.zip frameworks_av-9847fcefb183e1cb09eb48e17a09577392b0e8f4.tar.gz frameworks_av-9847fcefb183e1cb09eb48e17a09577392b0e8f4.tar.bz2 |
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
-rw-r--r-- | media/libstagefright/ACodec.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/omx/GraphicBufferSource.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index a770746..3a98e8c 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -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; diff --git a/media/libstagefright/omx/GraphicBufferSource.cpp b/media/libstagefright/omx/GraphicBufferSource.cpp index be91510..d30bba5 100644 --- a/media/libstagefright/omx/GraphicBufferSource.cpp +++ b/media/libstagefright/omx/GraphicBufferSource.cpp @@ -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 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 { diff --git a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp index cd1ac36..9dd26fb 100644 --- a/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp +++ b/media/libstagefright/omx/SoftVideoEncoderOMXComponent.cpp @@ -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; |