diff options
author | Benny Wong <Benny.Wong@motorola.com> | 2009-09-16 18:06:43 -0500 |
---|---|---|
committer | James Dong <jdong@google.com> | 2009-09-16 20:50:59 -0700 |
commit | 4e501478686a1b42da255e58d95494710f9d5c9c (patch) | |
tree | 7bdb7faa6183d52000e343879edfd163e445174b /omx | |
parent | e69806a6a44fd9113ec790ca57da67f40906e066 (diff) | |
download | omap3-4e501478686a1b42da255e58d95494710f9d5c9c.tar.gz |
Fixes a hang video decoder OMX component during mediaframeworktest.
The hang happens when a reset command (state transiton from executing
-> idle) is issue while a port reconfiguration is going on.
Originally from: https://partner.source.android.com/g/#change,1073
Fixed a missing open brace and coding style.
Diffstat (limited to 'omx')
-rw-r--r-- | omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c index a4b3dd8..0645b4e 100644 --- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c +++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c @@ -2657,6 +2657,10 @@ OMX_ERRORTYPE VIDDEC_HandleCommand (OMX_HANDLETYPE phandle, OMX_U32 nParam1) } else if (pComponentPrivate->eState == OMX_StateExecuting || pComponentPrivate->eState == OMX_StatePause) { /*Set the bIsStopping bit*/ + if (pComponentPrivate->bDynamicConfigurationInProgress == OMX_TRUE) { + pComponentPrivate->bDynamicConfigurationInProgress = OMX_FALSE; + OMX_PRSTATE1(pComponentPrivate->dbg, "We were doing DynamicConfiguration, canceling it. %d \n",pComponentPrivate->bDynamicConfigurationInProgress); + } pComponentPrivate->bIsStopping = 1; OMX_PRSTATE1(pComponentPrivate->dbg, "bIsStopping 0x%lx\n",pComponentPrivate->bIsStopping); OMX_PRSTATE1(pComponentPrivate->dbg, "eExecuteToIdle 0x%x\n",pComponentPrivate->eExecuteToIdle); |