diff options
| author | Andy Hung <hunga@google.com> | 2015-05-26 11:32:13 -0700 |
|---|---|---|
| committer | Andy Hung <hunga@google.com> | 2015-05-26 12:08:08 -0700 |
| commit | 2d6b6601743c3c6960c6511a2cb774ef902759f4 (patch) | |
| tree | 5733407066c44309c936794da6639159ca84ed13 /media | |
| parent | d971df0eb300356b3c995d533289216f43aa60de (diff) | |
| download | frameworks_av-2d6b6601743c3c6960c6511a2cb774ef902759f4.zip frameworks_av-2d6b6601743c3c6960c6511a2cb774ef902759f4.tar.gz frameworks_av-2d6b6601743c3c6960c6511a2cb774ef902759f4.tar.bz2 | |
IOMX: Enable buffer ptr to buffer id translation for arm32
Bug: 20634516
Change-Id: Iac9eac3cb251eccd9bbad5df7421a07edc21da0c
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/include/OMXNodeInstance.h | 3 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 21 |
2 files changed, 1 insertions, 23 deletions
diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h index ad1e181..3c032f9 100644 --- a/media/libstagefright/include/OMXNodeInstance.h +++ b/media/libstagefright/include/OMXNodeInstance.h @@ -151,12 +151,11 @@ private: OMX::buffer_id mID; }; Vector<ActiveBuffer> mActiveBuffers; -#ifdef __LP64__ + // for buffer ptr to buffer id translation Mutex mBufferIDLock; uint32_t mBufferIDCount; KeyedVector<OMX::buffer_id, OMX_BUFFERHEADERTYPE *> mBufferIDToBufferHeader; KeyedVector<OMX_BUFFERHEADERTYPE *, OMX::buffer_id> mBufferHeaderToBufferID; -#endif // For debug support char *mName; diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index a7916c1..753eb28 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -1420,8 +1420,6 @@ void OMXNodeInstance::freeActiveBuffers() { } } -#ifdef __LP64__ - OMX::buffer_id OMXNodeInstance::makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) { if (bufferHeader == NULL) { return 0; @@ -1464,23 +1462,4 @@ void OMXNodeInstance::invalidateBufferID(OMX::buffer_id buffer) { mBufferIDToBufferHeader.removeItem(buffer); } -#else - -OMX::buffer_id OMXNodeInstance::makeBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) { - return (OMX::buffer_id)bufferHeader; -} - -OMX_BUFFERHEADERTYPE *OMXNodeInstance::findBufferHeader(OMX::buffer_id buffer) { - return (OMX_BUFFERHEADERTYPE *)buffer; -} - -OMX::buffer_id OMXNodeInstance::findBufferID(OMX_BUFFERHEADERTYPE *bufferHeader) { - return (OMX::buffer_id)bufferHeader; -} - -void OMXNodeInstance::invalidateBufferID(OMX::buffer_id buffer __unused) { -} - -#endif - } // namespace android |