Remove excessive AAC decoder OMX logs

Originally from: https://partner.source.android.com/g/#change,1109

3 files changed, 12 insertions, 17 deletions

diff --git a/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h b/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
index f4eae9a..cb234d6 100644
--- a/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
+++ b/omx/audio/src/openmax_il/aac_dec/inc/OMX_AacDec_Utils.h
@@ -285,7 +285,7 @@
         goto EXIT;                                                  \
     }                                                               \
     memset(_pStruct_,0,sizeof(_sName_));                            \
-    OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: Malloced = %p\n",__LINE__,_pStruct_);
+    OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: Malloced = %p\n",__LINE__,_pStruct_);
 
 /* ======================================================================= */
 /**
@@ -302,7 +302,7 @@
         goto EXIT;                                              \
     }                                                           \
     memset(_ptr_,0,_size_);                                     \
-    OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: Malloced = %p\n",__LINE__,_ptr_);
+    OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: Malloced = %p\n",__LINE__,_ptr_);
 
 /* ======================================================================= */
 /**
@@ -336,7 +336,7 @@
 /* ======================================================================= */
 #define AACDEC_OMX_FREE(ptr)                                            \
     if(NULL != ptr) {                                                   \
-        OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: Freeing Address = %p\n",__LINE__,ptr);   \
+        OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: Freeing Address = %p\n",__LINE__,ptr);   \
         newfree(ptr);                                                   \
         ptr = NULL;                                                     \
     }
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 ee3f3ba..2486d0d 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
@@ -1725,13 +1725,11 @@ OMX_U32 AACDEC_HandleCommand (AACDEC_COMPONENT_PRIVATE *pComponentPrivate)
             if (pComponentPrivate->nUnhandledFillThisBuffers == 0)  {
                 pComponentPrivate->bFlushOutputPortCommandPending = OMX_FALSE;
                 /*pComponentPrivate->first_buff = 0;*/
-                AACDEC_EPRINT("About to be Flushing output port\n");
                 if(pComponentPrivate->num_Op_Issued && !pComponentPrivate->reconfigOutputPort ){ //no buffers sent to DSP yet
                     aParam[0] = USN_STRMCMD_FLUSH;
                     aParam[1] = 0x1;
                     aParam[2] = 0x0;
 
-                    AACDEC_EPRINT("Flushing output port dsp\n");
                     if (pComponentPrivate->codecFlush_waitingsignal == 0){
                             pthread_mutex_lock(&pComponentPrivate->codecFlush_mutex);
                     }
@@ -1746,7 +1744,7 @@ OMX_U32 AACDEC_HandleCommand (AACDEC_COMPONENT_PRIVATE *pComponentPrivate)
                         goto EXIT;
                     }
                 }else{
-                    AACDEC_EPRINT("skipped dsp flush, Flushing output port\n");
+                    OMX_ERROR2(pComponentPrivate->dbg, "skipped dsp flush, Flushing output port\n");
 //force FillBufferDone calls on pending buffers
                     for (i=0; i < pComponentPrivate->nNumOutputBufPending; i++) {
 #ifdef __PERF_INSTRUMENTATION__
@@ -2178,7 +2176,7 @@ OMX_ERRORTYPE AACDEC_HandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader,
             if(!pComponentPrivate->framemode){
 	        if(pComponentPrivate->first_buff == 0){
 		    pComponentPrivate->first_TS = pBufHeader->nTimeStamp;
-                    OMXDBG_PRINT(stderr, PRINT, 2, 0, "in ts-%ld\n",pBufHeader->nTimeStamp);
+                    OMX_PRINT2(pComponentPrivate->dbg, "in ts-%ld\n",pBufHeader->nTimeStamp);
 		    pComponentPrivate->first_buff = 1;
 	        }
             }
@@ -2622,7 +2620,7 @@ OMX_ERRORTYPE AACDEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
                 pLcmlHdr->pBufHdr->nTimeStamp = pComponentPrivate->temp_TS;
 			}
             }
-                        OMXDBG_PRINT(stderr, PRINT, 2, 0, "out ts-%lld\n",pLcmlHdr->pBufHdr->nTimeStamp);
+            OMX_PRINT2 (pComponentPrivate->dbg, "out ts-%lld\n",pLcmlHdr->pBufHdr->nTimeStamp);
 
   			/*Copying tick count information to output buffer*/
               pLcmlHdr->pBufHdr->nTickCount = (OMX_U32)pComponentPrivate->arrBufIndexTick[pComponentPrivate->OpBufindex];
@@ -2706,7 +2704,7 @@ OMX_ERRORTYPE AACDEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
             }
             else
             {
-                OMXDBG_PRINT(stderr, PRINT, 1, 0, "OMX has returned all input and output buffers");
+                OMX_PRINT1(pComponentPrivate->dbg, "OMX has returned all input and output buffers");
             }
             if (pComponentPrivate->bPreempted == 0) {
                 pComponentPrivate->cbInfo.EventHandler(pComponentPrivate->pHandle,
@@ -3418,7 +3416,6 @@ int AACDec_GetSampleRateIndexL( const int aRate)
 int AACDec_GetSampleRatebyIndex( const int index)
 {
     int sample_rate = 0;
-    OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d::index:%d\n",__LINE__,index);
 
     switch( index ){
     case 0:
@@ -3458,11 +3455,10 @@ int AACDec_GetSampleRatebyIndex( const int index)
         sample_rate = 8000;
         break;
     default:
-        OMXDBG_PRINT(stderr, PRINT, 2, 0, "Invalid index\n");
+        OMXDBG_PRINT(stderr, PRINT, 2, 0, "Invalid index: %d\n", index);
         break;
     }
 
-    OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d:: sample_rate: %d\n",__LINE__,sample_rate);
     return sample_rate;
 }
 /* ========================================================================== */
@@ -3930,10 +3926,10 @@ void SignalIfAllBuffersAreReturned(AACDEC_COMPONENT_PRIVATE *pComponentPrivate)
             OMXDBG_PRINT(stderr, PRINT, 1, 0, "bufferReturned_mutex mutex lock error");
         }
         pthread_cond_broadcast(&bufferReturned_condition);
-        OMXDBG_PRINT(stderr, PRINT, 1, 0, "Sending pthread signal that OMX has returned all buffers to app");
+        OMX_PRINT1(pComponentPrivate->dbg, "Sending pthread signal that OMX has returned all buffers to app");
         if(pthread_mutex_unlock(&bufferReturned_mutex) != 0)
         {
-            OMXDBG_PRINT(stderr, PRINT, 1, 0, "bufferReturned_mutex mutex unlock error");
+            OMX_PRINT1(pComponentPrivate->dbg, "bufferReturned_mutex mutex unlock error");
         }
         return;
     }
diff --git a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDecoder.c b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDecoder.c
index c4849fa..b142ba1 100644
--- a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDecoder.c
+++ b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDecoder.c
@@ -199,7 +199,6 @@ static OMX_ERRORTYPE ComponentRoleEnum(OMX_IN OMX_HANDLETYPE hComponent,
 /*-------------------------------------------------------------------*/
 OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp)
 {
-    OMXDBG_PRINT(stderr, PRINT, 1, 0, "%s: IN", __FUNCTION__);
     OMX_ERRORTYPE eError = OMX_ErrorNone;
     OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE*) hComp;
     OMX_PARAM_PORTDEFINITIONTYPE *pPortDef_ip = NULL, *pPortDef_op = NULL;
@@ -698,7 +697,6 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp,
                                    OMX_INDEXTYPE nParamIndex,
                                    OMX_PTR ComponentParameterStructure)
 {
-    OMXDBG_PRINT(stderr, PRINT, 1, 0,"%d :: Entering OMX_GetParameter\n", __LINE__);
     OMX_ERRORTYPE eError = OMX_ErrorNone;
     AACDEC_COMPONENT_PRIVATE  *pComponentPrivate;
     OMX_PARAM_PORTDEFINITIONTYPE *pParameterStructure;
@@ -706,6 +704,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp,
     
     AACDEC_OMX_CONF_CHECK_CMD(hComp,1,1)
         pComponentPrivate = (AACDEC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate);
+    OMX_PRINT1 (pComponentPrivate->dbg, "%d :: Entering OMX_GetParameter\n", __LINE__);
     AACDEC_OMX_CONF_CHECK_CMD(pComponentPrivate, ComponentParameterStructure, 1)
     if (ComponentParameterStructure == NULL) {
         eError = OMX_ErrorBadParameter;
@@ -1701,7 +1700,7 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle)
     PERF_Done(pComponentPrivate->pPERF);
 #endif
     
-    OMXDBG_PRINT(stderr, BUFFER, 2, 0, ":: Freeing: pComponentPrivate = %p\n",pComponentPrivate);
+    OMX_PRBUFFER2(dbg, ":: Freeing: pComponentPrivate = %p\n",pComponentPrivate);
     OMX_PRINT1(dbg, "::*********** ComponentDeinit is Done************** \n");
     OMX_DBG_CLOSE(dbg);
     AACDEC_OMX_FREE(pComponentPrivate);