diff options
author | Rachad Alao <rachad@google.com> | 2015-06-15 18:42:40 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-15 18:42:41 +0000 |
commit | bd974011599b6d4ff47c1cee36d617f191dc0c2f (patch) | |
tree | 34c15cf4dd6af513e766fe84e1c6d3a5702d08a7 | |
parent | 938e2b34b16c3c1fd29c753eeb53ee95a2b2e2b3 (diff) | |
parent | 1ff26b038c646414c450bae5277b7a726b3322b7 (diff) | |
download | frameworks_av-bd974011599b6d4ff47c1cee36d617f191dc0c2f.zip frameworks_av-bd974011599b6d4ff47c1cee36d617f191dc0c2f.tar.gz frameworks_av-bd974011599b6d4ff47c1cee36d617f191dc0c2f.tar.bz2 |
Merge "Revert "stagefright: relax check of OMX buffer header"" into mnc-dev
-rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index c121163..6ee1a77 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -121,10 +121,9 @@ struct BufferMeta { return; } - // check component returns proper range - sp<ABuffer> codec = getBuffer(header, false /* backup */, true /* limit */); - - memcpy((OMX_U8 *)mMem->pointer() + header->nOffset, codec->data(), codec->size()); + memcpy((OMX_U8 *)mMem->pointer() + header->nOffset, + header->pBuffer + header->nOffset, + header->nFilledLen); } void CopyToOMX(const OMX_BUFFERHEADERTYPE *header) { @@ -138,16 +137,14 @@ struct BufferMeta { } // return either the codec or the backup buffer - sp<ABuffer> getBuffer(const OMX_BUFFERHEADERTYPE *header, bool backup, bool limit) { + sp<ABuffer> getBuffer(const OMX_BUFFERHEADERTYPE *header, bool backup) { sp<ABuffer> buf; if (backup && mMem != NULL) { buf = new ABuffer(mMem->pointer(), mMem->size()); } else { buf = new ABuffer(header->pBuffer, header->nAllocLen); } - if (limit) { - buf->setRange(header->nOffset, header->nFilledLen); - } + buf->setRange(header->nOffset, header->nFilledLen); return buf; } @@ -1092,11 +1089,10 @@ status_t OMXNodeInstance::emptyBuffer( OMX_BUFFERHEADERTYPE *header = findBufferHeader(buffer); BufferMeta *buffer_meta = static_cast<BufferMeta *>(header->pAppPrivate); - sp<ABuffer> backup = buffer_meta->getBuffer(header, true /* backup */, false /* limit */); - sp<ABuffer> codec = buffer_meta->getBuffer(header, false /* backup */, false /* limit */); + sp<ABuffer> backup = buffer_meta->getBuffer(header, true /* backup */); + sp<ABuffer> codec = buffer_meta->getBuffer(header, false /* backup */); // convert incoming ANW meta buffers if component is configured for gralloc metadata mode - // ignore rangeOffset in this case if (mMetadataType[kPortIndexInput] == kMetadataBufferTypeGrallocSource && backup->capacity() >= sizeof(VideoNativeMetadata) && codec->capacity() >= sizeof(VideoGrallocMetadata) @@ -1106,7 +1102,7 @@ status_t OMXNodeInstance::emptyBuffer( VideoGrallocMetadata &codecMeta = *(VideoGrallocMetadata *)codec->base(); CLOG_BUFFER(emptyBuffer, "converting ANWB %p to handle %p", backupMeta.pBuffer, backupMeta.pBuffer->handle); - codecMeta.pHandle = backupMeta.pBuffer != NULL ? backupMeta.pBuffer->handle : NULL; + codecMeta.pHandle = backupMeta.pBuffer->handle; codecMeta.eType = kMetadataBufferTypeGrallocSource; header->nFilledLen = rangeLength ? sizeof(codecMeta) : 0; header->nOffset = 0; |