diff options
| author | venkatesh <venkateshv@ti.com> | 2009-09-27 20:44:16 -0500 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2009-09-28 09:49:38 -0700 |
| commit | 9961abce63e3f897758a99cc2e060cb68c484803 (patch) | |
| tree | 0b7387772de0c2338eb1e1cebead35767a79948b /omx/image | |
| parent | 4d8335b2f7066dcde0bd27ca066be1226cac43fa (diff) | |
| download | omap3-9961abce63e3f897758a99cc2e060cb68c484803.tar.gz | |
Abort Assert Exit Rework
Originally from: https://partner.source.android.com/g/#change,1177
Fixed assert that has missed in the original patch.
Diffstat (limited to 'omx/image')
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c | 3 | ||||
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c b/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c index 36ef92d..bd3e6c8 100644 --- a/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c +++ b/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c @@ -129,6 +129,7 @@ void* OMX_JpegDec_Thread (void* pThreadData) OMX_ErrorInsufficientResources, OMX_TI_ErrorSevere, "Error from COmponent Thread in select"); + eError = OMX_ErrorInsufficientResources; goto EXIT; } else { @@ -254,7 +255,7 @@ EXIT: #ifdef __PERF_INSTRUMENTATION__ PERF_Done(pComponentPrivate->pPERFcomp); #endif - return(void*)OMX_ErrorNone; + return(void*)eError; } diff --git a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c index e50a556..813596f 100644 --- a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c +++ b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c @@ -149,7 +149,8 @@ void* OMX_JpegEnc_Thread (void* pThreadData) pComponentPrivate->cbInfo.EventHandler (pComponentPrivate->pHandle, pComponentPrivate->pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorInsufficientResources, OMX_TI_ErrorSevere, "Error from COmponent Thread in select"); - exit(1); + eError = OMX_ErrorInsufficientResources; + break; } else { if ( (FD_ISSET (pComponentPrivate->filled_inpBuf_Q[0], &rfds)) |