diff options
| author | James Dong <jdong@google.com> | 2010-03-30 14:21:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-30 14:21:49 -0700 |
| commit | 2fb88637de061d762ec8919c6adc3f6fd2f6f772 (patch) | |
| tree | d6f6e6fc52d96d133c19bb443cfe9f9ba3c6ff16 | |
| parent | fa5004571b65826f9245e49248fd8e83e8008d73 (diff) | |
| parent | 08fad4c7afc7afecf6bdfe44312b7281be292c4e (diff) | |
| download | omap3-2fb88637de061d762ec8919c6adc3f6fd2f6f772.tar.gz | |
am 08fad4c7: Don\'t handle input buffer in the OMX_StateLoaded state too. The input buffers have been returned while doing the state transition from OMX_StateExecuting to OMX_StateIdle. This is a similar fix for the one corresponding to output buffer (I7887c7b9)
Merge commit '08fad4c7afc7afecf6bdfe44312b7281be292c4e' into froyo-plus-aosp
* commit '08fad4c7afc7afecf6bdfe44312b7281be292c4e':
Don't handle input buffer in the OMX_StateLoaded state too.
| -rw-r--r-- | omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Thread.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Thread.c b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Thread.c index d2689c0..9c4b622 100644 --- a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Thread.c +++ b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Thread.c @@ -291,7 +291,8 @@ void* OMX_VIDENC_Thread (void* pThreadData) if ((FD_ISSET(pComponentPrivate->nFilled_iPipe[0], &rfds)) && (pComponentPrivate->eState != OMX_StatePause && - pComponentPrivate->eState != OMX_StateIdle)) + pComponentPrivate->eState != OMX_StateIdle && + pComponentPrivate->eState != OMX_StateLoaded)) { OMX_PRBUFFER1(pComponentPrivate->dbg, "Enters OMX_VIDENC_Process_FilledInBuf\n"); eError = OMX_VIDENC_Process_FilledInBuf(pComponentPrivate); @@ -309,8 +310,8 @@ void* OMX_VIDENC_Thread (void* pThreadData) if (FD_ISSET(pComponentPrivate->nFree_oPipe[0], &rfds) && (pComponentPrivate->eState!= OMX_StatePause && - pComponentPrivate->eState != OMX_StateIdle && - pComponentPrivate->eState != OMX_StateLoaded)) + pComponentPrivate->eState != OMX_StateIdle && + pComponentPrivate->eState != OMX_StateLoaded)) { OMX_PRBUFFER1(pComponentPrivate->dbg, "Enters OMX_VIDENC_Process_FreeOutBuf\n"); eError = OMX_VIDENC_Process_FreeOutBuf(pComponentPrivate); |