diff options
author | Jamie Gennis <jgennis@google.com> | 2011-10-19 21:14:13 -0700 |
---|---|---|
committer | Jamie Gennis <jgennis@google.com> | 2011-10-19 21:22:19 -0700 |
commit | b1d666f5cb555d135eb69e005e88a03330bbb54c (patch) | |
tree | 573c9d484c210cfc7104d94f2f630cae0b70bb01 /media/libstagefright/omx/OMX.cpp | |
parent | 3c57859f03ce9257128e3b2cd29a906b8f9a6aa5 (diff) | |
download | frameworks_av-b1d666f5cb555d135eb69e005e88a03330bbb54c.zip frameworks_av-b1d666f5cb555d135eb69e005e88a03330bbb54c.tar.gz frameworks_av-b1d666f5cb555d135eb69e005e88a03330bbb54c.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 'media/libstagefright/omx/OMX.cpp')
-rw-r--r-- | media/libstagefright/omx/OMX.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 33d3f30..3715fe9 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -303,6 +303,12 @@ status_t OMX::setConfig( index, params, size); } +status_t OMX::getState( + node_id node, OMX_STATETYPE* state) { + return findInstance(node)->getState( + state); +} + status_t OMX::enableGraphicBuffers( node_id node, OMX_U32 port_index, OMX_BOOL enable) { return findInstance(node)->enableGraphicBuffers(port_index, enable); |