Revert "Abort Assert Exit Rework"

This reverts commit 9961abce63e3f897758a99cc2e060cb68c484803.

20 files changed, 50 insertions, 67 deletions

diff --git a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
index 88e21da..aad1e66 100644
--- a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
+++ b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c
@@ -154,8 +154,7 @@ void* AACDEC_ComponentThread (void* pThreadData)
                                                     OMX_ErrorHardware, 
                                                     OMX_TI_ErrorSevere,
                                                     "Error from COmponent Thread in select");
-            eError = OMX_ErrorHardware;
-            break;
+            goto EXIT;
             
         } 
         else if (FD_ISSET (pComponentPrivate->cmdPipe[0], &rfds)) {
@@ -212,5 +211,5 @@ void* AACDEC_ComponentThread (void* pThreadData)
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
     OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting ComponentThread \n",__LINE__);
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_Utils.c b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_Utils.c
index 8f248d2..d3c2eb2 100644
--- a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_Utils.c
+++ b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_Utils.c
@@ -3792,6 +3792,7 @@ void * mymalloc(int line, char *s, int size)
     p = malloc(size);
     if(p==NULL){
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+        exit(1);
     }
     else{
         while((lines[e]!=0)&& (e<500) ){
@@ -3802,8 +3803,8 @@ void * mymalloc(int line, char *s, int size)
         bytes[e]=size;
         strcpy(file[e],s);
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Allocating %d bytes on address %p, line %d file %s pos %d\n", size, p, line, s, e);
-   }
-    return p;
+        return p;
+    }
 
 }
 
diff --git a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_CompThread.c b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_CompThread.c
index a96ca86..91354fb 100644
--- a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_CompThread.c
+++ b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_CompThread.c
@@ -158,8 +158,7 @@ void* ComponentThread (void* pThreadData)
                                                     OMX_ErrorHardware,
                                                     OMX_TI_ErrorSevere,
                                                     "Error from Component Thread in select");
-            eError = OMX_ErrorHardware;
-            break;
+            exit(1);
 
         } 
 
@@ -245,6 +244,6 @@ EXIT:
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
     OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting ComponentThread\n", __LINE__);
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
 
diff --git a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_Utils.c b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_Utils.c
index 0569051..2024e82 100644
--- a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_Utils.c
+++ b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEnc_Utils.c
@@ -3334,6 +3334,7 @@ void* mymalloc(int line, char *s, int size)
    p = malloc(size);
    if(p==NULL){
        OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+       exit(1);
        }
    else{
          while((lines[e]!=0)&& (e<500) ){
@@ -3344,8 +3345,9 @@ void* mymalloc(int line, char *s, int size)
          bytes[e]=size;
          strcpy(file[e],s);
          OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Allocating %d bytes on address %p, line %d file %s pos %d\n", size, p, line, s, e);
-  }
-   return p;
+         return p;
+   }
+
 }
 
  /* ========================================================================== */
diff --git a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
index 4dd9760..234b6a8 100644
--- a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
+++ b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c
@@ -164,8 +164,7 @@ void* MP3DEC_ComponentThread (void* pThreadData)
                                                     OMX_ErrorInsufficientResources, 
                                                     OMX_TI_ErrorSevere,
                                                     "Error from COmponent Thread in select");
-            eError = OMX_ErrorInsufficientResources; 
-            break;
+            goto EXIT;
 
         } else if ((FD_ISSET (pComponentPrivate->dataPipe[0], &rfds))) {
             int ret;
@@ -187,8 +186,10 @@ void* MP3DEC_ComponentThread (void* pThreadData)
             nRet = MP3DEC_HandleCommand (pComponentPrivate);
             if (nRet == EXIT_COMPONENT_THRD) {
                 OMX_PRDSP2(pComponentPrivate->dbg, "Exiting from Component thread\n");
+                OMX_PRDSP2(pComponentPrivate->dbg, "Exiting from Component thread\n");
                 MP3DEC_CleanupInitParams(pHandle);
                 OMX_PRSTATE2(pComponentPrivate->dbg, "****************** Component State Set to Loaded\n\n");
+                OMX_PRSTATE2(pComponentPrivate->dbg, "****************** Component State Set to Loaded\n\n");
 
                 pComponentPrivate->curState = OMX_StateLoaded;
 #ifdef __PERF_INSTRUMENTATION__
@@ -221,5 +222,6 @@ EXIT:
 #endif
 
     OMX_PRINT1(pComponentPrivate->dbg, ":: Exiting ComponentThread \n");
-    return (void*)eError;
+    OMX_PRINT1(pComponentPrivate->dbg, ":: Exiting ComponentThread \n");
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Decoder.c b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Decoder.c
index f37a26f..43ff250 100644
--- a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Decoder.c
+++ b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Decoder.c
@@ -2501,6 +2501,7 @@ void * mymalloc(int line, char *s, int size)
    p = malloc(size);
    if(p==NULL){
        OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+       exit(1);
        }
    else{
          while((lines[e]!=0)&& (e<500) ){
@@ -2511,8 +2512,8 @@ void * mymalloc(int line, char *s, int size)
          bytes[e]=size;
          strcpy(file[e],s);
          OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Allocating %d bytes on address %p, line %d file %s pos %d\n", size, p, line, s, e);
+         return p;
    }
-   return p;
 }
 
 int myfree(void *dp, int line, char *s){
diff --git a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_ComponentThread.c b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_ComponentThread.c
index 55147ba..b7f4f59 100644
--- a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_ComponentThread.c
+++ b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_ComponentThread.c
@@ -153,8 +153,8 @@ void* NBAMRDEC_ComponentThread (void* pThreadData)
                                                     OMX_ErrorInsufficientResources,
                                                     OMX_TI_ErrorSevere,
                                                     "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
+
         }
         else if (FD_ISSET (pComponentPrivate->dataPipe[0], &rfds)) {
             OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: OMX_AmrDec_ComponentThread.c :: DATA pipe is set in Component Thread\n",__LINE__);
@@ -212,5 +212,5 @@ EXIT:
 #endif
 
     OMX_PRINT1(pComponentPrivate->dbg, "%d :: OMX_AmrDec_ComponentThread.c :: Exiting ComponentThread\n",__LINE__);
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c
index 85e3f89..f7c904e 100755
--- a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c
+++ b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c
@@ -2336,6 +2336,7 @@ void * mymalloc(int line, char *s, int size)
    p = malloc(size);
    if(p==NULL){
        OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not  available\n");
+       exit(1);
        }
    else{
          while((lines[e]!=0)&& (e<500) ){
@@ -2346,8 +2347,8 @@ void * mymalloc(int line, char *s, int size)
          bytes[e]=size;
          strcpy(file[e],s);
          OMXDBG_PRINT(stderr, ERROR, 4, 0, "Allocating %d bytes on address %p, line %d file %s\n", size, p, line, s);
+         return p;
    }
-   return p;
 }
 
 int myfree(void *dp, int line, char *s){
diff --git a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_ComponentThread.c b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_ComponentThread.c
index 7959897..4ae4d7e 100644
--- a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_ComponentThread.c
+++ b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_ComponentThread.c
@@ -165,8 +165,7 @@ void* NBAMRENC_CompThread(void* pThreadData)
                                                      OMX_ErrorInsufficientResources,
                                                      OMX_TI_ErrorSevere,
                                                      "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
 
         } else if ((FD_ISSET (pComponentPrivate->dataPipe[0], &rfds))
                    && (pComponentPrivate->curState != OMX_StatePause)) {
@@ -228,5 +227,5 @@ EXIT:
 #ifdef __PERF_INSTRUMENTATION__
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_Utils.c b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_Utils.c
index 41b5ba5..3dfeed6 100644
--- a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_Utils.c
+++ b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEnc_Utils.c
@@ -115,6 +115,7 @@ void * mymalloc(int line, char *s, int size)
    p = calloc(1,size);
    if(p==NULL){
        OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+       exit(1);
        }
    else{
          while((lines[e]!=0)&& (e<500) ){
@@ -125,8 +126,8 @@ void * mymalloc(int line, char *s, int size)
          bytes[e]=size;
          strcpy(file[e],s);
          OMXDBG_PRINT(stderr, ERROR, 4, 0, "Allocating %d bytes on address %p, line %d file %s\n", size, p, line, s);
+         return p;
    }
-   return p;
 }
 
 int myfree(void *dp, int line, char *s){
diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
index ec60ea2..acdba1a 100644
--- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
+++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c
@@ -161,8 +161,7 @@ void* WBAMR_DEC_ComponentThread (void* pThreadData)
                                                     OMX_ErrorInsufficientResources,
                                                     OMX_TI_ErrorSevere,
                                                     "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
 
         } else if (FD_ISSET (pComponentPrivate->dataPipe[0], &rfds)) {
             OMX_PRCOMM2(pComponentPrivate->dbg, "DATA pipe is set in Component Thread\n");
@@ -220,5 +219,5 @@ void* WBAMR_DEC_ComponentThread (void* pThreadData)
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
     OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n");
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c
index bfb7165..16f738e 100755
--- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c
+++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c
@@ -2150,6 +2150,7 @@ void * mymalloc(int line, char *s, int size)
     p = malloc(size);
     if(p==NULL){
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+        exit(1);
     }
     else{
         while((lines[e]!=0)&& (e<500) ){
@@ -2160,8 +2161,8 @@ void * mymalloc(int line, char *s, int size)
         bytes[e]=size;
         strcpy(file[e],s);
         OMXDBG_PRINT(stderr, PRINT, 1, 0, "Allocating %d bytes on address %p, line %d file %s\n", size, p, line, s);
+        return p;
     }
-    return p;
 }
 
 int myfree(void *dp, int line, char *s){
diff --git a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_CompThread.c b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_CompThread.c
index 2ddf6a0..e62e59d 100644
--- a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_CompThread.c
+++ b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_CompThread.c
@@ -157,8 +157,7 @@ void* WBAMRENC_CompThread(void* pThreadData)
                                                      OMX_ErrorInsufficientResources,
                                                      OMX_TI_ErrorSevere,
                                                      "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources; 
-            break;
+            exit(1);
         } 
         else if ((FD_ISSET (pComponentPrivate->dataPipe[0], &rfds))) {
             OMX_PRCOMM2(pComponentPrivate->dbg, "DATA pipe is set in Component Thread\n");
@@ -224,6 +223,6 @@ void* WBAMRENC_CompThread(void* pThreadData)
 
     OMX_PRINT1(pComponentPrivate->dbg, "Exiting WBAMRENC_CompThread\n");
     OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError);
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
 
diff --git a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_Utils.c b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_Utils.c
index be5a741..3fac41e 100644
--- a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_Utils.c
+++ b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEnc_Utils.c
@@ -107,6 +107,7 @@ void * mymalloc(int line, char *s, int size)
     p = calloc(1,size);
     if(p==NULL){
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+        exit(1);
     }
     else{
         while((lines[e]!=0)&& (e<500) ){
@@ -117,8 +118,8 @@ void * mymalloc(int line, char *s, int size)
         bytes[e]=size;
         strcpy(file[e],s);
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Allocating %d bytes on address %p, line %d file %s\n", size, p, line, s);
+        return p;
     }
-    return p;
 }
 
 int myfree(void *dp, int line, char *s){
diff --git a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_ComponentThread.c b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_ComponentThread.c
index 51b8920..b8767a4 100644
--- a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_ComponentThread.c
+++ b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_ComponentThread.c
@@ -154,8 +154,7 @@ OMX_PRDSP2(pComponentPrivate->dbg, "PERF%d :: OMX_WmaDec_ComponentThread.c\n",__
                                                      OMX_ErrorInsufficientResources,
                                                      0,
                                                      "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
 
         } 
         else if (FD_ISSET (pComponentPrivate->dataPipe[0], &rfds)) {
@@ -226,5 +225,5 @@ EXIT:
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
     OMX_PRINT1(pComponentPrivate->dbg, "%d::Exiting ComponentThread\n",__LINE__);
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
diff --git a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDecoder.c b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDecoder.c
index ae7ab0e..48d40ea 100644
--- a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDecoder.c
+++ b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDecoder.c
@@ -2284,6 +2284,7 @@ void * mymalloc(int line, char *s, int size)
     p = malloc(size);
     if(p==NULL){
         OMXDBG_PRINT(stderr, ERROR, 4, 0, "Memory not available\n");
+        exit(1);
     }
     else{
         while((lines[e]!=0)&& (e<500) ){
@@ -2294,8 +2295,8 @@ void * mymalloc(int line, char *s, int size)
         bytes[e]=size;
         strcpy(file[e],s);
         OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Allocating %d bytes on address %p, line %d file %s pos %d\n", size, p, line, s, e);
+        return p;
     }
-    return p;
 }
 
 int myfree(void *dp, int line, char *s){
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 bd3e6c8..36ef92d 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,7 +129,6 @@ void* OMX_JpegDec_Thread (void* pThreadData)
                                                    OMX_ErrorInsufficientResources,
                                                    OMX_TI_ErrorSevere,
                                                    "Error from COmponent Thread in select");
-            eError = OMX_ErrorInsufficientResources;
             goto EXIT;
         }
         else {
@@ -255,7 +254,7 @@ EXIT:
 #ifdef __PERF_INSTRUMENTATION__
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
-    return(void*)eError;
+    return(void*)OMX_ErrorNone;
 
 }
 
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 813596f..e50a556 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,8 +149,7 @@ 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");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
 
         } else {
             if ( (FD_ISSET (pComponentPrivate->filled_inpBuf_Q[0], &rfds))
diff --git a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
index da28c8b..4bbeb27 100644
--- a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
+++ b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c
@@ -55,6 +55,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <assert.h>
 #include "usn.h"
 #include <sys/time.h>
 
@@ -206,11 +207,7 @@ static OMX_ERRORTYPE InitMMCodecEx(OMX_HANDLETYPE hInt,
 
     LCML_DPRINT("%d :: InitMMCodecEx application\n", __LINE__);
 
-    if (hInt == NULL )
-    {
-        eError = OMX_ErrorInsufficientResources;
-        goto ERROR;
-    }
+    assert(hInt != NULL);
     if(Args ==NULL)
     {
         InitMMCodec(hInt, codecName, toCodecInitParams, fromCodecInfoStruct, pCallbacks);
@@ -541,13 +538,7 @@ static OMX_ERRORTYPE InitMMCodec(OMX_HANDLETYPE hInt,
 
     LCML_DPRINT("%d :: InitMMCodec application\n",__LINE__);
 
-    if (hInt == NULL )
-    {
-        eError = OMX_ErrorInsufficientResources;
-        goto ERROR;
-    }
-
-
+    assert(hInt != NULL);
 
     phandle = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)hInt)->pCodec);
 #ifdef __PERF_INSTRUMENTATION__
@@ -861,11 +852,7 @@ static OMX_ERRORTYPE QueueBuffer (OMX_HANDLETYPE hComponent,
 
     LCML_DPRINT("%d :: QueueBuffer application\n",__LINE__);
 
-    if (hComponent !=NULL)
-    {
-        eError = OMX_ErrorInsufficientResources;
-        goto EXIT;
-    }
+    assert(hComponent !=NULL);
 
     phandle = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)hComponent)->pCodec);
 
@@ -1056,12 +1043,7 @@ static OMX_ERRORTYPE ControlCodec(OMX_HANDLETYPE hComponent,
     OMX_ERRORTYPE eError = OMX_ErrorNone;
 
     LCML_DPRINT("%d :: ControlCodec application\n",__LINE__);
-    if (hComponent == NULL )
-    {
-        eError= OMX_ErrorInsufficientResources;
-        goto EXIT;
-    }
-
+    assert( hComponent !=NULL);
     phandle = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)hComponent)->pCodec);
 
 #ifdef __PERF_INSTRUMENTATION__
diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Thread.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Thread.c
index 7cfcf4b..093fb2b 100644
--- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Thread.c
+++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Thread.c
@@ -190,8 +190,7 @@ void* OMX_VidDec_Thread (void* pThreadData)
                                                    OMX_ErrorInsufficientResources, 
                                                    OMX_TI_ErrorSevere,
                                                    "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
         }
         else {
             if (FD_ISSET(pComponentPrivate->cmdPipe[VIDDEC_PIPE_READ], &rfds)) {
@@ -358,7 +357,7 @@ void* OMX_VidDec_Thread (void* pThreadData)
     PERF_Done(pComponentPrivate->pPERFcomp);
 #endif
 
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }
 
 void* OMX_VidDec_Return (void* pThreadData)
@@ -435,8 +434,7 @@ void* OMX_VidDec_Return (void* pThreadData)
                                                    OMX_ErrorInsufficientResources, 
                                                    OMX_TI_ErrorSevere,
                                                    "Error from Component Thread in select");
-            eError = OMX_ErrorInsufficientResources;
-            break;
+            exit(1);
         } 
         else {
             if (FD_ISSET(pComponentPrivate->filled_outBuf_Q[VIDDEC_PIPE_READ], &rfds)) {
@@ -499,6 +497,6 @@ void* OMX_VidDec_Return (void* pThreadData)
     }
     
     pComponentPrivate->bPipeCleaned = OMX_TRUE;
-    return (void*)eError;
+    return (void*)OMX_ErrorNone;
 }