diff options
author | Andreas Huber <andih@google.com> | 2010-01-20 15:05:46 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-01-20 15:05:46 -0800 |
commit | c712b9fe2859435ce142b90ddcb46c5bed33eea8 (patch) | |
tree | 945f8e980662cc7bbad93e603d3c038d5d04ede1 /media/libstagefright/omx | |
parent | 918007b75539f5eabfd173a369c2da628c607ba7 (diff) | |
download | frameworks_base-c712b9fe2859435ce142b90ddcb46c5bed33eea8.zip frameworks_base-c712b9fe2859435ce142b90ddcb46c5bed33eea8.tar.gz frameworks_base-c712b9fe2859435ce142b90ddcb46c5bed33eea8.tar.bz2 |
Fix no-copy-overhead OMXCodec implementation to actually work.
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r-- | media/libstagefright/omx/OMX.cpp | 4 | ||||
-rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 2121321..918d055 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -280,9 +280,9 @@ status_t OMX::useBuffer( status_t OMX::allocateBuffer( node_id node, OMX_U32 port_index, size_t size, - buffer_id *buffer) { + buffer_id *buffer, void **buffer_data) { return findInstance(node)->allocateBuffer( - port_index, size, buffer); + port_index, size, buffer, buffer_data); } status_t OMX::allocateBufferWithBackup( diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 4eb6417..70c6a58 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -258,7 +258,8 @@ status_t OMXNodeInstance::useBuffer( } status_t OMXNodeInstance::allocateBuffer( - OMX_U32 portIndex, size_t size, OMX::buffer_id *buffer) { + OMX_U32 portIndex, size_t size, OMX::buffer_id *buffer, + void **buffer_data) { Mutex::Autolock autoLock(mLock); BufferMeta *buffer_meta = new BufferMeta(size); @@ -280,6 +281,7 @@ status_t OMXNodeInstance::allocateBuffer( } *buffer = header; + *buffer_data = header->pBuffer; addActiveBuffer(portIndex, *buffer); |