From 9f2d258645826c999a93a4206df157fec2e3b0f2 Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Wed, 1 Sep 2010 14:32:35 -0700 Subject: Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API."" This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4. --- media/libmedia/IOMX.cpp | 73 --------------------- media/libstagefright/include/OMX.h | 7 -- media/libstagefright/include/OMXNodeInstance.h | 7 +- media/libstagefright/omx/OMX.cpp | 13 +--- media/libstagefright/omx/OMXNodeInstance.cpp | 88 +------------------------- 5 files changed, 3 insertions(+), 185 deletions(-) (limited to 'media') diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp index 40801a2..f3804b8 100644 --- a/media/libmedia/IOMX.cpp +++ b/media/libmedia/IOMX.cpp @@ -21,9 +21,7 @@ enum { SET_PARAMETER, GET_CONFIG, SET_CONFIG, - ENABLE_GRAPHIC_BUFFERS, USE_BUFFER, - USE_GRAPHIC_BUFFER, ALLOC_BUFFER, ALLOC_BUFFER_WITH_BACKUP, FREE_BUFFER, @@ -218,19 +216,6 @@ public: return reply.readInt32(); } - virtual status_t enableGraphicBuffers( - node_id node, OMX_U32 port_index, OMX_BOOL enable) { - Parcel data, reply; - data.writeInterfaceToken(IOMX::getInterfaceDescriptor()); - data.writeIntPtr((intptr_t)node); - data.writeInt32(port_index); - data.writeInt32((uint32_t)enable); - remote()->transact(ENABLE_GRAPHIC_BUFFERS, data, &reply); - - status_t err = reply.readInt32(); - return err; - } - virtual status_t useBuffer( node_id node, OMX_U32 port_index, const sp ¶ms, buffer_id *buffer) { @@ -253,29 +238,6 @@ public: return err; } - - virtual status_t useGraphicBuffer( - node_id node, OMX_U32 port_index, - const sp &graphicBuffer, buffer_id *buffer) { - Parcel data, reply; - data.writeInterfaceToken(IOMX::getInterfaceDescriptor()); - data.writeIntPtr((intptr_t)node); - data.writeInt32(port_index); - data.write(*graphicBuffer); - remote()->transact(USE_GRAPHIC_BUFFER, data, &reply); - - status_t err = reply.readInt32(); - if (err != OK) { - *buffer = 0; - - return err; - } - - *buffer = (void*)reply.readIntPtr(); - - return err; - } - virtual status_t allocateBuffer( node_id node, OMX_U32 port_index, size_t size, buffer_id *buffer, void **buffer_data) { @@ -579,20 +541,6 @@ status_t BnOMX::onTransact( return NO_ERROR; } - case ENABLE_GRAPHIC_BUFFERS: - { - CHECK_INTERFACE(IOMX, data, reply); - - node_id node = (void*)data.readIntPtr(); - OMX_U32 port_index = data.readInt32(); - OMX_BOOL enable = (OMX_BOOL)data.readInt32(); - - status_t err = enableGraphicBuffers(node, port_index, enable); - reply->writeInt32(err); - - return NO_ERROR; - } - case USE_BUFFER: { CHECK_INTERFACE(IOMX, data, reply); @@ -613,27 +561,6 @@ status_t BnOMX::onTransact( return NO_ERROR; } - case USE_GRAPHIC_BUFFER: - { - CHECK_INTERFACE(IOMX, data, reply); - - node_id node = (void*)data.readIntPtr(); - OMX_U32 port_index = data.readInt32(); - sp graphicBuffer = new GraphicBuffer(); - data.read(*graphicBuffer); - - buffer_id buffer; - status_t err = useGraphicBuffer( - node, port_index, graphicBuffer, &buffer); - reply->writeInt32(err); - - if (err == OK) { - reply->writeIntPtr((intptr_t)buffer); - } - - return NO_ERROR; - } - case ALLOC_BUFFER: { CHECK_INTERFACE(IOMX, data, reply); diff --git a/media/libstagefright/include/OMX.h b/media/libstagefright/include/OMX.h index 83b75ad..c99da59 100644 --- a/media/libstagefright/include/OMX.h +++ b/media/libstagefright/include/OMX.h @@ -59,17 +59,10 @@ public: node_id node, OMX_INDEXTYPE index, const void *params, size_t size); - virtual status_t enableGraphicBuffers( - node_id node, OMX_U32 port_index, OMX_BOOL enable); - virtual status_t useBuffer( node_id node, OMX_U32 port_index, const sp ¶ms, buffer_id *buffer); - virtual status_t useGraphicBuffer( - node_id node, OMX_U32 port_index, - const sp &graphicBuffer, buffer_id *buffer); - virtual status_t allocateBuffer( node_id node, OMX_U32 port_index, size_t size, buffer_id *buffer, void **buffer_data); diff --git a/media/libstagefright/include/OMXNodeInstance.h b/media/libstagefright/include/OMXNodeInstance.h index 8c7c562..b5b31ac 100644 --- a/media/libstagefright/include/OMXNodeInstance.h +++ b/media/libstagefright/include/OMXNodeInstance.h @@ -49,16 +49,10 @@ struct OMXNodeInstance { status_t getConfig(OMX_INDEXTYPE index, void *params, size_t size); status_t setConfig(OMX_INDEXTYPE index, const void *params, size_t size); - status_t enableGraphicBuffers(OMX_U32 portIndex, OMX_BOOL enable); - status_t useBuffer( OMX_U32 portIndex, const sp ¶ms, OMX::buffer_id *buffer); - status_t useGraphicBuffer( - OMX_U32 portIndex, const sp &graphicBuffer, - OMX::buffer_id *buffer); - status_t allocateBuffer( OMX_U32 portIndex, size_t size, OMX::buffer_id *buffer, void **buffer_data); @@ -131,3 +125,4 @@ private: } // namespace android #endif // OMX_NODE_INSTANCE_H_ + diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 37243ad..88b9605 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -287,11 +287,6 @@ status_t OMX::setConfig( index, params, size); } -status_t OMX::enableGraphicBuffers( - node_id node, OMX_U32 port_index, OMX_BOOL enable) { - return findInstance(node)->enableGraphicBuffers(port_index, enable); -} - status_t OMX::useBuffer( node_id node, OMX_U32 port_index, const sp ¶ms, buffer_id *buffer) { @@ -299,13 +294,6 @@ status_t OMX::useBuffer( port_index, params, buffer); } -status_t OMX::useGraphicBuffer( - node_id node, OMX_U32 port_index, - const sp &graphicBuffer, buffer_id *buffer) { - return findInstance(node)->useGraphicBuffer( - port_index, graphicBuffer, buffer); -} - status_t OMX::allocateBuffer( node_id node, OMX_U32 port_index, size_t size, buffer_id *buffer, void **buffer_data) { @@ -542,3 +530,4 @@ void OMXRenderer::render(IOMX::buffer_id buffer) { } } // namespace android + diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 1104113..5db516e 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include @@ -41,11 +40,6 @@ struct BufferMeta { mIsBackup(false) { } - BufferMeta(const sp &graphicBuffer) - : mGraphicBuffer(graphicBuffer), - mIsBackup(false) { - } - void CopyFromOMX(const OMX_BUFFERHEADERTYPE *header) { if (!mIsBackup) { return; @@ -67,7 +61,6 @@ struct BufferMeta { } private: - sp mGraphicBuffer; sp mMem; size_t mSize; bool mIsBackup; @@ -247,38 +240,6 @@ status_t OMXNodeInstance::setConfig( return StatusFromOMXError(err); } -status_t OMXNodeInstance::enableGraphicBuffers( - OMX_U32 portIndex, OMX_BOOL enable) { - Mutex::Autolock autoLock(mLock); - - OMX_INDEXTYPE index; - OMX_ERRORTYPE err = OMX_GetExtensionIndex( - mHandle, - const_cast("OMX.google.android.index.enableAndroidNativeBuffers"), - &index); - - if (err != OMX_ErrorNone) { - LOGE("OMX_GetExtensionIndex failed"); - - return StatusFromOMXError(err); - } - - EnableAndroidNativeBuffersParams params = { - portIndex, enable, - }; - - err = OMX_SetParameter(mHandle, index, ¶ms); - - if (err != OMX_ErrorNone) { - LOGE("OMX_EnableAndroidNativeBuffers failed with error %d (0x%08x)", - err, err); - - return UNKNOWN_ERROR; - } - - return OK; -} - status_t OMXNodeInstance::useBuffer( OMX_U32 portIndex, const sp ¶ms, OMX::buffer_id *buffer) { @@ -312,54 +273,6 @@ status_t OMXNodeInstance::useBuffer( return OK; } -status_t OMXNodeInstance::useGraphicBuffer( - OMX_U32 portIndex, const sp& graphicBuffer, - OMX::buffer_id *buffer) { - Mutex::Autolock autoLock(mLock); - - OMX_INDEXTYPE index; - OMX_ERRORTYPE err = OMX_GetExtensionIndex( - mHandle, - const_cast("OMX.google.android.index.useAndroidNativeBuffer"), - &index); - - if (err != OMX_ErrorNone) { - LOGE("OMX_GetExtensionIndex failed"); - - return StatusFromOMXError(err); - } - - BufferMeta *bufferMeta = new BufferMeta(graphicBuffer); - - OMX_BUFFERHEADERTYPE *header; - - UseAndroidNativeBufferParams params = { - &header, portIndex, bufferMeta, graphicBuffer, - }; - - err = OMX_SetParameter(mHandle, index, ¶ms); - - if (err != OMX_ErrorNone) { - LOGE("OMX_UseAndroidNativeBuffer failed with error %d (0x%08x)", err, - err); - - delete bufferMeta; - bufferMeta = NULL; - - *buffer = 0; - - return UNKNOWN_ERROR; - } - - CHECK_EQ(header->pAppPrivate, bufferMeta); - - *buffer = header; - - addActiveBuffer(portIndex, *buffer); - - return OK; -} - status_t OMXNodeInstance::allocateBuffer( OMX_U32 portIndex, size_t size, OMX::buffer_id *buffer, void **buffer_data) { @@ -585,3 +498,4 @@ void OMXNodeInstance::freeActiveBuffers() { } } // namespace android + -- cgit v1.1