Remove excessive MP3 OMX logs

Originally from: https://partner.source.android.com/g/#change,1057
Modified the hardcoded constant to use the MACRO instead.

3 files changed, 12 insertions, 12 deletions

diff --git a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
index 96effbe..d10ff36 100644
--- a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
+++ b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
@@ -247,7 +247,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_);
 
 
 
@@ -261,7 +261,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_);
 
 #define MP3D_OMX_ERROR_EXIT(_e_, _c_, _s_)\
     _e_ = _c_;\
@@ -281,7 +281,7 @@
 
 #define MP3D_OMX_FREE(ptr) \
     if(NULL != ptr) { \
-        OMXDBG_PRINT(stderr, ERROR, 4, 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/mp3_dec/src/OMX_Mp3Dec_Utils.c b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_Utils.c
index d1655d1..c9c23fe 100644
--- a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_Utils.c
+++ b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_Utils.c
@@ -2505,7 +2505,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
                         pComponentPrivate->first_buff = 2;
                         pLcmlHdr->pBufHdr->nTimeStamp = pComponentPrivate->first_TS;
                         pComponentPrivate->temp_TS = pLcmlHdr->pBufHdr->nTimeStamp;
-                        OMX_ERROR4(pComponentPrivate->dbg, "first_ts = %lld\n",
+                        OMX_PRBUFFER1(pComponentPrivate->dbg, "first_ts = %lld\n",
                                    pComponentPrivate->temp_TS);
                     }else{ 
                         time_stmp = pLcmlHdr->pBufHdr->nFilledLen / (pComponentPrivate->pcmParams->nChannels * 
@@ -2514,7 +2514,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
                         /* Update time stamp information */
                         pComponentPrivate->temp_TS += time_stmp;
                         pLcmlHdr->pBufHdr->nTimeStamp = pComponentPrivate->temp_TS;
-                        OMX_ERROR4(pComponentPrivate->dbg, "out ts = %lld\n",
+                        OMX_PRBUFFER1(pComponentPrivate->dbg, "out ts = %lld\n",
                                    pComponentPrivate->temp_TS);
                     }
                 }
@@ -2563,7 +2563,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
         if(pComponentPrivate->codecStop_waitingsignal == 0){
             pComponentPrivate->codecStop_waitingsignal = 1;             
             pthread_cond_signal(&pComponentPrivate->codecStop_threshold);
-            OMX_ERROR4(pComponentPrivate->dbg, "stop ack. received. stop waiting for sending disable command completed\n");
+            OMX_ERROR2(pComponentPrivate->dbg, "stop ack. received. stop waiting for sending disable command completed\n");
         }
         pthread_mutex_unlock(&pComponentPrivate->codecStop_mutex);
         if (!pComponentPrivate->bNoIdleOnStop) {
@@ -2666,7 +2666,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
 #endif                  
                     pComponentPrivate->pOutputBufferList->pBufHdr[i]->nFilledLen = 0;
                     if(pComponentPrivate->lastout == pComponentPrivate->pOutputBufferList->pBufHdr[i]){
-                        OMX_ERROR4(pComponentPrivate->dbg, "Mark EOS on OUT buffer!\n");
+                        OMX_ERROR2(pComponentPrivate->dbg, "Mark EOS on OUT buffer!\n");
                         pComponentPrivate->pOutputBufferList->pBufHdr[i]->nFlags |= OMX_BUFFERFLAG_EOS;
                     }
                     OMX_ERROR2(pComponentPrivate->dbg, "FillBufferDone!\n");
@@ -2787,7 +2787,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
                     if(pComponentPrivate->codecFlush_waitingsignal == 0){
                         pComponentPrivate->codecFlush_waitingsignal = 1; 
                         pthread_cond_signal(&pComponentPrivate->codecFlush_threshold);
-                        OMX_ERROR4(pComponentPrivate->dbg, "flush ack. received. for input port\n");
+                        OMX_ERROR2(pComponentPrivate->dbg, "flush ack. received. for input port\n");
                     }     
                     pthread_mutex_unlock(&pComponentPrivate->codecFlush_mutex);
 
@@ -2829,7 +2829,7 @@ OMX_ERRORTYPE MP3DEC_LCML_Callback (TUsnCodecEvent event,void * args [10])
                     if(pComponentPrivate->codecFlush_waitingsignal == 0){
                         pComponentPrivate->codecFlush_waitingsignal = 1; 
                         pthread_cond_signal(&pComponentPrivate->codecFlush_threshold);
-                        OMX_ERROR4(pComponentPrivate->dbg, "flush ack. received. for output port\n");
+                        OMX_ERROR2(pComponentPrivate->dbg, "flush ack. received. for output port\n");
                     }     
                     pthread_mutex_unlock(&pComponentPrivate->codecFlush_mutex);
                     pComponentPrivate->cbInfo.EventHandler(pComponentPrivate->pHandle, 
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 6c31e17..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
@@ -1857,9 +1857,9 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent,
     OMX_BUFFERHEADERTYPE *pBufferHeader = NULL;
 
 
-    OMXDBG_PRINT(stderr, PRINT, 1, 0, ":: Entering AllocateBuffer\n");
     MP3D_OMX_CONF_CHECK_CMD(hComponent,1,1);
     pComponentPrivate = (MP3DEC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate);
+    OMX_PRINT1 (pComponentPrivate->dbg,"Entering AllocateBuffer\n");
     
 #ifdef _ERROR_PROPAGATION__
     if (pComponentPrivate->curState == OMX_StateInvalid){
@@ -2028,9 +2028,9 @@ static OMX_ERRORTYPE FreeBuffer(
     int outputIndex = -1;
     OMX_COMPONENTTYPE *pHandle;
 
-    OMXDBG_PRINT(stderr, PRINT, 1, 0, ":: Entering FreeBuffer\n");
 
     pComponentPrivate = (MP3DEC_COMPONENT_PRIVATE *) (((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate);
+    OMX_PRINT1(pComponentPrivate->dbg, ":: Entering FreeBuffer\n");
 
     pHandle = (OMX_COMPONENTTYPE *) pComponentPrivate->pHandle;
     OMX_PRINT2(pComponentPrivate->dbg, ":: pComponentPrivate = %p\n",pComponentPrivate);
@@ -2048,7 +2048,7 @@ static OMX_ERRORTYPE FreeBuffer(
     for (i=0; i < MP3D_MAX_NUM_OF_BUFS; i++) {
         buff = (OMX_U8 *)pComponentPrivate->pOutputBufferList->pBufHdr[i];
         if (buff == (OMX_U8 *)pBuffer) {
-            OMX_ERROR4(pComponentPrivate->dbg, "Found matching output buffer\n");
+            OMX_PRINT2(pComponentPrivate->dbg, "Found matching output buffer\n");
             OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p\n",buff);
             OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer);
             outputIndex = i;