summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-10-19 21:14:13 -0700
committerJamie Gennis <jgennis@google.com>2011-10-19 21:22:19 -0700
commit6607b39baa05ee85a0857c3f95ff9224517b2abc (patch)
tree762f143a7abc692a1ef2f25d2356f1774e8bfab7 /include/media
parent5310a731eab664352044781d4b107b4837ea77ac (diff)
downloadframeworks_base-6607b39baa05ee85a0857c3f95ff9224517b2abc.zip
frameworks_base-6607b39baa05ee85a0857c3f95ff9224517b2abc.tar.gz
frameworks_base-6607b39baa05ee85a0857c3f95ff9224517b2abc.tar.bz2
Stagefright: idle OMX after ANW errors
This change fixes an issue in Stagefright where the state of an OMXCodec object can get out of sync with the state of the OMX component. In particular, if one of the ANativeWindow functions failed and put the OMXCodec into the ERROR state, this would cause Stagefright to skip doing the Executing -> Idle transition. Without this transition the freeBuffersOnPort call would never be made, and the MediaBuffers would end up being leaked (which would also leak the Gralloc buffers they reference). Bug: 5333695 Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
Diffstat (limited to 'include/media')
-rw-r--r--include/media/IOMX.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/IOMX.h b/include/media/IOMX.h
index 02ad703..c4cc947 100644
--- a/include/media/IOMX.h
+++ b/include/media/IOMX.h
@@ -78,6 +78,9 @@ public:
node_id node, OMX_INDEXTYPE index,
const void *params, size_t size) = 0;
+ virtual status_t getState(
+ node_id node, OMX_STATETYPE* state) = 0;
+
virtual status_t storeMetaDataInBuffers(
node_id node, OMX_U32 port_index, OMX_BOOL enable) = 0;