summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx/OMX.cpp
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2010-09-01 14:32:35 -0700
committerJamie Gennis <jgennis@google.com>2010-09-01 14:32:35 -0700
commit9f2d258645826c999a93a4206df157fec2e3b0f2 (patch)
tree02958abbfd19bf49e1235955bd20431cdd3b878e /media/libstagefright/omx/OMX.cpp
parent9dd4931cca8e4a2fcbcabf4eb7078648e1c029cd (diff)
downloadframeworks_av-9f2d258645826c999a93a4206df157fec2e3b0f2.zip
frameworks_av-9f2d258645826c999a93a4206df157fec2e3b0f2.tar.gz
frameworks_av-9f2d258645826c999a93a4206df157fec2e3b0f2.tar.bz2
Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""
This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
-rw-r--r--media/libstagefright/omx/OMX.cpp13
1 files changed, 1 insertions, 12 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
+