Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""

This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing
changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.

2 files changed, 2 insertions, 99 deletions

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<IMemory> &params,
         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> &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 <OMX_Component.h>
 
 #include <binder/IMemory.h>
-#include <media/stagefright/HardwareAPI.h>
 #include <media/stagefright/MediaDebug.h>
 #include <media/stagefright/MediaErrors.h>
 
@@ -41,11 +40,6 @@ struct BufferMeta {
           mIsBackup(false) {
     }
 
-    BufferMeta(const sp<GraphicBuffer> &graphicBuffer)
-        : mGraphicBuffer(graphicBuffer),
-          mIsBackup(false) {
-    }
-
     void CopyFromOMX(const OMX_BUFFERHEADERTYPE *header) {
         if (!mIsBackup) {
             return;
@@ -67,7 +61,6 @@ struct BufferMeta {
     }
 
 private:
-    sp<GraphicBuffer> mGraphicBuffer;
     sp<IMemory> 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_STRING>("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, &params);
-
-    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<IMemory> &params,
         OMX::buffer_id *buffer) {
@@ -312,54 +273,6 @@ status_t OMXNodeInstance::useBuffer(
     return OK;
 }
 
-status_t OMXNodeInstance::useGraphicBuffer(
-        OMX_U32 portIndex, const sp<GraphicBuffer>& graphicBuffer,
-        OMX::buffer_id *buffer) {
-    Mutex::Autolock autoLock(mLock);
-
-    OMX_INDEXTYPE index;
-    OMX_ERRORTYPE err = OMX_GetExtensionIndex(
-            mHandle,
-            const_cast<OMX_STRING>("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, &params);
-
-    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
+