diff options
| author | Benny Wong <Benny.Wong@motorola.com> | 2009-09-28 22:52:18 -0500 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2009-09-28 23:41:42 -0700 |
| commit | 00f4c8bed7990ebaff8e20bd13b5dbdacbe22c29 (patch) | |
| tree | 3a151f3e57b2eaa74f6b8c8181dd2fdad8225270 /omx | |
| parent | c22b4b5a6da81c52ed4aca4e0c9fec348d5f0adc (diff) | |
| download | omap3-00f4c8bed7990ebaff8e20bd13b5dbdacbe22c29.tar.gz | |
Rm excess OMX logs AACe NBAMRd-e WBAMRd-e WMAd
Originally from: https://partner.source.android.com/g/#change,1135
Diffstat (limited to 'omx')
22 files changed, 653 insertions, 724 deletions
diff --git a/omx/audio/src/openmax_il/aac_enc/inc/OMX_AacEnc_Utils.h b/omx/audio/src/openmax_il/aac_enc/inc/OMX_AacEnc_Utils.h index 41cbfe6..c4ac3cc 100644 --- a/omx/audio/src/openmax_il/aac_enc/inc/OMX_AacEnc_Utils.h +++ b/omx/audio/src/openmax_il/aac_enc/inc/OMX_AacEnc_Utils.h @@ -101,14 +101,14 @@ #define OMX_MEMFREE_STRUCT(_pStruct_)\ - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: FREEING MEMORY = %p\n",__LINE__,_pStruct_);\ + OMXDBG_PRINT(stderr, PRINT, 2, OMX_DBG_BASEMASK, "%d :: FREEING MEMORY = %p\n",__LINE__,_pStruct_);\ if(_pStruct_ != NULL){\ newfree(_pStruct_);\ _pStruct_ = NULL;\ } #define OMX_CLOSE_PIPE(_pStruct_,err)\ - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: CLOSING PIPE \n",__LINE__);\ + OMXDBG_PRINT(stderr, PRINT, 2, OMX_DBG_BASEMASK, "%d :: CLOSING PIPE \n",__LINE__);\ err = close (_pStruct_);\ if(0 != err && OMX_ErrorNone == eError){\ eError = OMX_ErrorHardware;\ 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..539b52a 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 @@ -125,9 +125,9 @@ void* ComponentThread (void* pThreadData) if (status == 0) { - OMX_ERROR4(pComponentPrivate->dbg, "%d : bIsStopping = %ld\n",__LINE__, pComponentPrivate->bIsStopping); - OMX_ERROR4(pComponentPrivate->dbg, "%d : lcml_nOpBuf = %ld\n",__LINE__, pComponentPrivate->lcml_nOpBuf); - OMX_ERROR4(pComponentPrivate->dbg, "%d : lcml_nIpBuf = %ld\n",__LINE__, pComponentPrivate->lcml_nIpBuf); + OMX_ERROR2(pComponentPrivate->dbg, "%d : bIsStopping = %ld\n",__LINE__, pComponentPrivate->bIsStopping); + OMX_ERROR2(pComponentPrivate->dbg, "%d : lcml_nOpBuf = %ld\n",__LINE__, pComponentPrivate->lcml_nOpBuf); + OMX_ERROR2(pComponentPrivate->dbg, "%d : lcml_nIpBuf = %ld\n",__LINE__, pComponentPrivate->lcml_nIpBuf); if (pComponentPrivate->bIsThreadstop == 1) { @@ -148,7 +148,7 @@ void* ComponentThread (void* pThreadData) goto EXIT; } } - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Component Time Out !!!!! \n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Component Time Out !!!!! \n",__LINE__); } else if(status == -1) { 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..a8e1224 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 @@ -2530,7 +2530,7 @@ pHandle = pComponentPrivate_CC->pHandle; if(pComponentPrivate_CC->codecStop_waitingsignal == 0){ pComponentPrivate_CC->codecStop_waitingsignal = 1; pthread_cond_signal(&pComponentPrivate_CC->codecStop_threshold); - OMX_ERROR4(pComponentPrivate_CC->dbg, "stop ack. received. stop waiting for sending disable command completed\n"); + OMX_ERROR2(pComponentPrivate_CC->dbg, "stop ack. received. stop waiting for sending disable command completed\n"); } pthread_mutex_unlock(&pComponentPrivate_CC->codecStop_mutex); @@ -3262,7 +3262,6 @@ OMX_ERRORTYPE AACENCWriteConfigHeader(AACENC_COMPONENT_PRIVATE *pComponentPrivat int AACEnc_GetSampleRateIndexL( const int aRate) { int index = 0; - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d::aRate:%d\n",__LINE__,aRate); switch( aRate ){ case 96000: @@ -3302,11 +3301,9 @@ int AACEnc_GetSampleRateIndexL( const int aRate) index = 11; break; default: - OMXDBG_PRINT(stderr, PRINT, 2, 0, "Invalid sampling frequency\n"); break; } - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d::index:%d\n",__LINE__,index); return index; } diff --git a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEncoder.c b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEncoder.c index 7df0234..8962cb2 100644 --- a/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEncoder.c +++ b/omx/audio/src/openmax_il/aac_enc/src/OMX_AacEncoder.c @@ -196,7 +196,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) OMX_MALLOC_STRUCT(pHandle->pComponentPrivate, AACENC_COMPONENT_PRIVATE); ((AACENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->pHandle = pHandle; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "AACENC: pComponentPrivate %p \n",pHandle->pComponentPrivate); /* Initialize component data structures to default values */ ((AACENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->sPortParam.nPorts = 0x2; @@ -206,9 +205,7 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) /* ---------start of OMX_AUDIO_PARAM_AACPROFILETYPE --------- */ OMX_MALLOC_STRUCT(aac_ip, OMX_AUDIO_PARAM_AACPROFILETYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "AACENC: aac_ip %p \n", aac_ip); OMX_MALLOC_STRUCT(aac_op, OMX_AUDIO_PARAM_AACPROFILETYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "AACENC: aac_op %p \n",aac_op); ((AACENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->aacParams[INPUT_PORT] = aac_ip; ((AACENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->aacParams[OUTPUT_PORT] = aac_op; @@ -230,12 +227,8 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) /* ---------start of OMX_AUDIO_PARAM_PCMMODETYPE --------- */ OMX_MALLOC_STRUCT(aac_pcm_ip, OMX_AUDIO_PARAM_PCMMODETYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "AACENC: aac_pcm_ip %p \n ",aac_pcm_ip); OMX_MALLOC_STRUCT(aac_pcm_op, OMX_AUDIO_PARAM_PCMMODETYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: AACENC: %p\n",__LINE__,aac_pcm_op); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "AACENC: aac_pcm_op%p \n ",aac_pcm_op); - aac_pcm_ip->nSize = sizeof(OMX_AUDIO_PARAM_PCMMODETYPE); aac_pcm_ip->nBitPerSample = 16; /*Will be remapped for SN. 16:2, 24:3*/ aac_pcm_ip->nPortIndex = 0; @@ -759,9 +752,8 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, OMX_INDEXTYPE nParamInd AACENC_COMPONENT_PRIVATE *pComponentPrivate = NULL; OMX_PARAM_PORTDEFINITIONTYPE *pParameterStructure = NULL; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: AACENC: Entering GetParameter\n", __LINE__); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: AACENC: Inside the GetParameter nParamIndex = %x\n",__LINE__, nParamIndex); pComponentPrivate = (AACENC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: AACENC: Entering GetParameter\n", __LINE__); pParameterStructure = (OMX_PARAM_PORTDEFINITIONTYPE*)ComponentParameterStructure; if (pParameterStructure == NULL) @@ -1378,18 +1370,19 @@ static OMX_ERRORTYPE GetState (OMX_HANDLETYPE pComponent, OMX_STATETYPE* pState) OMX_ERRORTYPE eError = OMX_ErrorUndefined; OMX_CONF_CHECK_CMD(pComponent,1,1); OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE *)pComponent; + AACENC_COMPONENT_PRIVATE *pComponentPrivate = (AACENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: AACENC: Entering GetState\n", __LINE__); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: AACENC: Entering GetState\n", __LINE__); if (!pState) { eError = OMX_ErrorBadParameter; - OMXDBG_PRINT(stderr, ERROR, 4, 0, "%d :: Error: About to return OMX_ErrorBadParameter \n",__LINE__); + OMX_ERROR4 (pComponentPrivate->dbg, "%d :: Error: About to return OMX_ErrorBadParameter \n",__LINE__); goto EXIT; } - if (pHandle && pHandle->pComponentPrivate) + if (pHandle && pComponentPrivate) { - *pState = ((AACENC_COMPONENT_PRIVATE*)pHandle->pComponentPrivate)->curState; + *pState = pComponentPrivate->curState; } else { @@ -1398,7 +1391,7 @@ static OMX_ERRORTYPE GetState (OMX_HANDLETYPE pComponent, OMX_STATETYPE* pState) eError = OMX_ErrorNone; EXIT: - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: AACENC: Exiting GetState\n", __LINE__); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: AACENC: Exiting GetState\n", __LINE__); return eError; } @@ -1768,11 +1761,9 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, OMX_BUFFERHEADERTYPE *pBufferHeader = NULL; OMX_CONF_CHECK_CMD(hComponent,pBuffer,1); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: AACENC: Entering AllocateBuffer\n", __LINE__); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: AACENC: pBuffer = %p\n", __LINE__,pBuffer); - OMXDBG_PRINT(stderr, COMM, 2, 0, "AACENC: nPortIndex = %d - %p \n",(int)nPortIndex,&nPortIndex); pComponentPrivate = (AACENC_COMPONENT_PRIVATE *) (((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: AACENC: Entering AllocateBuffer\n", __LINE__); pPortDef = ((AACENC_COMPONENT_PRIVATE*) pComponentPrivate)->pPortDef[nPortIndex]; @@ -1921,10 +1912,8 @@ static OMX_ERRORTYPE FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, int outputIndex = -1; OMX_COMPONENTTYPE *pHandle = NULL; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: AACENC: FreeBuffer\n", __LINE__); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: AACENC: pBuffer = %p\n",__LINE__,pBuffer); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: AACENC: pBuffer->pBuffer = %p\n",__LINE__,pBuffer->pBuffer); pComponentPrivate = (AACENC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: AACENC: FreeBuffer\n", __LINE__); pHandle = (OMX_COMPONENTTYPE *) pComponentPrivate->pHandle; OMX_PRINT1(pComponentPrivate->dbg, "%d :: AACENC: pComponentPrivate = %p\n", __LINE__,pComponentPrivate); diff --git a/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDec_Utils.h b/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDec_Utils.h index f87d91d..3801274 100755..100644 --- a/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDec_Utils.h +++ b/omx/audio/src/openmax_il/nbamr_dec/inc/OMX_AmrDec_Utils.h @@ -158,8 +158,8 @@ OMX_U32 NBAMRDEC_IsPending(AMRDEC_COMPONENT_PRIVATE *pComponentPrivate, OMX_BUFF OMX_ERRORTYPE NBAMRDECFill_LCMLInitParamsEx(OMX_HANDLETYPE pComponent); OMX_U32 NBAMRDEC_IsValid(AMRDEC_COMPONENT_PRIVATE *pComponentPrivate, OMX_U8 *pBuffer, OMX_DIRTYPE eDir) ; /* OMX_ERRORTYPE NBAMRDEC_TransitionToIdle(AMRDEC_COMPONENT_PRIVATE *pComponentPrivate); */ -OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf); -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr); +OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg); +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg); /*void NBAMR_ResourceManagerCallback(RMPROXY_COMMANDDATATYPE cbData); */ #ifdef UNDER_CE diff --git a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_Utils.c b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_Utils.c index db51f04..b29b814 100755..100644 --- a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_Utils.c +++ b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDec_Utils.c @@ -138,9 +138,7 @@ OMX_ERRORTYPE NBAMRDECFill_LCMLInitParams(OMX_HANDLETYPE pComponent, char *ptr; pComponentPrivate = pHandle->pComponentPrivate; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: OMX_AmrDec_Utils.c :: NBAMRDECFill_LCMLInitParams\n ",__LINE__); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: OMX_AmrDec_Utils.c :: pHandle = %p\n",__LINE__,pHandle); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d :: OMX_AmrDec_Utils.c :: pHandle->pComponentPrivate = %p\n",__LINE__,pHandle->pComponentPrivate); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: NBAMRDECFill_LCMLInitParams\n ",__LINE__); nIpBuf = pComponentPrivate->pInputBufferList->numBuffers; pComponentPrivate->nRuntimeInputBuffers = nIpBuf; @@ -632,7 +630,7 @@ OMX_ERRORTYPE NBAMRDEC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); /*comentarios*/ // pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; // pBufParmsTemp -= EXTRA_BYTES; @@ -670,7 +668,7 @@ OMX_ERRORTYPE NBAMRDEC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); // pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; // pBufParmsTemp -= EXTRA_BYTES; @@ -2096,7 +2094,7 @@ taBuf_FromApp - reading NBAMRDEC_MIMEMODE\n",__LINE__); OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; OMX_MEMFREE_STRUCT_DSPALIGN(pLcmlHdr->pFrameParam,NBAMRDEC_FrameStruct); @@ -2108,7 +2106,7 @@ taBuf_FromApp - reading NBAMRDEC_MIMEMODE\n",__LINE__); eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(NBAMRDEC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone) { @@ -2353,7 +2351,7 @@ taBuf_FromApp - reading NBAMRDEC_MIMEMODE\n",__LINE__); OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; OMX_MEMFREE_STRUCT_DSPALIGN(pLcmlHdr->pFrameParam,NBAMRDEC_FrameStruct); @@ -2365,7 +2363,7 @@ taBuf_FromApp - reading NBAMRDEC_MIMEMODE\n",__LINE__); eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(NBAMRDEC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone) { @@ -2462,7 +2460,7 @@ OMX_ERRORTYPE NBAMRDECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, pBuf = pComponentPrivate->pInputBufferList->pBufHdr[i]; if(pBufHeader == pBuf) { *eDir = OMX_DirInput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Buffer %p is INPUT BUFFER\n",__LINE__, pBufHeader); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Buffer %p is INPUT BUFFER\n",__LINE__, pBufHeader); flag = 0; goto EXIT; } @@ -2475,7 +2473,7 @@ OMX_ERRORTYPE NBAMRDECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, pBuf = pComponentPrivate->pOutputBufferList->pBufHdr[i]; if(pBufHeader == pBuf) { *eDir = OMX_DirOutput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Buffer %p is OUTPUT BUFFER\n",__LINE__, pBufHeader); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Buffer %p is OUTPUT BUFFER\n",__LINE__, pBufHeader); flag = 0; goto EXIT; } @@ -2765,7 +2763,7 @@ pLcmlHdr->buffer->nFilledLen = %ld\n",__LINE__,pLcmlHdr->buffer->nFilledLen); 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); @@ -3051,7 +3049,7 @@ OMX_ERRORTYPE NBAMRDECGetCorresponding_LCMLHeader(AMRDEC_COMPONENT_PRIVATE *pCom if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { OMX_PRDSP1(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Inside NBAMRDECGetCorresponding_LCMLHeader..\n",__LINE__); *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Corresponding LCML Header Found\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: OMX_AmrDec_Utils.c :: Corresponding LCML Header Found\n",__LINE__); goto EXIT; } pLcmlBufHeader++; @@ -3440,7 +3438,7 @@ EXIT: OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, - DMM_BUFFER_OBJ* pDmmBuf) + DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; DSP_STATUS status; @@ -3448,14 +3446,14 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(pDmmBuf == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pArmPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -3466,16 +3464,16 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, /* Reserve */ nSizeReserved = ROUND_TO_PAGESIZE(size) + 2*DMM_PAGE_SIZE ; status = DSPProcessor_ReserveMemory(ProcHandle, nSizeReserved, &(pDmmBuf->pReserved)); - OMXDBG_PRINT(stderr, DSP, 2, 0, "\nOMX Reserve DSP: %p\n",pDmmBuf->pReserved); + OMX_PRDSP2 (dbg, "\nOMX Reserve DSP: %p\n",pDmmBuf->pReserved); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } pDmmBuf->nSize = size; - OMXDBG_PRINT(stderr, BUFFER, 2, 0, " DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); + OMX_PRBUFFER2 (dbg, " DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); /* Map */ status = DSPProcessor_Map(ProcHandle, @@ -3486,17 +3484,17 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, 0); /* final param is reserved. set to zero. */ if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_Map() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_Map() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); + OMX_PRBUFFER2 (dbg, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); /* Issue an initial memory flush to ensure cache coherency */ status = DSPProcessor_FlushMemory(ProcHandle, pDmmBuf->pAllocated, size, 0); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Unable to flush mapped buffer: error 0x%x",(int)status); + OMX_ERROR4 (dbg, "Unable to flush mapped buffer: error 0x%x",(int)status); goto EXIT; } eError = OMX_ErrorNone; @@ -3515,35 +3513,35 @@ EXIT: * @retval OMX_ErrorNone - Success * OMX_ErrorHardware - Hardware Error ** ==========================================================================*/ -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr) +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg) { DSP_STATUS status = DSP_SOK; OMX_ERRORTYPE eError = OMX_ErrorNone; - OMXDBG_PRINT(stderr, DSP, 2, 0, "\nOMX UnReserve DSP: %p\n",pResPtr); + OMX_PRDSP2 (dbg, "\nOMX UnReserve DSP: %p\n",pResPtr); if(pMapPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pMapPtr is NULL\n"); + OMX_ERROR4 (dbg, "pMapPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pResPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pResPtr is NULL\n"); + OMX_ERROR4 (dbg, "pResPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } status = DSPProcessor_UnMap(ProcHandle,pMapPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); } - OMXDBG_PRINT(stderr, PRINT, 2, 0, "unreserving structure =0x%p\n",pResPtr ); + OMX_PRINT2 (dbg, "unreserving structure =0x%p\n",pResPtr); status = DSPProcessor_UnReserveMemory(ProcHandle,pResPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); } EXIT: 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..52bee79 100755..100644 --- a/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c +++ b/omx/audio/src/openmax_il/nbamr_dec/src/OMX_AmrDecoder.c @@ -216,7 +216,6 @@ AM_COMMANDDATATYPE cmd_data; /*-------------------------------------------------------------------*/ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) { - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%s: IN", __FUNCTION__); OMX_PARAM_PORTDEFINITIONTYPE *pPortDef_ip, *pPortDef_op; AMRDEC_COMPONENT_PRIVATE *pComponentPrivate; OMX_AUDIO_PARAM_AMRTYPE *amr_ip; @@ -247,14 +246,11 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) pHandle->GetExtensionIndex = GetExtensionIndex; pHandle->ComponentRoleEnum = ComponentRoleEnum; - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); /*Allocate the memory for Component private data area */ // pHandle->pComponentPrivate = (AMRDEC_COMPONENT_PRIVATE *) // newmalloc (sizeof(AMRDEC_COMPONENT_PRIVATE)); OMX_MALLOC_GENERIC(pHandle->pComponentPrivate, AMRDEC_COMPONENT_PRIVATE); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d:[ALLOC] %p\n",__LINE__,pHandle->pComponentPrivate); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); // if(pHandle->pComponentPrivate == NULL) { // error = OMX_ErrorInsufficientResources; // goto EXIT; @@ -263,38 +259,28 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) // memset(pHandle->pComponentPrivate, 0x0, sizeof(AMRDEC_COMPONENT_PRIVATE)); // OMX_PRINT1(pComponentPrivate->dbg, "%d ::OMX_AmrDecoder.c\n", __LINE__); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); ((AMRDEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->pHandle = pHandle; - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); /* Initialize component data structures to default values */ ((AMRDEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->sPortParam.nPorts = 0x2; ((AMRDEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->sPortParam.nStartPortNumber = 0x0; - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); error = OMX_ErrorNone; - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); // amr_ip = (OMX_AUDIO_PARAM_AMRTYPE *)newmalloc(sizeof(OMX_AUDIO_PARAM_AMRTYPE)); OMX_MALLOC_GENERIC(amr_ip , OMX_AUDIO_PARAM_AMRTYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); //amr_op = (OMX_AUDIO_PARAM_PCMMODETYPE *)newmalloc(sizeof(OMX_AUDIO_PARAM_PCMMODETYPE)); OMX_MALLOC_GENERIC(amr_op , OMX_AUDIO_PARAM_PCMMODETYPE); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c\n", __LINE__); ((AMRDEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->amrParams[NBAMRDEC_INPUT_PORT] = amr_ip; ((AMRDEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->amrParams[NBAMRDEC_OUTPUT_PORT] = (OMX_AUDIO_PARAM_AMRTYPE*)amr_op; - OMXDBG_PRINT(stderr, COMM, 2, 0, "%d ::OMX_AmrDecoder.c ::Malloced amrParams[NBAMRDEC_INPUT_PORT] = 0x%p\n",__LINE__,((AMRDEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->amrParams[NBAMRDEC_INPUT_PORT]); - OMXDBG_PRINT(stderr, COMM, 2, 0, "%d ::OMX_AmrDecoder.c ::Malloced amrParams[NBAMRDEC_OUTPUT_PORT] = 0x%p\n",__LINE__,((AMRDEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->amrParams[NBAMRDEC_OUTPUT_PORT]); - - pComponentPrivate = pHandle->pComponentPrivate; OMX_DBG_INIT(pComponentPrivate->dbg, "OMX_DBG_NBAMRDEC"); @@ -481,8 +467,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) #endif OMX_MALLOC_GENERIC(pPortDef_ip, OMX_PARAM_PORTDEFINITIONTYPE); OMX_MALLOC_GENERIC(pPortDef_op, OMX_PARAM_PORTDEFINITIONTYPE); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d ::OMX_AmrDecoder.c ::pPortDef_ip = 0x%p\n", __LINE__,pPortDef_ip); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d ::OMX_AmrDecoder.c ::pPortDef_op = 0x%p\n", __LINE__,pPortDef_op); ((AMRDEC_COMPONENT_PRIVATE*) pHandle->pComponentPrivate)->pPortDef[NBAMRDEC_INPUT_PORT] = pPortDef_ip; @@ -836,11 +820,10 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, AMRDEC_COMPONENT_PRIVATE *pComponentPrivate; OMX_PARAM_PORTDEFINITIONTYPE *pParameterStructure; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Inside the GetParameter Line %d\n",__LINE__); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "%d ::OMX_AmrDecoder.c :: Inside the GetParameter:: %x\n",__LINE__,nParamIndex); pComponentPrivate = (AMRDEC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate); + OMX_PRINT1 (pComponentPrivate->dbg, "%d ::OMX_AmrDecoder.c :: Inside the GetParameter:: %x\n",__LINE__,nParamIndex); pParameterStructure = (OMX_PARAM_PORTDEFINITIONTYPE*)ComponentParameterStructure; if (pParameterStructure == NULL) { @@ -1848,11 +1831,10 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, AMRDEC_COMPONENT_PRIVATE *pComponentPrivate; OMX_ERRORTYPE eError = OMX_ErrorNone; OMX_BUFFERHEADERTYPE *pBufferHeader; - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%s: ALLOCATE BUFFER", __FUNCTION__); pComponentPrivate = (AMRDEC_COMPONENT_PRIVATE *) (((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate); - + OMX_PRINT1 (pComponentPrivate->dbg, "%s: ALLOCATE BUFFER", __FUNCTION__); pPortDef = ((AMRDEC_COMPONENT_PRIVATE*) pComponentPrivate)->pPortDef[nPortIndex]; #ifdef _ERROR_PROPAGATION__ diff --git a/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h b/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h index 1ee3527..443aa66 100644 --- a/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h +++ b/omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h @@ -223,7 +223,7 @@ (_s_)->nVersion.s.nStep = 0x0 #define OMX_NBMEMFREE_STRUCT(_pStruct_)\ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: [FREE] %p\n",__LINE__,_pStruct_);\ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: [FREE] %p\n",__LINE__,_pStruct_);\ if(_pStruct_ != NULL){\ newfree(_pStruct_);\ _pStruct_ = NULL;\ @@ -231,7 +231,7 @@ #define OMX_NBCLOSE_PIPE(_pStruct_,err)\ - OMXDBG_PRINT(stderr, COMM, 2, 0, "%d :: CLOSING PIPE \n",__LINE__); \ + OMXDBG_PRINT(stderr, COMM, 2, OMX_DBG_BASEMASK, "%d :: CLOSING PIPE \n",__LINE__); \ err = close (_pStruct_);\ if(0 != err && OMX_ErrorNone == eError){\ eError = OMX_ErrorHardware;\ @@ -249,7 +249,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_); @@ -263,7 +263,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 NBAMRENC_OMX_ERROR_EXIT(_e_, _c_, _s_)\ _e_ = _c_;\ @@ -274,7 +274,7 @@ #define NBAMRENC_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; \ } @@ -1254,8 +1254,8 @@ typedef enum OMX_NBAMRENC_INDEXAUDIOTYPE { OMX_IndexCustomDebug }OMX_NBAMRENC_INDEXAUDIOTYPE; -OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf); -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr); +OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg); +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg); /*===============================================================*/ 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..a3a2cd6 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 @@ -135,7 +135,7 @@ void* NBAMRENC_CompThread(void* pThreadData) #endif if (pComponentPrivate->bIsThreadstop == 1) { - OMX_ERROR4(pComponentPrivate->dbg, ":: Comp Thrd Exiting here...\n"); + OMX_ERROR2(pComponentPrivate->dbg, ":: Comp Thrd Exiting here...\n"); goto EXIT; } @@ -156,7 +156,7 @@ void* NBAMRENC_CompThread(void* pThreadData) goto EXIT; } } - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Component Time Out !!!!! \n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Component Time Out !!!!! \n",__LINE__); } else if(-1 == status) { OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error in Select\n", __LINE__); pComponentPrivate->cbInfo.EventHandler ( pHandle, 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..6d51b83 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 @@ -593,7 +593,7 @@ OMX_ERRORTYPE NBAMRENC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; pBufParmsTemp -= EXTRA_BYTES; @@ -628,7 +628,7 @@ OMX_ERRORTYPE NBAMRENC_CleanupInitParams(OMX_HANDLETYPE pComponent) #ifndef UNDER_CE OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); #endif pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; @@ -1838,7 +1838,7 @@ OMX_ERRORTYPE NBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, pBufParmsTemp =NULL; OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; } @@ -1848,7 +1848,7 @@ OMX_ERRORTYPE NBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(NBAMRENC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone){ OMX_ERROR4(pComponentPrivate->dbg, "OMX_DmmMap ERRROR!!!!\n\n"); goto EXIT; @@ -1987,7 +1987,7 @@ OMX_ERRORTYPE NBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, #ifndef UNDER_CE OMX_DmmUnMap(phandle->dspCodec->hProc, (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); #endif pLcmlHdr->pBufferParam->pParamElem = NULL; @@ -2001,7 +2001,7 @@ OMX_ERRORTYPE NBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(NBAMRENC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone) { @@ -2084,7 +2084,7 @@ OMX_ERRORTYPE NBAMRENC_GetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, pBuf = pComponentPrivate->pInputBufferList->pBufHdr[i]; if(pBufHeader == pBuf) { *eDir = OMX_DirInput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: pBufHeader = %p is INPUT BUFFER pBuf = %p\n",__LINE__,pBufHeader,pBuf); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: pBufHeader = %p is INPUT BUFFER pBuf = %p\n",__LINE__,pBufHeader,pBuf); flag = 0; goto EXIT; } @@ -2095,7 +2095,7 @@ OMX_ERRORTYPE NBAMRENC_GetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, pBuf = pComponentPrivate->pOutputBufferList->pBufHdr[i]; if(pBufHeader == pBuf) { *eDir = OMX_DirOutput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: pBufHeader = %p is OUTPUT BUFFER pBuf = %p\n",__LINE__,pBufHeader,pBuf); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: pBufHeader = %p is OUTPUT BUFFER pBuf = %p\n",__LINE__,pBufHeader,pBuf); flag = 0; goto EXIT; } @@ -2157,7 +2157,7 @@ OMX_ERRORTYPE NBAMRENC_GetCorrespondingLCMLHeader(AMRENC_COMPONENT_PRIVATE *pCom OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: pLcmlBufHeader->buffer->pBuffer = %p\n",__LINE__,pLcmlBufHeader->buffer->pBuffer); if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_PRDSP4(pComponentPrivate_CC->dbg, "%d :: Corresponding Input LCML Header Found = %p\n",__LINE__,pLcmlBufHeader); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "%d :: Corresponding Input LCML Header Found = %p\n",__LINE__,pLcmlBufHeader); eError = OMX_ErrorNone; goto EXIT; } @@ -2171,7 +2171,7 @@ OMX_ERRORTYPE NBAMRENC_GetCorrespondingLCMLHeader(AMRENC_COMPONENT_PRIVATE *pCom OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: pLcmlBufHeader->buffer->pBuffer = %p\n",__LINE__,pLcmlBufHeader->buffer->pBuffer); if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_PRDSP4(pComponentPrivate_CC->dbg, "%d :: Corresponding Output LCML Header Found = %p\n",__LINE__,pLcmlBufHeader); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "%d :: Corresponding Output LCML Header Found = %p\n",__LINE__,pLcmlBufHeader); eError = OMX_ErrorNone; goto EXIT; } @@ -2522,7 +2522,7 @@ OMX_ERRORTYPE NBAMRENC_LCMLCallback (TUsnCodecEvent event,void * args[10]) if(pComponentPrivate_CC->codecStop_waitingsignal == 0){ pComponentPrivate_CC->codecStop_waitingsignal = 1; pthread_cond_signal(&pComponentPrivate_CC->codecStop_threshold); - AMRENC_EPRINT("stop ack. received. stop waiting for sending disable command completed\n"); + OMX_ERROR2(pComponentPrivate_CC->dbg, "stop ack. received. stop waiting for sending disable command completed\n"); } pthread_mutex_unlock(&pComponentPrivate_CC->codecStop_mutex); @@ -2805,7 +2805,7 @@ OMX_HANDLETYPE NBAMRENC_GetLCMLHandle(AMRENC_COMPONENT_PRIVATE *pComponentPrivat char *error; AMRENC_COMPONENT_PRIVATE* pComponentPrivate_CC = NULL; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Entering NBAMRENC_GetLCMLHandle..\n",__LINE__); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: Entering NBAMRENC_GetLCMLHandle..\n",__LINE__); handle = dlopen("libLCML.so", RTLD_LAZY); if (!handle) { fputs(dlerror(), stderr); @@ -2965,7 +2965,7 @@ OMX_U32 NBAMRENC_IsPending(AMRENC_COMPONENT_PRIVATE *pComponentPrivate, OMX_PRBUFFER2(pComponentPrivate->dbg, "pBufHdr = %p\n",pBufHdr); OMX_PRBUFFER2(pComponentPrivate->dbg, "pOutputBufferList->pBufHdr[i] = %p\n",pComponentPrivate->pOutputBufferList->pBufHdr[i]); if (pBufHdr == pComponentPrivate->pOutputBufferList->pBufHdr[i]) { - OMX_PRBUFFER4(pComponentPrivate->dbg, "returning %lx\n",pComponentPrivate->pOutputBufferList->bBufferPending[i]); + OMX_PRBUFFER2(pComponentPrivate->dbg, "returning %lx\n",pComponentPrivate->pOutputBufferList->bBufferPending[i]); return pComponentPrivate->pOutputBufferList->bBufferPending[i]; } } @@ -3140,7 +3140,8 @@ EXIT: OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, - DMM_BUFFER_OBJ* pDmmBuf) + DMM_BUFFER_OBJ* pDmmBuf, + struct OMX_TI_Debug dbg) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; DSP_STATUS status; @@ -3148,20 +3149,20 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(pDmmBuf == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pArmPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(ProcHandle == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "ProcHandle is NULL\n"); + OMX_ERROR4 (dbg, "pProcHandle is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -3177,12 +3178,12 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } pDmmBuf->nSize = size; - OMXDBG_PRINT(stderr, BUFFER, 2, 0, " DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); + OMX_PRBUFFER2 (dbg, " DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); /* Map */ status = DSPProcessor_Map(ProcHandle, @@ -3193,17 +3194,17 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, 0); /* final param is reserved. set to zero. */ if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_Map() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_Map() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); + OMX_PRBUFFER2 (dbg, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); /* Issue an initial memory flush to ensure cache coherency */ status = DSPProcessor_FlushMemory(ProcHandle, pDmmBuf->pAllocated, size, 0); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Unable to flush mapped buffer: error 0x%x",(int)status); + OMX_ERROR4 (dbg, "Unable to flush mapped buffer: error 0x%x",(int)status); goto EXIT; } eError = OMX_ErrorNone; @@ -3222,26 +3223,27 @@ EXIT: * @retval OMX_ErrorNone - Success * OMX_ErrorHardware - Hardware Error ** ==========================================================================*/ -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr) +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg) { DSP_STATUS status = DSP_SOK; OMX_ERRORTYPE eError = OMX_ErrorNone; /* printf("OMX UnReserve DSP: %p\n",pResPtr);*/ if(pMapPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pMapPtr is NULL\n"); + OMX_ERROR4(dbg, "pMapPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pResPtr == NULL) { + OMX_ERROR4(dbg, "pResPtr is NULL\n"); OMXDBG_PRINT(stderr, ERROR, 4, 0, "pResPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(ProcHandle == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "--ProcHandle is NULL\n"); + OMX_ERROR4 (dbg, "--ProcHandle is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -3249,14 +3251,14 @@ OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResP status = DSPProcessor_UnMap(ProcHandle,pMapPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); } - OMXDBG_PRINT(stderr, STATE, 2, 0, "unreserving structure =0x%p\n",pResPtr ); + OMX_PRSTATE2 (dbg, "unreserving structure =0x%p\n",pResPtr); status = DSPProcessor_UnReserveMemory(ProcHandle,pResPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); } EXIT: diff --git a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEncoder.c b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEncoder.c index ca6eac6..a9bb1e5 100644 --- a/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEncoder.c +++ b/omx/audio/src/openmax_il/nbamr_enc/src/OMX_AmrEncoder.c @@ -224,6 +224,8 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) OMX_AUDIO_PARAM_PORTFORMATTYPE *pPortFormat = NULL; int i = 0; + OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering OMX_ComponentInit\n"); + /*Set the all component function pointer to the handle */ pHandle->SetCallbacks = SetCallbacks; pHandle->GetComponentVersion = GetComponentVersion; @@ -1425,24 +1427,25 @@ static OMX_ERRORTYPE GetState (OMX_HANDLETYPE pComponent, OMX_STATETYPE* pState) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE *)pComponent; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Entering GetState\n", __LINE__); + AMRENC_COMPONENT_PRIVATE *pComponentPrivate = + (AMRENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate; + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: Entering GetState\n", __LINE__); if (!pState) { eError = OMX_ErrorBadParameter; OMXDBG_PRINT(stderr, ERROR, 4, 0, "%d :: OMX_ErrorBadParameter from GetState\n",__LINE__); goto EXIT; } - if (pHandle && pHandle->pComponentPrivate) { + if (pHandle && pComponentPrivate) { *pState = ((AMRENC_COMPONENT_PRIVATE*) - pHandle->pComponentPrivate)->curState; + pComponentPrivate)->curState; } else { *pState = OMX_StateLoaded; } eError = OMX_ErrorNone; EXIT: - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Exiting GetState\n", __LINE__); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Returning = 0x%x\n",__LINE__,eError); + OMX_PRINT1 (pComponentPrivate->dbg, "%d :: Exiting GetState Returning 0x%x\n", __LINE__, eError); return eError; } @@ -1739,8 +1742,7 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle) OMX_NBMEMFREE_STRUCT(pComponentPrivate); EXIT: - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Exiting ComponentDeInit\n", __LINE__); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Returning = 0x%x\n",__LINE__,eError); + OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d :: Exiting ComponentDeInit Returning 0x%x\n", __LINE__, eError); return eError; } diff --git a/omx/audio/src/openmax_il/wbamr_dec/inc/OMX_WbAmrDec_Utils.h b/omx/audio/src/openmax_il/wbamr_dec/inc/OMX_WbAmrDec_Utils.h index 35f5a9c..f7d1122 100644 --- a/omx/audio/src/openmax_il/wbamr_dec/inc/OMX_WbAmrDec_Utils.h +++ b/omx/audio/src/openmax_il/wbamr_dec/inc/OMX_WbAmrDec_Utils.h @@ -369,9 +369,9 @@ OMX_U32 WBAMR_DEC_IsValid(WBAMR_DEC_COMPONENT_PRIVATE *pComponentPrivate, OMX_U8 /* void WBAMRDEC_ResourceManagerCallback(RMPROXY_COMMANDDATATYPE cbData); */ -OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf); +OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg); -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr); +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg); #ifdef UNDER_CE #ifndef _OMX_EVENT_ 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..41d4827 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 @@ -152,7 +152,7 @@ void* WBAMR_DEC_ComponentThread (void* pThreadData) goto EXIT; } } - OMX_ERROR4(pComponentPrivate->dbg,"Component Time Out !!!!!!!!!!!! \n"); + OMX_ERROR2(pComponentPrivate->dbg,"Component Time Out !!!!!!!!!!!! \n"); } else if (-1 == status) { OMX_ERROR4(pComponentPrivate->dbg, "Error in Select\n"); pComponentPrivate->cbInfo.EventHandler (pHandle, diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_Utils.c b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_Utils.c index 70dd1c7..de24cf5 100755..100644 --- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_Utils.c +++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_Utils.c @@ -595,7 +595,7 @@ OMX_ERRORTYPE WBAMR_DEC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); } OMX_PRBUFFER2(pComponentPrivate->dbg, "[FREE] %p\n",pTemp_lcml->pBufferParam); @@ -620,7 +620,7 @@ OMX_ERRORTYPE WBAMR_DEC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); } OMX_PRBUFFER2(pComponentPrivate->dbg, "[FREE] %p\n",pTemp_lcml->pBufferParam); @@ -1079,7 +1079,7 @@ OMX_U32 WBAMR_DEC_HandleCommand (WBAMR_DEC_COMPONENT_PRIVATE *pComponentPrivate) #ifdef RESOURCE_MANAGER_ENABLED rm_error = RMProxy_NewSendCommand(pHandle, RMProxy_StateSet, OMX_WBAMR_Decoder_COMPONENT, OMX_StateIdle, 3456, NULL); #endif - OMX_ERROR4(pComponentPrivate->dbg, "OMX_AmrDec_Utils.c :: The component is stopped\n"); + OMX_ERROR2(pComponentPrivate->dbg, "OMX_AmrDec_Utils.c :: The component is stopped\n"); pComponentPrivate->cbInfo.EventHandler ( pHandle,pHandle->pApplicationPrivate, OMX_EventCmdComplete,OMX_CommandStateSet,pComponentPrivate->curState, @@ -2068,7 +2068,7 @@ OMX_ERRORTYPE WBAMR_DEC_HandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; } if(pLcmlHdr->pFrameParam==NULL ){ @@ -2077,7 +2077,7 @@ OMX_ERRORTYPE WBAMR_DEC_HandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(WAMRDEC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone){ OMX_ERROR4(pComponentPrivate->dbg, "OMX_DmmMap ERRROR!!!!\n\n"); @@ -2303,7 +2303,7 @@ OMX_ERRORTYPE WBAMR_DEC_HandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, OMX_MEMFREE_STRUCT_DSPALIGN(pLcmlHdr->pFrameParam,WAMRDEC_FrameStruct); OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; } @@ -2313,7 +2313,8 @@ OMX_ERRORTYPE WBAMR_DEC_HandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, nFrames*sizeof(WAMRDEC_FrameStruct), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), + pComponentPrivate->dbg); if (eError != OMX_ErrorNone) { @@ -2413,7 +2414,7 @@ OMX_ERRORTYPE WBAMR_DEC_GetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX if(pBufHeader == pBuf) { *eDir = OMX_DirInput; - OMX_ERROR4(pComponentPrivate->dbg, "WBAMR_DEC_Buffer %p is INPUT BUFFER\n", pBufHeader); + OMX_ERROR2(pComponentPrivate->dbg, "WBAMR_DEC_Buffer %p is INPUT BUFFER\n", pBufHeader); flag = 0; goto EXIT; } @@ -2428,7 +2429,7 @@ OMX_ERRORTYPE WBAMR_DEC_GetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX if(pBufHeader == pBuf) { *eDir = OMX_DirOutput; - OMX_ERROR4(pComponentPrivate->dbg, "WBAMR_DEC_Buffer %p is OUTPUT BUFFER\n", pBufHeader); + OMX_ERROR2(pComponentPrivate->dbg, "WBAMR_DEC_Buffer %p is OUTPUT BUFFER\n", pBufHeader); flag = 0; goto EXIT; } @@ -2715,7 +2716,7 @@ OMX_ERRORTYPE WBAMR_DEC_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); @@ -3020,7 +3021,7 @@ OMX_ERRORTYPE WBAMR_DEC_GetCorresponding_LCMLHeader(WBAMR_DEC_COMPONENT_PRIVATE for(i=0; i<nIpBuf; i++) { if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, "Corresponding LCML Header Found\n"); + OMX_ERROR2(pComponentPrivate->dbg, "Corresponding LCML Header Found\n"); goto EXIT; } pLcmlBufHeader++; @@ -3471,7 +3472,7 @@ OMX_ERRORTYPE WBAMR_DEC_Fill_LCMLInitParamsEx (OMX_HANDLETYPE pComponent ) OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, - DMM_BUFFER_OBJ* pDmmBuf) + DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; DSP_STATUS status; @@ -3479,14 +3480,14 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(pDmmBuf == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pArmPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -3498,16 +3499,16 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, nSizeReserved = ROUND_TO_PAGESIZE(size) + 2*DMM_PAGE_SIZE ; status = DSPProcessor_ReserveMemory(ProcHandle, nSizeReserved, &(pDmmBuf->pReserved)); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "\nOMX Reserve DSP: %p\n",pDmmBuf->pReserved); + OMX_PRBUFFER2(dbg, "OMX Reserve DSP: %p\n",pDmmBuf->pReserved); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } pDmmBuf->nSize = size; - OMXDBG_PRINT(stderr, PRINT, 2, 0, " DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); + OMX_PRINT2 (dbg, "DMM MAP Reserved: %p, size 0x%x (%d)\n", pDmmBuf->pReserved,nSizeReserved,nSizeReserved); /* Map */ status = DSPProcessor_Map(ProcHandle, @@ -3518,17 +3519,17 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, 0); /* final param is reserved. set to zero. */ if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 2, 0, "DSPProcessor_Map() failed - error 0x%x", (int)status); + OMX_ERROR2 (dbg, "DSPProcessor_Map() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } - OMXDBG_PRINT(stderr, PRINT, 2, 0, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); + OMX_PRINT2 (dbg, "DMM Mapped: %p, size 0x%x (%d)\n",pDmmBuf->pMapped, size,size); /* Issue an initial memory flush to ensure cache coherency */ status = DSPProcessor_FlushMemory(ProcHandle, pDmmBuf->pAllocated, size, 0); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Unable to flush mapped buffer: error 0x%x",(int)status); + OMX_ERROR4 (dbg, "Unable to flush mapped buffer: error 0x%x",(int)status); goto EXIT; } eError = OMX_ErrorNone; @@ -3547,35 +3548,35 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, * @retval OMX_ErrorNone - Success * OMX_ErrorHardware - Hardware Error ** ==========================================================================*/ -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr) +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg) { DSP_STATUS status = DSP_SOK; OMX_ERRORTYPE eError = OMX_ErrorNone; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "\nOMX UnReserve DSP: %p\n",pResPtr); + OMX_PRINT1 (dbg, "OMX UnReserve DSP: %p\n",pResPtr); if(pMapPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pMapPtr is NULL\n"); + OMX_ERROR4 (dbg, "pMapPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pResPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pResPtr is NULL\n"); + OMX_ERROR4 (dbg, "pResPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } status = DSPProcessor_UnMap(ProcHandle,pMapPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnMap() failed - error 0x%x",(int)status); } - OMXDBG_PRINT(stderr, PRINT, 2, 0, "unreserving structure =0x%p\n",pResPtr ); + OMX_PRINT2 (dbg, "unreserving structure =0x%p\n",pResPtr); status = DSPProcessor_UnReserveMemory(ProcHandle,pResPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnReserveMemory() failed - error 0x%x", (int)status); } EXIT: 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..ca28a3d 100755..100644 --- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c +++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDecoder.c @@ -235,8 +235,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) /*Allocate the memory for Component private data area */ OMX_MALLOC_GENERIC(pHandle->pComponentPrivate, WBAMR_DEC_COMPONENT_PRIVATE); - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "[ALLOC] %p\n",pHandle->pComponentPrivate); - ((WBAMR_DEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->pHandle = pHandle; @@ -254,8 +252,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) ((WBAMR_DEC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate)->wbamrParams[WBAMR_DEC_OUTPUT_PORT] = (OMX_AUDIO_PARAM_AMRTYPE*)amr_op; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Malloced wbamrParams[WBAMR_DEC_INPUT_PORT] = %p\n",((WBAMR_DEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wbamrParams[WBAMR_DEC_INPUT_PORT]); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Malloced wbamrParams[WBAMR_DEC_OUTPUT_PORT] = %p\n",((WBAMR_DEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wbamrParams[WBAMR_DEC_OUTPUT_PORT]); pComponentPrivate = pHandle->pComponentPrivate; @@ -774,9 +770,9 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, WBAMR_DEC_COMPONENT_PRIVATE *pComponentPrivate; OMX_PARAM_PORTDEFINITIONTYPE *pParameterStructure; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering with index:: %x\n",nParamIndex); pComponentPrivate = (WBAMR_DEC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate); + OMX_PRINT1 (pComponentPrivate->dbg, "Entering with index:: %x\n",nParamIndex); pParameterStructure = (OMX_PARAM_PORTDEFINITIONTYPE*)ComponentParameterStructure; if (pParameterStructure == NULL) { diff --git a/omx/audio/src/openmax_il/wbamr_enc/inc/OMX_WbAmrEnc_Utils.h b/omx/audio/src/openmax_il/wbamr_enc/inc/OMX_WbAmrEnc_Utils.h index f695802..6cb4dca 100644 --- a/omx/audio/src/openmax_il/wbamr_enc/inc/OMX_WbAmrEnc_Utils.h +++ b/omx/audio/src/openmax_il/wbamr_enc/inc/OMX_WbAmrEnc_Utils.h @@ -128,57 +128,51 @@ (_s_)->nVersion.s.nStep = 0x0 #define OMX_WBMEMFREE_STRUCT(_pStruct_)\ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "FREEING MEMORY = %p\n",_pStruct_);\ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "FREEING MEMORY = %p\n",_pStruct_);\ if(_pStruct_ != NULL){\ newfree(_pStruct_);\ _pStruct_ = NULL;\ } #define OMX_WBCLOSE_PIPE(_pStruct_,err)\ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Closing pipes = %d\n",_pStruct_);\ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "Closing pipes = %d\n",_pStruct_);\ err = close (_pStruct_);\ if(0 != err && OMX_ErrorNone == eError){\ eError = OMX_ErrorHardware;\ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Error while closing pipe\n");\ + OMXDBG_PRINT(stderr, ERROR, 4, OMX_DBG_BASEMASK, "Error while closing pipe\n");\ goto EXIT;\ } #define WBAMRENC_OMX_MALLOC(_pStruct_, _sName_) \ _pStruct_ = (_sName_*)newmalloc(sizeof(_sName_)); \ if(_pStruct_ == NULL){ \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "***********************************\n"); \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Malloc Failed\n"); \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "***********************************\n"); \ + OMXDBG_PRINT(stderr, ERROR, 4, OMX_DBG_BASEMASK, "Malloc Failed\n"); \ eError = OMX_ErrorInsufficientResources; \ goto EXIT; \ } \ memset(_pStruct_,0,sizeof(_sName_));\ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Malloced = %p\n",_pStruct_); + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "Malloced = %p\n",_pStruct_); #define WBAMRENC_OMX_MALLOC_SIZE(_ptr_, _size_,_name_) \ _ptr_ = (_name_ *)newmalloc(_size_); \ if(_ptr_ == NULL){ \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "***********************************\n"); \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Malloc Failed\n"); \ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "***********************************\n"); \ + OMXDBG_PRINT(stderr, ERROR, 4, OMX_DBG_BASEMASK, "Malloc Failed\n"); \ eError = OMX_ErrorInsufficientResources; \ goto EXIT; \ } \ memset(_ptr_,0,_size_); \ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Malloced = %p\n",_ptr_); + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "Malloced = %p\n",_ptr_); #define WBAMRENC_OMX_ERROR_EXIT(_e_, _c_, _s_)\ _e_ = _c_;\ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "\n**************** OMX ERROR ************************\n");\ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "Error Name: %s : Error Num = %x", _s_, _e_);\ - OMXDBG_PRINT(stderr, ERROR, 4, 0, "\n**************** OMX ERROR ************************\n");\ + OMXDBG_PRINT(stderr, ERROR, 4, OMX_DBG_BASEMASK, "Error Name: %s : Error Num = %x", _s_, _e_);\ goto EXIT; #define WBAMRENC_OMX_FREE(ptr) \ if(NULL != ptr) { \ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "Freeing Address = %p\n",ptr); \ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "Freeing Address = %p\n",ptr); \ newfree(ptr); \ ptr = NULL; \ } @@ -1069,8 +1063,8 @@ OMX_U32 WBAMRENC_IsValid(WBAMRENC_COMPONENT_PRIVATE *pComponentPrivate, OMX_U8 *pBuffer, OMX_DIRTYPE eDir); -OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf); -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr); +OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg); +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg); /* void WBAMRENC_ResourceManagerCallback(RMPROXY_COMMANDDATATYPE cbData); */ 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..9c8813a 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 @@ -616,7 +616,7 @@ OMX_ERRORTYPE WBAMRENC_CleanupInitParams(OMX_HANDLETYPE pComponent) pLcmlHandleAux = (LCML_DSP_INTERFACE *)(((LCML_CODEC_INTERFACE *)pLcmlHandle->pCodecinterfacehandle)->pCodec); OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; pBufParmsTemp -= EXTRA_BYTES; @@ -650,7 +650,7 @@ OMX_ERRORTYPE WBAMRENC_CleanupInitParams(OMX_HANDLETYPE pComponent) #ifndef UNDER_CE OMX_DmmUnMap(pLcmlHandleAux->dspCodec->hProc, (void*)pTemp_lcml->pBufferParam->pParamElem, - pTemp_lcml->pDmmBuf->pReserved); + pTemp_lcml->pDmmBuf->pReserved, pComponentPrivate->dbg); #endif pBufParmsTemp = (OMX_U8*)pTemp_lcml->pFrameParam; @@ -1902,7 +1902,7 @@ OMX_ERRORTYPE WBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, OMX_DmmUnMap(phandle->dspCodec->hProc, /*Unmap DSP memory used*/ (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; } @@ -1915,7 +1915,7 @@ OMX_ERRORTYPE WBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, (nFrames*sizeof(WBAMRENC_FrameStruct)), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf), pComponentPrivate->dbg); if (eError != OMX_ErrorNone){ OMX_ERROR4(pComponentPrivate->dbg, "OMX_DmmMap ERRROR!!!!\n"); goto EXIT; @@ -2029,7 +2029,7 @@ OMX_ERRORTYPE WBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, #ifndef UNDER_CE OMX_DmmUnMap(phandle->dspCodec->hProc, (void*)pLcmlHdr->pBufferParam->pParamElem, - pLcmlHdr->pDmmBuf->pReserved); + pLcmlHdr->pDmmBuf->pReserved, pComponentPrivate->dbg); pLcmlHdr->pBufferParam->pParamElem = NULL; #endif } @@ -2045,7 +2045,7 @@ OMX_ERRORTYPE WBAMRENC_HandleDataBufFromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = OMX_DmmMap(phandle->dspCodec->hProc, (nFrames*sizeof(WBAMRENC_FrameStruct)), (void*)pLcmlHdr->pFrameParam, - (pLcmlHdr->pDmmBuf)); + (pLcmlHdr->pDmmBuf),pComponentPrivate->dbg ); if (eError != OMX_ErrorNone) { OMX_ERROR4(pComponentPrivate->dbg, "OMX_DmmMap ERRROR!!!!\n"); @@ -2142,7 +2142,7 @@ OMX_ERRORTYPE WBAMRENC_GetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, pBuf = pComponentPrivate->pOutputBufferList->pBufHdr[i]; if(pBufHeader == pBuf) { *eDir = OMX_DirOutput; - OMX_ERROR4(pComponentPrivate->dbg, "pBufHeader = %p is OUTPUT BUFFER pBuf = %p\n", + OMX_ERROR2(pComponentPrivate->dbg, "pBufHeader = %p is OUTPUT BUFFER pBuf = %p\n", pBufHeader, pBuf); flag = 0; @@ -2207,7 +2207,7 @@ OMX_ERRORTYPE WBAMRENC_GetCorrespondingLCMLHeader(WBAMRENC_COMPONENT_PRIVATE *pC pLcmlBufHeader->buffer->pBuffer); if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, + OMX_ERROR2(pComponentPrivate->dbg, "Corresponding Input LCML Header Found = %p\n", pLcmlBufHeader); eError = OMX_ErrorNone; @@ -2224,7 +2224,7 @@ OMX_ERRORTYPE WBAMRENC_GetCorrespondingLCMLHeader(WBAMRENC_COMPONENT_PRIVATE *pC pLcmlBufHeader->buffer->pBuffer); if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, + OMX_ERROR2(pComponentPrivate->dbg, "Corresponding Output LCML Header Found = %p\n", pLcmlBufHeader); eError = OMX_ErrorNone; @@ -3214,7 +3214,7 @@ OMX_ERRORTYPE WBAMRENC_FillLCMLInitParamsEx(OMX_HANDLETYPE pComponent) OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, int size, void* pArmPtr, - DMM_BUFFER_OBJ* pDmmBuf) + DMM_BUFFER_OBJ* pDmmBuf, struct OMX_TI_Debug dbg) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; DSP_STATUS status; @@ -3222,14 +3222,14 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(pDmmBuf == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pArmPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pBuf is NULL\n"); + OMX_ERROR4 (dbg, "pBuf is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -3243,17 +3243,15 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, - "DSPProcessor_ReserveMemory() failed - error 0x%x", - (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_ReserveMemory() failed - error 0x%x", (int) status); eError = OMX_ErrorHardware; goto EXIT; } pDmmBuf->nSize = size; - OMXDBG_PRINT(stderr, BUFFER, 2, 0, " DMM MAP Reserved: %p, size 0x%x (%d)\n", - pDmmBuf->pReserved, - nSizeReserved, - nSizeReserved); + OMX_PRBUFFER2 (dbg, "DMM MAP Reserved: %p, size 0x%x (%d)\n", + pDmmBuf->pReserved, + nSizeReserved, + nSizeReserved); /* Map */ status = DSPProcessor_Map(ProcHandle, pDmmBuf->pAllocated,/* Arm addres of data to Map on DSP*/ @@ -3263,23 +3261,20 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, 0); /* final param is reserved. set to zero. */ if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, - "DSPProcessor_Map() failed - error 0x%x", + OMX_ERROR4 (dbg, "DSPProcessor_Map() failed - error 0x%x", (int)status); eError = OMX_ErrorHardware; goto EXIT; } - OMXDBG_PRINT(stderr, BUFFER, 2, 0, - "DMM Mapped: %p, size 0x%x (%d)\n", + OMX_PRBUFFER2 (dbg, "DMM Mapped: %p, size 0x%x (%d)\n", pDmmBuf->pMapped, size,size); /* Issue an initial memory flush to ensure cache coherency */ status = DSPProcessor_FlushMemory(ProcHandle, pDmmBuf->pAllocated, size, 0); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, - "Unable to flush mapped buffer: error 0x%x", - (int)status); + OMX_ERROR4 (dbg, "Unable to flush mapped buffer: error 0x%x", + (int)status); goto EXIT; } eError = OMX_ErrorNone; @@ -3298,7 +3293,7 @@ OMX_ERRORTYPE OMX_DmmMap(DSP_HPROCESSOR ProcHandle, * @retval OMX_ErrorNone - Success * OMX_ErrorHardware - Hardware Error ** ==========================================================================*/ -OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr) +OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResPtr, struct OMX_TI_Debug dbg) { DSP_STATUS status = DSP_SOK; OMX_ERRORTYPE eError = OMX_ErrorNone; @@ -3306,33 +3301,27 @@ OMX_ERRORTYPE OMX_DmmUnMap(DSP_HPROCESSOR ProcHandle, void* pMapPtr, void* pResP if(pMapPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pMapPtr is NULL\n"); + OMX_ERROR4 (dbg, "pMapPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } if(pResPtr == NULL) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, "pResPtr is NULL\n"); + OMX_ERROR4 (dbg, "pResPtr is NULL\n"); eError = OMX_ErrorBadParameter; goto EXIT; } status = DSPProcessor_UnMap(ProcHandle,pMapPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, - "DSPProcessor_UnMap() failed - error 0x%x", - (int)status); + OMX_ERROR4 (dbg, "DSPProcessor_UnMap() failed - error 0x%x", (int)status); } - OMXDBG_PRINT(stderr, PRINT, 2, 0, - "unreserving structure =0x%p\n", - pResPtr ); + OMX_PRINT2 (dbg, "unreserving structure =0x%p\n", pResPtr); status = DSPProcessor_UnReserveMemory(ProcHandle,pResPtr); if(DSP_FAILED(status)) { - OMXDBG_PRINT(stderr, ERROR, 4, 0, - "DSPProcessor_UnReserveMemory() failed - error 0x%x", - (int)status); + OMX_ERROR4(dbg, "DSPProcessor_UnReserveMemory() failed - error 0x%x",(int)status); } EXIT: diff --git a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEncoder.c b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEncoder.c index 6b31f99..6bed4aa 100644 --- a/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEncoder.c +++ b/omx/audio/src/openmax_il/wbamr_enc/src/OMX_WbAmrEncoder.c @@ -208,7 +208,7 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) OMX_AUDIO_PARAM_PORTFORMATTYPE *pPortFormat = NULL; int i = 0; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Enter\n"); + OMXDBG_PRINT(stderr, PRINT, 1, 0, "Enter"); /*Set the all component function pointer to the handle */ pHandle->SetCallbacks = SetCallbacks; pHandle->GetComponentVersion = GetComponentVersion; @@ -383,7 +383,7 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) pPortFormat->eEncoding = OMX_AUDIO_CodingAMR; OMX_PRDSP2(pComponentPrivate->dbg, "Setting dasf,mime,efr,acdn,amr and \ -MultiFrame modes to 0\n"); +MultiFrame modes to 0"); pComponentPrivate->dasfMode = 0; pComponentPrivate->frameMode = 0; @@ -491,19 +491,19 @@ MultiFrame modes to 0\n"); #ifdef RESOURCE_MANAGER_ENABLED eError = RMProxy_NewInitalize(); - OMX_PRINT2(pComponentPrivate->dbg,"Initialize RM\n"); + OMX_PRINT2(pComponentPrivate->dbg,"Initialize RM"); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "RM Initialization error %d\n", + OMX_ERROR4(pComponentPrivate->dbg, "RM Initialization error %d", eError); goto EXIT; } #endif eError = WBAMRENC_StartComponentThread(pHandle); - OMX_PRINT2(pComponentPrivate->dbg, "ComponentThread started\n"); + OMX_PRINT2(pComponentPrivate->dbg, "ComponentThread started"); if (eError != OMX_ErrorNone) { OMX_ERROR4(pComponentPrivate->dbg, "Error while starting \ -ComponentThread %d\n",eError); +ComponentThread %d",eError); goto EXIT; } @@ -516,18 +516,17 @@ ComponentThread %d\n",eError); #ifndef UNDER_CE if((pComponentPrivate->fdwrite=open(FIFO1,O_WRONLY))<0) { - OMX_PRCOMM4(pComponentPrivate->dbg, "Failure to open Write pipe\n"); + OMX_PRCOMM4(pComponentPrivate->dbg, "Failure to open Write pipe"); } if((pComponentPrivate->fdread=open(FIFO2,O_RDONLY))<0) { - OMX_PRCOMM4(pComponentPrivate->dbg, "Failure to open Read pipe\n"); + OMX_PRCOMM4(pComponentPrivate->dbg, "Failure to open Read pipe"); } #endif EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exit\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exit Returning = 0x%x",eError); return eError; } @@ -559,11 +558,11 @@ static OMX_ERRORTYPE SetCallbacks (OMX_HANDLETYPE pComponent, WBAMRENC_COMPONENT_PRIVATE *pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate; - OMX_PRINT1(pComponentPrivate->dbg, "Enter\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Enter"); if (pCallBacks == NULL) { eError = OMX_ErrorBadParameter; OMX_PRDSP4(pComponentPrivate->dbg, "Empty callbacks from the\ - application\n"); + application"); goto EXIT; } @@ -576,8 +575,7 @@ static OMX_ERRORTYPE SetCallbacks (OMX_HANDLETYPE pComponent, pComponentPrivate->curState = OMX_StateLoaded; EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exit\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exit Returning = 0x%x",eError); return eError; } @@ -608,7 +606,7 @@ static OMX_ERRORTYPE GetComponentVersion (OMX_HANDLETYPE hComp, OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE*) hComp; WBAMRENC_COMPONENT_PRIVATE *pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *) pHandle->pComponentPrivate; - OMX_PRINT1(pComponentPrivate->dbg, "Enter\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Enter"); #ifdef _ERROR_PROPAGATION__ if (pComponentPrivate->curState == OMX_StateInvalid){ eError = OMX_ErrorInvalidState; @@ -625,8 +623,7 @@ static OMX_ERRORTYPE GetComponentVersion (OMX_HANDLETYPE hComp, eError = OMX_ErrorBadParameter; } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -655,10 +652,10 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, (WBAMRENC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate; int nRet = 0; - OMX_PRINT1(pCompPrivate->dbg, "Entering\n"); + OMX_PRINT1(pCompPrivate->dbg, "Entering"); if(pCompPrivate->curState == OMX_StateInvalid) { eError = OMX_ErrorInvalidState; - OMX_ERROR4(pCompPrivate->dbg, "OMX_ErrorInvalidState!\n"); + OMX_ERROR4(pCompPrivate->dbg, "OMX_ErrorInvalidState!"); goto EXIT; } #ifdef __PERF_INSTRUMENTATION__ @@ -669,7 +666,7 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, #endif switch(Cmd) { case OMX_CommandStateSet: - OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandStateSet-%ld\n",nParam); + OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandStateSet-%ld",nParam); if (nParam == OMX_StateLoaded) { pCompPrivate->bLoadedCommandPending = OMX_TRUE; } @@ -685,7 +682,7 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, } if(nParam == OMX_StateInvalid) { - OMX_PRDSP2(pCompPrivate->dbg, "nParam = OMX_StateInvalid!\n"); + OMX_PRDSP2(pCompPrivate->dbg, "nParam = OMX_StateInvalid!"); pCompPrivate->curState = OMX_StateInvalid; pCompPrivate->cbInfo.EventHandler ( pHandle, pHandle->pApplicationPrivate, @@ -698,7 +695,7 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, } break; case OMX_CommandFlush: - OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandFlush %ld\n",nParam); + OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandFlush %ld",nParam); if(nParam > 1 && nParam != -1) { eError = OMX_ErrorBadPortIndex; OMX_ERROR4(pCompPrivate->dbg, @@ -707,13 +704,13 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, } break; case OMX_CommandPortDisable: - OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandPortDisable\n"); + OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandPortDisable"); break; case OMX_CommandPortEnable: - OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandPortEnable\n"); + OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandPortEnable"); break; case OMX_CommandMarkBuffer: - OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandMarkBuffer\n"); + OMX_PRDSP2(pCompPrivate->dbg, "OMX_CommandMarkBuffer"); if (nParam > 0) { eError = OMX_ErrorBadPortIndex; OMX_ERROR4(pCompPrivate->dbg, @@ -722,7 +719,7 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, } break; default: - OMX_PRDSP2(pCompPrivate->dbg, "Invalid OMX Command\n"); + OMX_PRDSP2(pCompPrivate->dbg, "Invalid OMX Command"); pCompPrivate->cbInfo.EventHandler ( pHandle, pHandle->pApplicationPrivate, OMX_EventError, @@ -752,8 +749,7 @@ static OMX_ERRORTYPE SendCommand (OMX_HANDLETYPE phandle, } EXIT: - OMX_PRINT1(pCompPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pCompPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pCompPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -780,7 +776,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate); pParameterStructure = (OMX_PARAM_PORTDEFINITIONTYPE*)ComponentParameterStructure; - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); if (pParameterStructure == NULL) { eError = OMX_ErrorBadParameter; OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex!"); @@ -802,7 +798,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, switch(nParamIndex){ case OMX_IndexParamAudioInit: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioInit\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioInit"); memcpy(ComponentParameterStructure, pComponentPrivate->sPortParam, sizeof(OMX_PORT_PARAM_TYPE)); @@ -811,7 +807,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamPortDefinition: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPortDefinition\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPortDefinition"); if(((OMX_PARAM_PORTDEFINITIONTYPE *)(ComponentParameterStructure))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_INPUT_PORT]->nPortIndex) { memcpy(ComponentParameterStructure, @@ -824,7 +820,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, sizeof(OMX_PARAM_PORTDEFINITIONTYPE)); } else { OMX_ERROR4(pComponentPrivate->dbg, - "OMX_IndexParamPortDefinition - OMX_ErrorBadPortIndex\n"); + "OMX_IndexParamPortDefinition - OMX_ErrorBadPortIndex"); eError = OMX_ErrorBadPortIndex; } } @@ -832,7 +828,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamAudioPortFormat: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPortFormat\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPortFormat"); if(((OMX_AUDIO_PARAM_PORTFORMATTYPE *)(ComponentParameterStructure))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_INPUT_PORT]->nPortIndex) { if(((OMX_AUDIO_PARAM_PORTFORMATTYPE *)(ComponentParameterStructure))->nIndex > @@ -859,7 +855,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, } else { OMX_ERROR4(pComponentPrivate->dbg, - "OMX_IndexParamAudioPortFormat - OMX_ErrorBadPortIndex\n"); + "OMX_IndexParamAudioPortFormat - OMX_ErrorBadPortIndex"); eError = OMX_ErrorBadPortIndex; } } @@ -867,7 +863,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamAudioAmr: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioAmr\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioAmr"); memcpy(ComponentParameterStructure, pComponentPrivate->amrParams, sizeof(OMX_AUDIO_PARAM_AMRTYPE)); @@ -911,7 +907,7 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamPriorityMgmt: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPriorityMgmt\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPriorityMgmt"); memcpy(ComponentParameterStructure, pComponentPrivate->sPriorityMgmt, sizeof(OMX_PRIORITYMGMTTYPE)); @@ -919,21 +915,21 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, break; case OMX_IndexParamAudioPcm: - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPcm\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPcm"); memcpy(ComponentParameterStructure, pComponentPrivate->pcmParams, sizeof(OMX_AUDIO_PARAM_PCMMODETYPE)); break; case OMX_IndexParamCompBufferSupplier: - OMX_PRDSP2(pComponentPrivate->dbg,"OMX_IndexParamCompBufferSupplier\n"); + OMX_PRDSP2(pComponentPrivate->dbg,"OMX_IndexParamCompBufferSupplier"); if(((OMX_PARAM_BUFFERSUPPLIERTYPE *)(ComponentParameterStructure))->nPortIndex == WBAMRENC_INPUT_PORT) { OMX_PRDSP2(pComponentPrivate->dbg, - "nPortIndex %d \n",WBAMRENC_INPUT_PORT); + "nPortIndex %d ",WBAMRENC_INPUT_PORT); } else if(((OMX_PARAM_BUFFERSUPPLIERTYPE *)(ComponentParameterStructure))->nPortIndex == WBAMRENC_OUTPUT_PORT) { OMX_PRDSP2(pComponentPrivate->dbg, - "nPortIndex %d \n", WBAMRENC_OUTPUT_PORT); + "nPortIndex %d ", WBAMRENC_OUTPUT_PORT); } else { OMX_PRDSP2(pComponentPrivate->dbg, @@ -950,11 +946,11 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, pCap_flags = (PV_OMXComponentCapabilityFlagsType *) ComponentParameterStructure; if (NULL == pCap_flags) { - OMX_ERROR4(pComponentPrivate->dbg, "ERROR PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX\n"); + OMX_ERROR4(pComponentPrivate->dbg, "ERROR PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX"); eError = OMX_ErrorBadParameter; goto EXIT; } - OMX_PRINT1(pComponentPrivate->dbg, "Copying PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Copying PV_OMX_COMPONENT_CAPABILITY_TYPE_INDEX"); memcpy(pCap_flags, &(pComponentPrivate->iPVCapabilityFlags), sizeof(PV_OMXComponentCapabilityFlagsType)); @@ -975,14 +971,13 @@ static OMX_ERRORTYPE GetParameter (OMX_HANDLETYPE hComp, default: { - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorUnsupportedIndex!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorUnsupportedIndex!"); eError = OMX_ErrorUnsupportedIndex; } break; } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -1015,7 +1010,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComp)->pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); if (pCompParam == NULL) { eError = OMX_ErrorBadParameter; OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter!"); @@ -1036,7 +1031,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, switch(nParamIndex) { case OMX_IndexParamAudioPortFormat: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPortFormat\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPortFormat"); pComponentParam = (OMX_AUDIO_PARAM_PORTFORMATTYPE *)pCompParam; if ( pComponentParam->nPortIndex == pComponentPrivate->pCompPort[WBAMRENC_INPUT_PORT]->pPortFormat->nPortIndex ) { memcpy(pComponentPrivate->pCompPort[WBAMRENC_INPUT_PORT]->pPortFormat, @@ -1055,7 +1050,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, break; case OMX_IndexParamAudioAmr: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioAmr\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioAmr"); pCompAmrParam = (OMX_AUDIO_PARAM_AMRTYPE *)pCompParam; if(pCompAmrParam->nPortIndex == 0) { /* 0 means Input port */ memcpy(((WBAMRENC_COMPONENT_PRIVATE*) @@ -1121,17 +1116,17 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamPortDefinition: { pComponentParamPort = (OMX_PARAM_PORTDEFINITIONTYPE *)pCompParam; - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPortDefinition\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPortDefinition"); if(((OMX_PARAM_PORTDEFINITIONTYPE *)(pCompParam))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_INPUT_PORT]->nPortIndex) { - OMX_PRINT2(pComponentPrivate->dbg, "nPortIndex %d\n",WBAMRENC_INPUT_PORT); + OMX_PRINT2(pComponentPrivate->dbg, "nPortIndex %d",WBAMRENC_INPUT_PORT); memcpy(pComponentPrivate->pPortDef[WBAMRENC_INPUT_PORT], pCompParam, sizeof(OMX_PARAM_PORTDEFINITIONTYPE)); } else if(((OMX_PARAM_PORTDEFINITIONTYPE *)(pCompParam))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_OUTPUT_PORT]->nPortIndex) { - OMX_PRINT2(pComponentPrivate->dbg, "nPortIndex %d\n",WBAMRENC_OUTPUT_PORT); + OMX_PRINT2(pComponentPrivate->dbg, "nPortIndex %d",WBAMRENC_OUTPUT_PORT); memcpy(pComponentPrivate->pPortDef[WBAMRENC_OUTPUT_PORT], pCompParam, sizeof(OMX_PARAM_PORTDEFINITIONTYPE)); @@ -1145,7 +1140,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, break; case OMX_IndexParamPriorityMgmt: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPriorityMgmt\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamPriorityMgmt"); memcpy(pComponentPrivate->sPriorityMgmt, (OMX_PRIORITYMGMTTYPE*)pCompParam, sizeof(OMX_PRIORITYMGMTTYPE)); @@ -1154,7 +1149,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamAudioInit: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioInit\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioInit"); memcpy(pComponentPrivate->sPortParam, (OMX_PORT_PARAM_TYPE*)pCompParam, sizeof(OMX_PORT_PARAM_TYPE)); @@ -1163,7 +1158,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamStandardComponentRole: OMX_PRDSP2(pComponentPrivate->dbg, - "OMX_IndexParamStandardComponentRole\n"); + "OMX_IndexParamStandardComponentRole"); if (pCompParam) { pRole = (OMX_PARAM_COMPONENTROLETYPE *)pCompParam; memcpy(&(pComponentPrivate->componentRole), @@ -1177,7 +1172,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, break; case OMX_IndexParamAudioPcm: - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPcm\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexParamAudioPcm"); if(pCompParam){ amr_ip = (OMX_AUDIO_PARAM_PCMMODETYPE *)pCompParam; memcpy(pComponentPrivate->pcmParams, @@ -1193,11 +1188,11 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, case OMX_IndexParamCompBufferSupplier: OMX_PRDSP2(pComponentPrivate->dbg, - "OMX_IndexParamCompBufferSupplier\n"); + "OMX_IndexParamCompBufferSupplier"); if(((OMX_PARAM_PORTDEFINITIONTYPE *)(pCompParam))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_INPUT_PORT]->nPortIndex) { OMX_PRINT2(pComponentPrivate->dbg, - "nPortIndex %d\n",WBAMRENC_INPUT_PORT); + "nPortIndex %d",WBAMRENC_INPUT_PORT); sBufferSupplier.eBufferSupplier = OMX_BufferSupplyInput; memcpy(&sBufferSupplier, pCompParam, @@ -1206,7 +1201,7 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, else if(((OMX_PARAM_PORTDEFINITIONTYPE *)(pCompParam))->nPortIndex == pComponentPrivate->pPortDef[WBAMRENC_OUTPUT_PORT]->nPortIndex){ OMX_PRINT2(pComponentPrivate->dbg, - "nPortIndex %d\n",WBAMRENC_OUTPUT_PORT); + "nPortIndex %d",WBAMRENC_OUTPUT_PORT); sBufferSupplier.eBufferSupplier = OMX_BufferSupplyOutput; memcpy(&sBufferSupplier, pCompParam, @@ -1221,14 +1216,13 @@ static OMX_ERRORTYPE SetParameter (OMX_HANDLETYPE hComp, default: { - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorUnsupportedIndex!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorUnsupportedIndex!"); eError = OMX_ErrorUnsupportedIndex; } break; } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "ExitingReturning = 0x%x",eError); return eError; } @@ -1256,7 +1250,7 @@ static OMX_ERRORTYPE GetConfig (OMX_HANDLETYPE hComp, TI_OMX_STREAM_INFO *streamInfo; - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); WBAMRENC_OMX_MALLOC(streamInfo, TI_OMX_STREAM_INFO); @@ -1277,7 +1271,7 @@ static OMX_ERRORTYPE GetConfig (OMX_HANDLETYPE hComp, OMX_WBMEMFREE_STRUCT(streamInfo); EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting, returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting, returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -1310,10 +1304,10 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, AM_COMMANDDATATYPE cmd_data; #endif - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); if (pHandle == NULL) { OMX_ERROR4(pComponentPrivate->dbg, - "Invalid HANDLE OMX_ErrorBadParameter\n"); + "Invalid HANDLE OMX_ErrorBadParameter"); eError = OMX_ErrorBadParameter; goto EXIT; } @@ -1327,11 +1321,11 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, case OMX_IndexCustomWbAmrEncHeaderInfoConfig: { OMX_PRDSP2(pComponentPrivate->dbg, - "OMX_IndexCustomWbAmrEncHeaderInfoConfig\n"); + "OMX_IndexCustomWbAmrEncHeaderInfoConfig"); configData = (TI_OMX_DSP_DEFINITION*)ComponentConfigStructure; if (configData == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } pComponentPrivate->acdnMode = configData->acousticMode; @@ -1344,11 +1338,11 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, } case OMX_WbIndexCustomModeAmrConfig: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeAmrConfig\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeAmrConfig"); customFlag = (OMX_S16*)ComponentConfigStructure; if (customFlag == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } pComponentPrivate->amrMode = *customFlag; @@ -1356,11 +1350,11 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, } case OMX_WbIndexCustomModeDasfConfig: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeDasfConfig\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeDasfConfig"); customFlag = (OMX_S16*)ComponentConfigStructure; if (customFlag == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } pComponentPrivate->dasfMode = *customFlag; @@ -1371,11 +1365,11 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, } case OMX_WbIndexCustomModeMimeConfig: { - OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeMimeConfig\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "OMX_IndexCustomModeMimeConfig"); customFlag = (OMX_S16*)ComponentConfigStructure; if (customFlag == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } pComponentPrivate->frameMode = *customFlag; @@ -1384,11 +1378,11 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, case OMX_WbIndexCustomModeMultiFrameConfig: { OMX_PRDSP2(pComponentPrivate->dbg, - "OMX_WbIndexCustomModeMultiFrameConfig\n"); + "OMX_WbIndexCustomModeMultiFrameConfig"); customFlag = (OMX_S16*)ComponentConfigStructure; if (customFlag == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } pComponentPrivate->nMultiFrameMode = *customFlag; @@ -1407,12 +1401,12 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, if((write(pComponentPrivate->fdwrite, &cmd_data, sizeof(cmd_data)))<0) { OMX_ERROR4(pComponentPrivate->dbg, - "Fail to send command to audio manager\n"); + "Fail to send command to audio manager"); } else { OMX_PRINT1(pComponentPrivate->dbg, - "Success to send command to audio manager\n"); + "Success to send command to audio manager"); } #endif break; @@ -1450,8 +1444,7 @@ static OMX_ERRORTYPE SetConfig (OMX_HANDLETYPE hComp, break; } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting SetConfig\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting SetConfig Returning = 0x%x",eError); return eError; } @@ -1471,24 +1464,25 @@ static OMX_ERRORTYPE GetState (OMX_HANDLETYPE pComponent, OMX_STATETYPE* pState) { OMX_ERRORTYPE eError = OMX_ErrorUndefined; OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE *)pComponent; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering\n"); + WBAMRENC_COMPONENT_PRIVATE *pComponentPrivate = pHandle->pComponentPrivate; + + OMX_PRINT1 (pComponentPrivate->dbg, "Entering"); if (!pState) { eError = OMX_ErrorBadParameter; - OMXDBG_PRINT(stderr, ERROR, 4, 0, "OMX_ErrorBadParameter\n"); + OMX_ERROR4 (pComponentPrivate->dbg, "OMX_ErrorBadParameter"); goto EXIT; } - if (pHandle && pHandle->pComponentPrivate) { + if (pHandle && pComponentPrivate) { *pState = ((WBAMRENC_COMPONENT_PRIVATE*) - pHandle->pComponentPrivate)->curState; + pComponentPrivate)->curState; } else { *pState = OMX_StateLoaded; } eError = OMX_ErrorNone; EXIT: - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Exiting GetState\n"); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Returning = 0x%x\n",eError); + OMX_PRINT1 (pComponentPrivate->dbg, "Exiting GetState Returning = 0x%x",eError); return eError; } @@ -1531,52 +1525,52 @@ static OMX_ERRORTYPE EmptyThisBuffer (OMX_HANDLETYPE pComponent, PERF_ModuleHLMM); #endif - OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering\n"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering"); if (pBuffer == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter!"); goto EXIT; } if (pBuffer->nSize != sizeof(OMX_BUFFERHEADERTYPE)) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadParameter!"); goto EXIT; } if (!pPortDef->bEnabled) { eError = OMX_ErrorIncorrectStateOperation; OMX_ERROR4(pComponentPrivate->dbg, - "OMX_ErrorIncorrectStateOperation!\n"); + "OMX_ErrorIncorrectStateOperation!"); goto EXIT; } if (pBuffer->nVersion.nVersion != pComponentPrivate->nVersion) { eError = OMX_ErrorVersionMismatch; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorVersionMismatch!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorVersionMismatch!"); goto EXIT; } if (pBuffer->nInputPortIndex != WBAMRENC_INPUT_PORT) { eError = OMX_ErrorBadPortIndex; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex!"); goto EXIT; } if (pComponentPrivate->curState != OMX_StateExecuting && pComponentPrivate->curState != OMX_StatePause) { eError= OMX_ErrorIncorrectStateOperation; OMX_PRDSP4(pComponentPrivate->dbg, - "OMX_ErrorIncorrectStateOperation!\n"); + "OMX_ErrorIncorrectStateOperation!"); goto EXIT; } OMX_PRBUFFER2(pComponentPrivate->dbg, - "--------------------------------------------------------\n"); + "--------------------------------------------------------"); OMX_PRBUFFER2(pComponentPrivate->dbg, - "Sending Filled ip buff = %p to CompThread\n",pBuffer); + "Sending Filled ip buff = %p to CompThread",pBuffer); OMX_PRBUFFER2(pComponentPrivate->dbg, - "--------------------------------------------------------\n"); + "--------------------------------------------------------"); pComponentPrivate->app_nBuf--; pComponentPrivate->ProcessingInputBuf++; @@ -1587,14 +1581,13 @@ static OMX_ERRORTYPE EmptyThisBuffer (OMX_HANDLETYPE pComponent, sizeof(OMX_BUFFERHEADERTYPE*)); if (ret == -1) { OMX_ERROR4(pComponentPrivate->dbg, - "Error in Writing to the Data pipe\n"); + "Error in Writing to the Data pipe"); eError = OMX_ErrorHardware; goto EXIT; } pComponentPrivate->nEmptyThisBufferCount++; EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -1635,36 +1628,36 @@ static OMX_ERRORTYPE FillThisBuffer (OMX_HANDLETYPE pComponent, PERF_ModuleHLMM); #endif - OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering\n"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering"); if (pBuffer == NULL) { eError = OMX_ErrorBadParameter; - OMX_ERROR4(pComponentPrivate->dbg, " OMX_ErrorBadParameter!\n"); + OMX_ERROR4(pComponentPrivate->dbg, " OMX_ErrorBadParameter!"); goto EXIT; } if (pBuffer->nSize != sizeof(OMX_BUFFERHEADERTYPE)) { eError = OMX_ErrorBadParameter; - OMX_PRINT1(pComponentPrivate->dbg, "OMX_ErrorBadParameter!\n"); + OMX_PRINT1(pComponentPrivate->dbg, "OMX_ErrorBadParameter!"); goto EXIT; } if (!pPortDef->bEnabled) { eError = OMX_ErrorIncorrectStateOperation; OMX_ERROR4(pComponentPrivate->dbg, - "OMX_ErrorIncorrectStateOperation!\n"); + "OMX_ErrorIncorrectStateOperation!"); goto EXIT; } if (pBuffer->nVersion.nVersion != pComponentPrivate->nVersion) { eError = OMX_ErrorVersionMismatch; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorVersionMismatch\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorVersionMismatch"); goto EXIT; } if (pBuffer->nOutputPortIndex != WBAMRENC_OUTPUT_PORT) { eError = OMX_ErrorBadPortIndex; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex"); goto EXIT; } @@ -1672,7 +1665,7 @@ static OMX_ERRORTYPE FillThisBuffer (OMX_HANDLETYPE pComponent, pComponentPrivate->curState != OMX_StatePause) { eError = OMX_ErrorIncorrectStateOperation; OMX_ERROR4(pComponentPrivate->dbg, - "OMX_ErrorIncorrectStateOperation\n"); + "OMX_ErrorIncorrectStateOperation"); goto EXIT; } @@ -1690,11 +1683,7 @@ static OMX_ERRORTYPE FillThisBuffer (OMX_HANDLETYPE pComponent, } OMX_PRBUFFER2(pComponentPrivate->dbg, - "--------------------------------------------------------\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, - "Sending Emptied op buff = %p to CompThread\n",pBuffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, - "--------------------------------------------------------\n"); + "Sending Emptied op buff = %p to CompThread",pBuffer); pComponentPrivate->ProcessingOutputBuf++; ret = write (pComponentPrivate->dataPipe[1], @@ -1702,14 +1691,13 @@ static OMX_ERRORTYPE FillThisBuffer (OMX_HANDLETYPE pComponent, sizeof (OMX_BUFFERHEADERTYPE*)); if (ret == -1) { OMX_ERROR4(pComponentPrivate->dbg, - "Error in Writing to the Data pipe\n"); + "Error in Writing to the Data pipe"); eError = OMX_ErrorHardware; goto EXIT; } pComponentPrivate->nFillThisBufferCount++; EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } /*-------------------------------------------------------------------*/ @@ -1734,7 +1722,7 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle) struct OMX_TI_Debug dbg; dbg = pComponentPrivate->dbg; - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); #ifdef __PERF_INSTRUMENTATION__ PERF_Boundary(pComponentPrivate->pPERF, PERF_BoundaryStart | PERF_BoundaryCleanup); @@ -1752,12 +1740,12 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle) NULL); if (eError != OMX_ErrorNone) { OMX_ERROR4(dbg, - "Error returned from destroy ResourceManagerProxy thread\n"); + "Error returned from destroy ResourceManagerProxy thread"); } eError = RMProxy_Deinitalize(); if (eError != OMX_ErrorNone) { - OMX_ERROR4(dbg, "Error from RMProxy_Deinitalize\n"); + OMX_ERROR4(dbg, "Error from RMProxy_Deinitalize"); goto EXIT; } #endif @@ -1765,14 +1753,14 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle) pComponentPrivate->bIsThreadstop = 1; eError = WBAMRENC_StopComponentThread(pHandle); if (eError != OMX_ErrorNone) { - OMX_ERROR4(dbg, "Error from WBAMRENC_StopComponentThread\n"); + OMX_ERROR4(dbg, "Error from WBAMRENC_StopComponentThread"); goto EXIT; } /* Wait for thread to exit so we can get the status into "eError" */ /* close the pipe handles */ eError = WBAMRENC_FreeCompResources(pHandle); if (eError != OMX_ErrorNone) { - OMX_ERROR4(dbg, "Error from WBAMRENC_FreeCompResources\n"); + OMX_ERROR4(dbg, "Error from WBAMRENC_FreeCompResources"); goto EXIT; } @@ -1787,8 +1775,7 @@ static OMX_ERRORTYPE ComponentDeInit(OMX_HANDLETYPE pHandle) OMX_WBMEMFREE_STRUCT(pComponentPrivate); EXIT: - OMX_PRINT1(dbg, "Exiting ComponentDeInit\n"); - OMX_PRINT1(dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(dbg, "Exiting ComponentDeInit Returning = 0x%x",eError); OMX_DBG_CLOSE(dbg); return eError; } @@ -1817,9 +1804,9 @@ static OMX_ERRORTYPE ComponentTunnelRequest (OMX_HANDLETYPE hComp, { OMX_ERRORTYPE eError = OMX_ErrorNone; eError = OMX_ErrorNotImplemented; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering\n"); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Exiting\n"); - OMXDBG_PRINT(stderr, PRINT, 2, 0, "Returning = 0x%x\n",eError); + OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering"); + OMXDBG_PRINT(stderr, PRINT, 1, 0, "Exiting"); + OMXDBG_PRINT(stderr, PRINT, 2, 0, "Returning = 0x%x",eError); return eError; } @@ -1858,10 +1845,10 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, goto EXIT; } #endif - OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering\n"); - OMX_PRINT2(pComponentPrivate->dbg, "pPortDef = %p\n",pPortDef); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Entering"); + OMX_PRINT2(pComponentPrivate->dbg, "pPortDef = %p",pPortDef); OMX_PRINT2(pComponentPrivate->dbg, - "pPortDef->bEnabled = %d\n",pPortDef->bEnabled); + "pPortDef->bEnabled = %d",pPortDef->bEnabled); while (!pPortDef->bEnabled) { pComponentPrivate->AlloBuf_waitingsignal = 1; @@ -1899,7 +1886,7 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, if (pComponentPrivate->pInputBufferList->numBuffers == pPortDef->nBufferCountActual) { pPortDef->bPopulated = OMX_TRUE; OMX_PRINT2(pComponentPrivate->dbg, - "pPortDef->bPopulated = %d\n", pPortDef->bPopulated); + "pPortDef->bPopulated = %d", pPortDef->bPopulated); } } else if (nPortIndex == WBAMRENC_OUTPUT_PORT) { @@ -1912,12 +1899,12 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, if (pComponentPrivate->pOutputBufferList->numBuffers == pPortDef->nBufferCountActual) { pPortDef->bPopulated = OMX_TRUE; OMX_PRINT2(pComponentPrivate->dbg, - "pPortDef->bPopulated = %d\n", pPortDef->bPopulated); + "pPortDef->bPopulated = %d", pPortDef->bPopulated); } } else { eError = OMX_ErrorBadPortIndex; - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorBadPortIndex"); goto EXIT; } @@ -1960,8 +1947,7 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, PERF_ModuleMemory); #endif - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } @@ -1996,21 +1982,21 @@ static OMX_ERRORTYPE FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, pHandle = (OMX_COMPONENTTYPE *) pComponentPrivate->pHandle; - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); for (i=0; i < WBAMRENC_MAX_NUM_OF_BUFS; i++) { buff = pComponentPrivate->pInputBufferList->pBufHdr[i]; if (buff == pBuffer) { OMX_PRBUFFER2(pComponentPrivate->dbg, - "Found matching input buffer\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p\n",buff); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); + "Found matching input buffer"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p",buff); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); inputIndex = i; break; } else { - OMX_PRBUFFER2(pComponentPrivate->dbg, "This is not a match\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p\n",buff); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); + OMX_PRBUFFER2(pComponentPrivate->dbg, "This is not a match"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p",buff); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); } } @@ -2018,16 +2004,16 @@ static OMX_ERRORTYPE FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, buff = pComponentPrivate->pOutputBufferList->pBufHdr[i]; if (buff == pBuffer) { OMX_PRBUFFER2(pComponentPrivate->dbg, - "Found matching output buffer\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p\n",buff); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); + "Found matching output buffer"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p",buff); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); outputIndex = i; break; } else { - OMX_PRBUFFER2(pComponentPrivate->dbg, "This is not a match\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p\n",buff); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); + OMX_PRBUFFER2(pComponentPrivate->dbg, "This is not a match"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "buff = %p",buff); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); } } @@ -2103,12 +2089,12 @@ static OMX_ERRORTYPE FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, } } else { - OMX_ERROR4(pComponentPrivate->dbg, "Returning OMX_ErrorBadParameter\n"); + OMX_ERROR4(pComponentPrivate->dbg, "Returning OMX_ErrorBadParameter"); eError = OMX_ErrorBadParameter; } OMX_PRBUFFER2(pComponentPrivate->dbg, - "num input buffers %d, \n num output buffers %d,\n InIdle_goingtoloaded %d\n", + "num input buffers %d, \n num output buffers %d,\n InIdle_goingtoloaded %d", (int)pComponentPrivate->pInputBufferList->numBuffers, (int)pComponentPrivate->pOutputBufferList->numBuffers, pComponentPrivate->InIdle_goingtoloaded); @@ -2137,8 +2123,7 @@ static OMX_ERRORTYPE FreeBuffer(OMX_IN OMX_HANDLETYPE hComponent, NULL); } - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } @@ -2176,12 +2161,12 @@ static OMX_ERRORTYPE UseBuffer (OMX_IN OMX_HANDLETYPE hComponent, } #endif pPortDef = ((WBAMRENC_COMPONENT_PRIVATE*)pComponentPrivate)->pPortDef[nPortIndex]; - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pPortDef->bPopulated = %d\n", + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pPortDef->bPopulated = %d", pPortDef->bPopulated); if(!pPortDef->bEnabled) { - OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorIncorrectStateOperation\n"); + OMX_ERROR4(pComponentPrivate->dbg, "OMX_ErrorIncorrectStateOperation"); eError = OMX_ErrorIncorrectStateOperation; goto EXIT; } @@ -2247,8 +2232,7 @@ static OMX_ERRORTYPE UseBuffer (OMX_IN OMX_HANDLETYPE hComponent, PERF_ModuleHLMM); #endif EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); - OMX_PRINT1(pComponentPrivate->dbg, "Returning = 0x%x\n",eError); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Returning = 0x%x",eError); return eError; } @@ -2271,7 +2255,7 @@ static OMX_ERRORTYPE GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *) (((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); if(!(strcmp(cParameterName,"OMX.TI.index.config.wbamrheaderinfo"))) { *pIndexType = OMX_IndexCustomWbAmrEncHeaderInfoConfig; @@ -2291,7 +2275,7 @@ static OMX_ERRORTYPE GetExtensionIndex(OMX_IN OMX_HANDLETYPE hComponent, eError = OMX_ErrorBadParameter; } - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting"); return eError; } @@ -2370,19 +2354,19 @@ static OMX_ERRORTYPE ComponentRoleEnum( pComponentPrivate = (WBAMRENC_COMPONENT_PRIVATE *)(((OMX_COMPONENTTYPE*)hComponent)->pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "Entering\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Entering"); if(nIndex == 0){ memcpy(cRole, &pComponentPrivate->componentRole.cRole, sizeof(OMX_U8) * OMX_MAX_STRINGNAME_SIZE); OMX_PRINT2(pComponentPrivate->dbg, - "cRole is set to %s for nIndex %ld\n",cRole,nIndex); + "cRole is set to %s for nIndex %ld",cRole,nIndex); } else { eError = OMX_ErrorNoMore; } - OMX_PRINT1(pComponentPrivate->dbg, "Exiting\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting"); return eError; } diff --git a/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h b/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h index c892ad9..fbe2b90 100644 --- a/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h +++ b/omx/audio/src/openmax_il/wma_dec/inc/OMX_WmaDec_Utils.h @@ -459,7 +459,7 @@ typedef struct OMXBufferStatus /*BUFFERSTATUS*/ 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_); #define WMAD_OMX_MALLOC_SIZE(_ptr_, _size_,_name_) \ @@ -472,7 +472,7 @@ typedef struct OMXBufferStatus /*BUFFERSTATUS*/ 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_); /* ======================================================================= */ @@ -482,7 +482,7 @@ typedef struct OMXBufferStatus /*BUFFERSTATUS*/ /* ======================================================================= */ #define OMX_WMADECMEMFREE_STRUCT(_pStruct_) \ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: [FREE] %p\n",__LINE__,_pStruct_); \ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: [FREE] %p\n",__LINE__,_pStruct_); \ if(_pStruct_ != NULL){ \ newfree(_pStruct_); \ _pStruct_ = NULL; \ @@ -1340,7 +1340,7 @@ OMX_U32 WMADEC_GetBits(OMX_U32* nPosition, OMX_U8 nBits, OMX_U8* pBuffer, OMX_BO /*@return OMX_ErrorNone = No error */ /* OMX Error code = Error */ /* =========================================================================*/ -OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData); +OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData, struct OMX_TI_Debug dbg); diff --git a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_Utils.c b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_Utils.c index 6f57378..1ee42fb 100644 --- a/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_Utils.c +++ b/omx/audio/src/openmax_il/wma_dec/src/OMX_WmaDec_Utils.c @@ -133,13 +133,13 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, pComponentPrivate_CC = pComponentPrivate; pHandle = (LCML_DSP_INTERFACE *)pComponent; - OMX_PRINT2(pComponentPrivate->dbg, "[WMADECFill_LCMLInitParams] pComponent = %p\n",pComponent); - OMX_PRINT2(pComponentPrivate->dbg, "[WMADECFill_LCMLInitParams] pComponentPrivate = %p\n", + OMX_PRINT2(pComponentPrivate->dbg, "[WMADECFill_LCMLInitParams] pComponent = %p",pComponent); + OMX_PRINT2(pComponentPrivate->dbg, "[WMADECFill_LCMLInitParams] pComponentPrivate = %p", pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entered WMADECFill_LCMLInitParams\n",__LINE__); - OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pComponentPrivate = %p\n", + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entered WMADECFill_LCMLInitParams",__LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pComponentPrivate = %p", __LINE__,pComponentPrivate); - OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pHandle = %p\n",__LINE__, + OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pHandle = %p",__LINE__, pHandle); nIpBuf = pComponentPrivate->pInputBufferList->numBuffers; @@ -177,7 +177,7 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, plcml_Init->NodeInfo.AllUUIDs[2].eDllType = DLL_DEPENDENT; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); plcml_Init->DeviceInfo.TypeofDevice =0; WMAD_OMX_MALLOC_SIZE(pComponentPrivate->pDynParams, sizeof(WMADEC_UALGParams) + 256,WMADEC_UALGParams); @@ -190,10 +190,10 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, if(pComponentPrivate_CC->dasfmode == 1) { WMAD_OMX_MALLOC_SIZE(pComponentPrivate->pParams, sizeof(WMADEC_AudioCodecParams) + 256, WMADEC_AudioCodecParams); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pComponentPrivate->pParams); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pComponentPrivate->pParams); if(NULL == pComponentPrivate->pParams) { - OMX_ERROR4(pComponentPrivate->dbg, "Memory Allocation Failed\n"); + OMX_ERROR4(pComponentPrivate->dbg, "Memory Allocation Failed"); eError = OMX_ErrorInsufficientResources; goto EXIT; } @@ -202,17 +202,17 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, pComponentPrivate->pParams = (WMADEC_AudioCodecParams*)pTemp_char; WMAD_OMX_MALLOC(strmAttr, LCML_STRMATTR); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,strmAttr); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,strmAttr); if (strmAttr == NULL) { - OMX_ERROR4(pComponentPrivate->dbg, "strmAttr - failed to malloc\n"); + OMX_ERROR4(pComponentPrivate->dbg, "strmAttr - failed to malloc"); eError = OMX_ErrorInsufficientResources; goto EXIT; } pComponentPrivate_CC->strmAttr = strmAttr; - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,strmAttr); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,strmAttr); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); strmAttr->uSegid = 0; strmAttr->uAlignment = 0; @@ -220,14 +220,14 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, strmAttr->uBufsize = pComponentPrivate->pPortDef[OUTPUT_PORT]->nBufferSize; strmAttr->uNumBufs = NUM_WMADEC_OUTPUT_BUFFERS_DASF; strmAttr->lMode = STRMMODE_PROCCOPY; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); plcml_Init->DeviceInfo.TypeofDevice =1; plcml_Init->DeviceInfo.AllUUIDs[0].uuid = &DCTN_TI_UUID; plcml_Init->DeviceInfo.DspStream = strmAttr; } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); /*copy the other information */ plcml_Init->SegID = OMX_WMADEC_DEFAULT_SEGMENT; @@ -235,16 +235,16 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, plcml_Init->Alignment = 0; plcml_Init->Priority = OMX_WMADEC_SN_PRIORITY; plcml_Init->ProfileID = -1; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate_CC->iWmaSamplingFrequeny = WMADEC_DEFAULT_SAMPLING_FREQUENCY; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); /*Accessing these 2 has the problem/creates problem in state transition tests*/ pComponentPrivate_CC->iWmaChannels = pComponentPrivate_CC->wmaParams[OUTPUT_PORT]->nChannels; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); arr[0] = WMADEC_STREAM_COUNT; arr[1] = INPUT_PORT; @@ -267,7 +267,7 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, } else { - OMX_PRDSP2(pComponentPrivate->dbg, "FILE MODE\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "FILE MODE"); arr[5] = DMM; if (pComponentPrivate_CC->pOutputBufferList->numBuffers) { @@ -278,17 +278,17 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, arr[6] = 1; } } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); index = WMADEC_STREAM_COUNT * 3 + 1; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); #ifndef UNDER_CE arr[index] = END_OF_CR_PHASE_ARGS; for (i=0; i < index+1; i++) { - OMX_PRINT2(pComponentPrivate->dbg, "arr[%d] = %d\n",i,arr[i]); + OMX_PRINT2(pComponentPrivate->dbg, "arr[%d] = %d",i,arr[i]); } #else @@ -297,11 +297,11 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, plcml_Init->pCrPhArgs = arr; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); size_lcml = nIpBuf * sizeof(LCML_WMADEC_BUFHEADERTYPE); WMAD_OMX_MALLOC_SIZE(pTemp_lcml, size_lcml, LCML_WMADEC_BUFHEADERTYPE); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml); - OMX_PRDSP2(pComponentPrivate->dbg, "Line %d::pTemp_lcml = %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml); + OMX_PRDSP2(pComponentPrivate->dbg, "Line %d::pTemp_lcml = %p",__LINE__,pTemp_lcml); if(pTemp_lcml == NULL) { /* Free previously allocated memory before bailing */ @@ -311,7 +311,7 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, } pComponentPrivate_CC->pLcmlBufHeader[INPUT_PORT] = pTemp_lcml; - OMX_PRBUFFER2(pComponentPrivate->dbg, "nIpBuf = %ld\n",nIpBuf); + OMX_PRBUFFER2(pComponentPrivate->dbg, "nIpBuf = %ld",nIpBuf); for (i=0; i<nIpBuf; i++) { pTemp = pComponentPrivate_CC->pInputBufferList->pBufHdr[i]; @@ -338,12 +338,12 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, pTemp_char += 128; pTemp_lcml->pIpParam = (WMADEC_UAlgInBufParamStruct*)pTemp_char; - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml->pIpParam); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml->pIpParam); if (pTemp_lcml->pIpParam == NULL) { /* Free previously allocated memory before bailing */ OMX_WMADECMEMFREE_STRUCT(strmAttr); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:::[FREE] %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:::[FREE] %p",__LINE__,pTemp_lcml); OMX_WMADECMEMFREE_STRUCT(pTemp_lcml ); goto EXIT; @@ -361,7 +361,7 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParams(OMX_COMPONENTTYPE* pComponent, * This memory pointer will be sent to LCML */ size_lcml = pComponentPrivate_CC->pOutputBufferList->numBuffers * sizeof(LCML_WMADEC_BUFHEADERTYPE); WMAD_OMX_MALLOC_SIZE(pTemp_lcml, size_lcml, LCML_WMADEC_BUFHEADERTYPE); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml); if(pTemp_lcml == NULL) { /* Free previously allocated memory before bailing */ @@ -434,14 +434,14 @@ OMX_ERRORTYPE WMADEC_StartComponentThread(OMX_HANDLETYPE pComponent) attr.__schedparam.__sched_priority = OMX_AUDIO_DECODER_THREAD_PRIORITY; #endif - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADEC_StartComponentThread\n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADEC_StartComponentThread", __LINE__); /* Initialize all the variables*/ pComponentPrivate->bIsStopping = 0; pComponentPrivate->bIsEOFSent = 0; - OMX_PRINT2(pComponentPrivate->dbg, "WMADEC_StartComponentThread pComponentPrivate = %p\n", + OMX_PRINT2(pComponentPrivate->dbg, "WMADEC_StartComponentThread pComponentPrivate = %p", pComponentPrivate); /* create the pipe used to send buffers to the thread */ eError = pipe (pComponentPrivate->cmdDataPipe); @@ -511,9 +511,9 @@ OMX_ERRORTYPE WMADEC_FreeCompResources(OMX_HANDLETYPE pComponent) OMX_U32 nIpBuf = 0; OMX_U32 nOpBuf = 0; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: WMADEC_FreeCompResources\n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: WMADEC_FreeCompResources", __LINE__); - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d:::pComponentPrivate->bPortDefsAllocated = %ld\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d:::pComponentPrivate->bPortDefsAllocated = %ld", __LINE__,pComponentPrivate->bPortDefsAllocated); if (pComponentPrivate->bPortDefsAllocated) { @@ -548,77 +548,77 @@ OMX_ERRORTYPE WMADEC_FreeCompResources(OMX_HANDLETYPE pComponent) eError = OMX_ErrorHardware; } - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); err = close (pComponentPrivate->cmdDataPipe[0]); - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); if (0 != err && OMX_ErrorNone == eError) { - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); eError = OMX_ErrorHardware; - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing cmdPipe\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing cmdPipe",__LINE__); } - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); err = close (pComponentPrivate->cmdDataPipe[1]); - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); if (0 != err && OMX_ErrorNone == eError) { - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); eError = OMX_ErrorHardware; - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing cmdPipe\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing cmdPipe",__LINE__); } } if (pComponentPrivate->bPortDefsAllocated) { - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); if (pComponentPrivate->pPortDef[INPUT_PORT]) { - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); OMX_PRCOMM2(pComponentPrivate->dbg, "freeing pComponentPrivate->pPortDef[INPUT_PORT] = \ - %p\n",pComponentPrivate->pPortDef[INPUT_PORT]); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + %p",pComponentPrivate->pPortDef[INPUT_PORT]); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->pPortDef[INPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->pPortDef[INPUT_PORT]); } - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); if (pComponentPrivate->pPortDef[OUTPUT_PORT]) { - OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] \n", __LINE__); - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT] = %p\n", + OMX_PRINT1(pComponentPrivate->dbg, "%d:::[WMADEC_FreeCompResources] ", __LINE__); + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT] = %p", pComponentPrivate->pPortDef[OUTPUT_PORT]); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->pPortDef[OUTPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->pPortDef[OUTPUT_PORT]); } if (pComponentPrivate->wmaParams[INPUT_PORT]) { - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->wmaParams[INPUT_PORT] = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->wmaParams[INPUT_PORT] = %p", pComponentPrivate->wmaParams[INPUT_PORT]); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->wmaParams[INPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->wmaParams[INPUT_PORT]); } if (pComponentPrivate->wmaParams[OUTPUT_PORT]) { - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->wmaParams[OUTPUT_PORT] = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->wmaParams[OUTPUT_PORT] = %p", pComponentPrivate->wmaParams[OUTPUT_PORT]); - OMX_PRCOMM2(pComponentPrivate->dbg, "wmaParams[OUTPUT_PORT]->nPortIndex = %ld\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "wmaParams[OUTPUT_PORT]->nPortIndex = %ld", pComponentPrivate->wmaParams[OUTPUT_PORT]->nPortIndex); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->wmaParams[OUTPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->wmaParams[OUTPUT_PORT]); OMX_PRCOMM2(pComponentPrivate->dbg, "after pComponentPrivate->wmaParams[OUTPUT_PORT] = \ - %p\n",pComponentPrivate->wmaParams[OUTPUT_PORT]); + %p",pComponentPrivate->wmaParams[OUTPUT_PORT]); } } pComponentPrivate->bPortDefsAllocated = 0; #ifndef UNDER_CE - OMX_PRDSP2(pComponentPrivate->dbg, "\n\n FreeCompResources: Destroying mutexes.\n\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "\n\n FreeCompResources: Destroying mutexes.\n"); pthread_mutex_destroy(&pComponentPrivate->InLoaded_mutex); pthread_cond_destroy(&pComponentPrivate->InLoaded_threshold); @@ -634,7 +634,7 @@ OMX_ERRORTYPE WMADEC_FreeCompResources(OMX_HANDLETYPE pComponent) #endif - OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully WMADEC_FreeCompResources()\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully WMADEC_FreeCompResources()"); return eError; } @@ -670,14 +670,14 @@ OMX_ERRORTYPE WMADEC_CleanupInitParams(OMX_HANDLETYPE pComponent) if (pComponentPrivate->strmAttr) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__,pComponentPrivate->strmAttr); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__,pComponentPrivate->strmAttr); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->strmAttr); } if(pComponentPrivate->pDynParams) { - OMX_PRBUFFER2(pComponentPrivate->dbg, ":: [FREE]: pComponentPrivate->pDynParams = %p\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, ":: [FREE]: pComponentPrivate->pDynParams = %p", pComponentPrivate->pDynParams); pTemp = (char*)pComponentPrivate->pDynParams; @@ -690,7 +690,7 @@ OMX_ERRORTYPE WMADEC_CleanupInitParams(OMX_HANDLETYPE pComponent) } if (pComponentPrivate->dasfmode == 1) { - OMX_PRBUFFER2(pComponentPrivate->dbg, ":: [FREE]: pComponentPrivate->pParams = %p\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, ":: [FREE]: pComponentPrivate->pParams = %p", pComponentPrivate->pParams); pTemp = (char*)pComponentPrivate->pParams; @@ -709,8 +709,8 @@ OMX_ERRORTYPE WMADEC_CleanupInitParams(OMX_HANDLETYPE pComponent) { for(i=0; i<nIpBuf; i++) { - OMX_PRDSP2(pComponentPrivate->dbg, "freeing pTemp_lcml->pIpParam = %p\n", pTemp_lcml->pIpParam); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__,pTemp_lcml->pIpParam); + OMX_PRDSP2(pComponentPrivate->dbg, "freeing pTemp_lcml->pIpParam = %p", pTemp_lcml->pIpParam); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__,pTemp_lcml->pIpParam); pTemp = (char*)pTemp_lcml->pIpParam; if(pTemp != NULL){ @@ -722,21 +722,21 @@ OMX_ERRORTYPE WMADEC_CleanupInitParams(OMX_HANDLETYPE pComponent) pTemp_lcml++; } } - OMX_PRCOMM2(pComponentPrivate->dbg, "freeing pComponentPrivate->pLcmlBufHeader[INPUT_PORT] = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "freeing pComponentPrivate->pLcmlBufHeader[INPUT_PORT] = %p", pComponentPrivate->pLcmlBufHeader[INPUT_PORT]); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->pLcmlBufHeader[INPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->pLcmlBufHeader[INPUT_PORT]); - OMX_PRCOMM2(pComponentPrivate->dbg, "freeing pComponentPrivate->pLcmlBufHeader[OUTPUT_PORT] = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "freeing pComponentPrivate->pLcmlBufHeader[OUTPUT_PORT] = %p", pComponentPrivate->pLcmlBufHeader[OUTPUT_PORT]); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[FREE] %p",__LINE__, pComponentPrivate->pLcmlBufHeader[OUTPUT_PORT]); OMX_WMADECMEMFREE_STRUCT(pComponentPrivate->pLcmlBufHeader[OUTPUT_PORT]); - OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully WMADEC_CleanupInitParams()\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully WMADEC_CleanupInitParams()"); return eError; } @@ -769,14 +769,14 @@ OMX_ERRORTYPE WMADEC_StopComponentThread(OMX_HANDLETYPE pComponent) /*Join the component thread */ pComponentPrivate->bIsStopping = 1; write (pComponentPrivate->cmdPipe[1], &pComponentPrivate->bIsStopping, sizeof(OMX_U16)); - OMX_PRINT1(pComponentPrivate->dbg, "%d:::About to call pthread_join\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:::About to call pthread_join",__LINE__); pthreadError = pthread_join (pComponentPrivate->ComponentThread, (void*)&threadError); - OMX_PRDSP2(pComponentPrivate->dbg, "%d:::called pthread_join\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d:::called pthread_join",__LINE__); if (0 != pthreadError) { eError = OMX_ErrorHardware; - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing Component Thread - pthreadError = %d\n", + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing Component Thread - pthreadError = %d", __LINE__,pthreadError); } @@ -784,9 +784,9 @@ OMX_ERRORTYPE WMADEC_StopComponentThread(OMX_HANDLETYPE pComponent) if (OMX_ErrorNone != threadError && OMX_ErrorNone != eError) { eError = OMX_ErrorInsufficientResources; - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing Component Thread\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error while closing Component Thread",__LINE__); } - OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully from Stop Component thread\n"); + OMX_PRINT1(pComponentPrivate->dbg, "Exiting Successfully from Stop Component thread"); return eError; } @@ -822,8 +822,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_COMPONENTTYPE *pHandle = (OMX_COMPONENTTYPE *) pComponentPrivate->pHandle; pLcmlHandle = (LCML_DSP_INTERFACE *) pComponentPrivate->pLcmlHandle; - OMX_PRINT1(pComponentPrivate->dbg, "WMADECHandleCommand\n"); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleCommand Function - curState = %d\n", + OMX_PRINT1(pComponentPrivate->dbg, "WMADECHandleCommand"); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleCommand Function - curState = %d", __LINE__,pComponentPrivate->curState); read (pComponentPrivate->cmdPipe[0], &command, sizeof (command)); if ((int)(read) == -1){ @@ -834,8 +834,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_TI_ErrorSevere, NULL); } - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: Just read from the command pipe\n",__LINE__); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: command = %d\n",__LINE__,command); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: Just read from the command pipe",__LINE__); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: command = %d",__LINE__,command); read (pComponentPrivate->cmdDataPipe[0], &commandData, sizeof (commandData)); if ((int)(read) == -1){ pComponentPrivate->cbInfo.EventHandler (pHandle, @@ -846,8 +846,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) NULL); } - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: command = %d\n",__LINE__,command); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: commandData = %ld\n",__LINE__,commandData); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: command = %d",__LINE__,command); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: commandData = %ld",__LINE__,commandData); #ifdef __PERF_INSTRUMENTATION__ PERF_ReceivedCommand(pComponentPrivate->pPERFcomp, @@ -890,7 +890,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) case OMX_StateInvalid: - OMX_PRSTATE2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd OMX_StateInvalid:\n", + OMX_PRSTATE2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd OMX_StateInvalid:", __LINE__); if (pComponentPrivate->curState == commandedState) @@ -901,7 +901,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_ErrorSameState, OMX_TI_ErrorMinor, NULL); - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n", + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application", __LINE__); } else @@ -914,7 +914,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) eError = LCML_ControlCodec(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlDestroy, (void *)pArgs); } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->curState = OMX_StateInvalid; pComponentPrivate->cbInfo.EventHandler(pHandle, @@ -929,7 +929,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) break; case OMX_StateMax: - OMX_PRSTATE2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd OMX_StateMax::\n", + OMX_PRSTATE2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd OMX_StateMax::", __LINE__); break; } /* End of Switch */ @@ -937,10 +937,10 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } else if (command == OMX_CommandMarkBuffer) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "command OMX_CommandMarkBuffer received %d\n",__LINE__); + OMX_PRBUFFER2(pComponentPrivate->dbg, "command OMX_CommandMarkBuffer received %d",__LINE__); if(!pComponentPrivate->pMarkBuf) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "command OMX_CommandMarkBuffer received %d\n",__LINE__); + OMX_PRBUFFER2(pComponentPrivate->dbg, "command OMX_CommandMarkBuffer received %d",__LINE__); /* TODO Need to handle multiple marks */ pComponentPrivate->pMarkBuf = (OMX_MARKTYPE *)(commandData); } @@ -951,12 +951,12 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) if(commandData == 0x0){ /* disable port */ for (i=0; i < pComponentPrivate->pInputBufferList->numBuffers; i++) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "pComponentPrivate->pInputBufferList->bBufferPending[%ld] = %d\n",i, + OMX_PRBUFFER2(pComponentPrivate->dbg, "pComponentPrivate->pInputBufferList->bBufferPending[%ld] = %d",i, pComponentPrivate->pInputBufferList->bBufferPending[i]); if (WMADEC_IsPending(pComponentPrivate,pComponentPrivate->pInputBufferList->pBufHdr[i],OMX_DirInput)) { /* Real solution is flush buffers from DSP. Until we have the ability to do that we just call EmptyBufferDone() on any pending buffers */ - OMX_PRBUFFER2(pComponentPrivate->dbg, "Forcing EmptyBufferDone\n"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Forcing EmptyBufferDone"); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingFrame(pComponentPrivate->pPERFcomp, PREF(pComponentPrivate->pInputBufferList->pBufHdr[i], pBuffer), @@ -996,11 +996,11 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } } } - OMX_PRCOMM2(pComponentPrivate->dbg, "I'm here Line %d\n",__LINE__); - OMX_PRCOMM2(pComponentPrivate->dbg, "commandData = %ld\n",commandData); - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated = %d\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "I'm here Line %d",__LINE__); + OMX_PRCOMM2(pComponentPrivate->dbg, "commandData = %ld",commandData); + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated = %d", pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated); - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated = %d\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated = %d", pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated); if(commandData == 0x0) @@ -1077,23 +1077,23 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) if(commandData == 0x0 || commandData == -1) { /* enable in port */ - OMX_PRCOMM2(pComponentPrivate->dbg, "setting input port to enabled\n"); + OMX_PRCOMM2(pComponentPrivate->dbg, "setting input port to enabled"); pComponentPrivate->pPortDef[INPUT_PORT]->bEnabled = OMX_TRUE; - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bEnabled = %d\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bEnabled = %d", pComponentPrivate->pPortDef[INPUT_PORT]->bEnabled); } if(commandData == 0x1 || commandData == -1) { /* enable out port */ char *pArgs = "damedesuStr"; - OMX_PRCOMM2(pComponentPrivate->dbg, "============SETTING OUTPUT PORT TO ENABLED====================\n"); + OMX_PRCOMM2(pComponentPrivate->dbg, "============SETTING OUTPUT PORT TO ENABLED===================="); pComponentPrivate->pPortDef[OUTPUT_PORT]->bEnabled = OMX_TRUE; - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT]->bEnabled = %d\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[OUTPUT_PORT]->bEnabled = %d", pComponentPrivate->pPortDef[OUTPUT_PORT]->bEnabled); if (pComponentPrivate->curState == OMX_StateExecuting && pComponentPrivate->bDspStoppedWhileExecuting){ pComponentPrivate->bDspStoppedWhileExecuting = OMX_FALSE; - OMX_PRDSP2(pComponentPrivate->dbg, "=========================CALLING CONTROL START AT POT ENABLE===========================\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "=========================CALLING CONTROL START AT POT ENABLE==========================="); eError = LCML_ControlCodec( ((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlStart,(void *)pArgs); @@ -1101,10 +1101,10 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } } - OMX_PRSTATE2(pComponentPrivate->dbg, "commandData = %ld\n",commandData); - OMX_PRSTATE2(pComponentPrivate->dbg, "pComponentPrivate->curState = %d\n", + OMX_PRSTATE2(pComponentPrivate->dbg, "commandData = %ld",commandData); + OMX_PRSTATE2(pComponentPrivate->dbg, "pComponentPrivate->curState = %d", pComponentPrivate->curState); - OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated = %d\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated = %d", pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated); if(commandData == 0x0 ) { @@ -1149,13 +1149,13 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_CommandPortEnable, OUTPUT_PORT, NULL); if(pComponentPrivate->reconfigOutputPort){ - OMX_PRCOMM2(pComponentPrivate->dbg, "==============================We can send input buffers againg!=========================\n"); + OMX_PRCOMM2(pComponentPrivate->dbg, "==============================We can send input buffers againg!========================="); pComponentPrivate->reconfigOutputPort = 0; WMADECFill_LCMLInitParamsEx(pHandle,commandData); } - OMX_PRBUFFER2(pComponentPrivate->dbg, "=======Before sending pending buffers==============\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pComponentPrivate->nNumInputBufPending=%ld\n",pComponentPrivate->nNumInputBufPending); + OMX_PRBUFFER2(pComponentPrivate->dbg, "=======Before sending pending buffers=============="); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pComponentPrivate->nNumInputBufPending=%ld",pComponentPrivate->nNumInputBufPending); for (i=0; i < pComponentPrivate->nNumInputBufPending; i++){ if (pComponentPrivate->pInputBufHdrPending[i]){ LCML_WMADEC_BUFHEADERTYPE *pLcmlHdr; @@ -1170,8 +1170,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) WMADEC_SetPending(pComponentPrivate, pComponentPrivate->pInputBufHdrPending[i], OMX_DirInput); - OMX_PRBUFFER2(pComponentPrivate->dbg, "QUEUEING INPUT BUFFER\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "nfilledLen= %ld\n",pComponentPrivate->pInputBufHdrPending[i]->nFilledLen); + OMX_PRBUFFER2(pComponentPrivate->dbg, "QUEUEING INPUT BUFFER"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "nfilledLen= %ld",pComponentPrivate->pInputBufHdrPending[i]->nFilledLen); eError = LCML_QueueBuffer(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecInputBuffer, (OMX_U8 *)pComponentPrivate->pInputBufHdrPending[i]->pBuffer, @@ -1182,7 +1182,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) NULL); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "ERROR IN QUEUEBUFFER\n"); + OMX_ERROR4(pComponentPrivate->dbg, "ERROR IN QUEUEBUFFER"); eError = OMX_ErrorHardware; goto EXIT; } @@ -1279,7 +1279,7 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) aParam[1] = 0x1; aParam[2] = 0x0; - OMX_PRCOMM2(pComponentPrivate->dbg, "Flushing output port\n"); + OMX_PRCOMM2(pComponentPrivate->dbg, "Flushing output port"); if (pComponentPrivate->codecFlush_waitingsignal == 0){ pthread_mutex_lock(&pComponentPrivate->codecFlush_mutex); } @@ -1301,8 +1301,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting WMADECHandleCommand Function\n",__LINE__); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Returning %d\n",__LINE__,eError); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting WMADECHandleCommand Function",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Returning %d",__LINE__,eError); return eError; } @@ -1325,8 +1325,8 @@ OMX_U32 WMADECHandleCommand (WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, WMADEC_COMPONENT_PRIVATE *pComponentPrivate) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "At handle data buff from app device string is =%p\n",pComponentPrivate->sDeviceString); - OMX_PRCOMM2(pComponentPrivate->dbg, "At handle databuff from app pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated =%d\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "At handle data buff from app device string is =%p",pComponentPrivate->sDeviceString); + OMX_PRCOMM2(pComponentPrivate->dbg, "At handle databuff from app pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated =%d", pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated); OMX_PARAM_PORTDEFINITIONTYPE* pPortDefIn = NULL; OMX_ERRORTYPE eError = OMX_ErrorNone; @@ -1341,13 +1341,13 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, pComponentPrivate_CC = pComponentPrivate; pLcmlHandle = (LCML_DSP_INTERFACE *)pComponentPrivate->pLcmlHandle; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromApp Function\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromApp Function",__LINE__); /*Find the direction of the received buffer from buffer list */ eError = WMADECGetBufferDirection(pBufHeader, &eDir); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: The PBufHeader is not found in the list\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: The PBufHeader is not found in the list", __LINE__); goto EXIT; } if (pComponentPrivate->curState == OMX_StateIdle){ @@ -1355,13 +1355,13 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, pComponentPrivate->cbInfo.EmptyBufferDone (pComponentPrivate->pHandle, pComponentPrivate->pHandle->pApplicationPrivate, pBufHeader); - OMX_PRBUFFER2(pComponentPrivate->dbg, ":: %d %s In idle state return input buffers\n", __LINE__, __FUNCTION__); + OMX_PRBUFFER2(pComponentPrivate->dbg, ":: %d %s In idle state return input buffers", __LINE__, __FUNCTION__); } else if (eDir == OMX_DirOutput) { pComponentPrivate->cbInfo.FillBufferDone (pComponentPrivate->pHandle, pComponentPrivate->pHandle->pApplicationPrivate, pBufHeader); - OMX_PRBUFFER2(pComponentPrivate->dbg, ":: %d %s In idle state return output buffers\n", __LINE__, __FUNCTION__); + OMX_PRBUFFER2(pComponentPrivate->dbg, ":: %d %s In idle state return output buffers", __LINE__, __FUNCTION__); } goto EXIT; } @@ -1379,14 +1379,14 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, &pLcmlHdr); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid Buffer Came ...\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid Buffer Came ...",__LINE__); goto EXIT; } - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d Comp:: Sending Filled Input buffer = %p, %p to LCML\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d Comp:: Sending Filled Input buffer = %p, %p to LCML", __LINE__,pBufHeader,pBufHeader->pBuffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBufHeader->nFilledLen :%ld \n",pBufHeader->nFilledLen); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBufHeader->nFilledLen :%ld ",pBufHeader->nFilledLen); pLcmlHdr->pIpParam->bLastBuffer = 0; #ifdef __PERF_INSTRUMENTATION__ @@ -1401,7 +1401,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, if(pComponentPrivate->dasfmode == 1) { OMX_U32 pValues[4]; - OMX_PRDSP2(pComponentPrivate->dbg, "%d :: ---- Comp: DASF Functionality is ON ---\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d :: ---- Comp: DASF Functionality is ON ---",__LINE__); if (pComponentPrivate->pHeaderInfo->iChannel == 1) { pComponentPrivate->pParams->iAudioFormat = WMA_MONO_CHANNEL; @@ -1410,16 +1410,16 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, { pComponentPrivate->pParams->iAudioFormat = WMA_STEREO_NON_INTERLEAVED; } - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d\n", pComponentPrivate->pParams->iAudioFormat); + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d", pComponentPrivate->pParams->iAudioFormat); pComponentPrivate->pParams->iStrmId = pComponentPrivate->streamID; pComponentPrivate->pParams->iSamplingRate = pComponentPrivate->pHeaderInfo->iSamplePerSec; - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iSamplingRate = %ld\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iSamplingRate = %ld", pComponentPrivate->pParams->iSamplingRate); - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iStrmId = %ld\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iStrmId = %ld", pComponentPrivate->pParams->iStrmId); - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d", pComponentPrivate->pParams->iAudioFormat); pValues[0] = USN_STRMCMD_SETCODECPARAMS; @@ -1430,7 +1430,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, EMMCodecControlStrmCtrl,(void *)pValues); if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec StreamControl..\n", + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec StreamControl..", __LINE__); goto EXIT; } @@ -1441,26 +1441,26 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, if(pBufHeader->nFlags & OMX_BUFFERFLAG_CODECCONFIG){ pComponentPrivate->bConfigData = 1; /* changed the if statement to use the buffer flag, now this flag doesnt do anything we will leave it for now incase it becomes useful */ - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: UTIL: Before parsing \n",__LINE__); - eError=WMADEC_Parser( pBufHeader->pBuffer,pComponentPrivate->rcaheader); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: UTIL: After parsing \n", __LINE__); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: UTIL: Before parsing ",__LINE__); + eError=WMADEC_Parser( pBufHeader->pBuffer,pComponentPrivate->rcaheader, pComponentPrivate->dbg); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: UTIL: After parsing ", __LINE__); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Parsing invalid ...\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Parsing invalid ...",__LINE__); goto EXIT; } /*******************Updating if needed*********************/ - OMX_ERROR4(pComponentPrivate->dbg, "OLD: pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate=%ld \n",pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate); + OMX_ERROR2(pComponentPrivate->dbg, "OLD: pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate=%ld ",pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate); /* if(pComponentPrivate->wma_op->nSamplingRate != iSamplePerSec){ pComponentPrivate->wma_op->nSamplingRate=iSamplePerSec; pComponentPrivate->reconfigOutputPort=1; - OMX_ERROR4(pComponentPrivate->dbg, "=================RECONFIGURATION NEEDED===============\n"); - OMX_ERROR4(pComponentPrivate->dbg, "NEW: pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate=%d \n",pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate); + OMX_ERROR4(pComponentPrivate->dbg, "=================RECONFIGURATION NEEDED==============="); + OMX_ERROR4(pComponentPrivate->dbg, "NEW: pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate=%d ",pComponentPrivate->wmaParams[OUTPUT_PORT]->nSamplingRate); } if(pComponentPrivate->wma_op->nChannels != iChannel){ pComponentPrivate->wma_op->nChannels = iChannel; pComponentPrivate->reconfigOutputPort=1; - OMX_ERROR4(pComponentPrivate->dbg, "=================RECONFIGURATION NEEDED===============\n"); + OMX_ERROR4(pComponentPrivate->dbg, "=================RECONFIGURATION NEEDED==============="); } if(pComponentPrivate->reconfigOutputPort){ pComponentPrivate->cbInfo.EventHandler(pComponentPrivate->pHandle, @@ -1469,7 +1469,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, OUTPUT_PORT, 0, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "================= sent reconfig event to client===============\n"); */ + OMX_ERROR4(pComponentPrivate->dbg, "================= sent reconfig event to client==============="); */ pBufHeader->nFilledLen = 0; pComponentPrivate->cbInfo.EmptyBufferDone ( pComponentPrivate->pHandle, @@ -1501,7 +1501,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, eError = LCML_ControlCodec(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlAlgCtrl, (void *)p); if(eError != OMX_ErrorNone){ - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec algctrl..\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec algctrl..", __LINE__); goto EXIT; } pComponentPrivate->bBypassDSP = 0; @@ -1510,7 +1510,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, EMMCodecControlStart, (void *)pArgs); if(eError != OMX_ErrorNone){ - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Start..\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Start..", __LINE__); goto EXIT; } pComponentPrivate->SendAfterEOS = 0; @@ -1518,7 +1518,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, if (pBufHeader->nFlags & OMX_BUFFERFLAG_EOS){ pLcmlHdr->pIpParam->bLastBuffer = 1; pComponentPrivate->SendAfterEOS = 1; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: OMX_WmaDec_Utils.c : pComponentPrivate->SendAfterEOS %d\n",__LINE__,pComponentPrivate->SendAfterEOS); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: OMX_WmaDec_Utils.c : pComponentPrivate->SendAfterEOS %d",__LINE__,pComponentPrivate->SendAfterEOS); } /*Store tick count information*/ pComponentPrivate->arrBufIndexTick[pComponentPrivate->IpBufindex] = pBufHeader->nTickCount; @@ -1526,7 +1526,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, pComponentPrivate->arrBufIndex[pComponentPrivate->IpBufindex] = pBufHeader->nTimeStamp; pComponentPrivate->IpBufindex++; pComponentPrivate->IpBufindex %= pComponentPrivate->pPortDef[OUTPUT_PORT]->nBufferCountActual; - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: Output Buffer TimeStamp %lld\n", __LINE__, pComponentPrivate->arrBufIndex[pComponentPrivate->IpBufindex]); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: Output Buffer TimeStamp %lld", __LINE__, pComponentPrivate->arrBufIndex[pComponentPrivate->IpBufindex]); #ifdef ANDROID if(pComponentPrivate->first_buffer) @@ -1555,8 +1555,8 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, memcpy(pBufHeader->pBuffer + 1, &pComponentPrivate->rcaheader->iPayload, 4); pBufHeader->nFilledLen+=5; } - OMX_PRBUFFER2(pComponentPrivate->dbg, "Before sending input buffer\n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pBufHeader->nFilledLen=%ld\n",pBufHeader->nFilledLen); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Before sending input buffer"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pBufHeader->nFilledLen=%ld",pBufHeader->nFilledLen); #endif if (pComponentPrivate->curState == OMX_StateExecuting) { @@ -1576,8 +1576,8 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, NULL); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "ERROR IN QUEUEBUFFER\n"); - OMX_ERROR4(pComponentPrivate->dbg, "%d ::IssuingDSP IP: Error Occurred\n", + OMX_ERROR4(pComponentPrivate->dbg, "ERROR IN QUEUEBUFFER"); + OMX_ERROR4(pComponentPrivate->dbg, "%d ::IssuingDSP IP: Error Occurred", __LINE__); eError = OMX_ErrorHardware; goto EXIT; @@ -1586,16 +1586,16 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, } else { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: UTIL: Bypassing the sending of input buffers to lcml\n",__LINE__); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: UTIL: Bypassing the sending of input buffers to lcml",__LINE__); pComponentPrivate->pInputBufHdrPending[pComponentPrivate->nNumInputBufPending++] = pBufHeader; - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: UTIL: pComponentPrivate->nNumInputBufPending=%ld\n",__LINE__, + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: UTIL: pComponentPrivate->nNumInputBufPending=%ld",__LINE__, pComponentPrivate->nNumInputBufPending); /*pComponentPrivate->cbInfo.EmptyBufferDone (pComponentPrivate->pHandle, pComponentPrivate->pHandle->pApplicationPrivate, pBufHeader ); */ - OMX_PRBUFFER2(pComponentPrivate->dbg, "Don't queue buffers during a reconfig\n"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Don't queue buffers during a reconfig"); } } } @@ -1623,7 +1623,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, else { pComponentPrivate->bBypassDSP = 1; - OMX_PRBUFFER2(pComponentPrivate->dbg, "Forcing EmptyBufferDone\n"); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Forcing EmptyBufferDone"); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingFrame(pComponentPrivate->pPERFcomp, PREF(pComponentPrivate->pInputBufferList->pBufHdr[0], pBuffer), @@ -1663,8 +1663,8 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, else if (eDir == OMX_DirOutput) { pComponentPrivate->nUnhandledFillThisBuffers--; - OMX_PRBUFFER2(pComponentPrivate->dbg, "Sending output buffer to LCML \n"); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d Comp:: Sending Emptied Output buffer=%p to LCML\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "Sending output buffer to LCML "); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d Comp:: Sending Emptied Output buffer=%p to LCML", __LINE__,pBufHeader); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingFrame(pComponentPrivate_CC->pPERFcomp, @@ -1688,7 +1688,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, if (eError != OMX_ErrorNone ) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: IssuingDSP OP: Error Occurred\n", + OMX_ERROR4(pComponentPrivate->dbg, "%d :: IssuingDSP OP: Error Occurred", __LINE__); eError = OMX_ErrorHardware; goto EXIT; @@ -1698,7 +1698,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, } } else{ pComponentPrivate->pOutputBufHdrPending[pComponentPrivate->nNumOutputBufPending++] = pBufHeader; - OMX_PRBUFFER2(pComponentPrivate->dbg, "Don't queue while doing a reconfig:: output buffer, num pending = %ld\n", pComponentPrivate->nNumOutputBufPending); + OMX_PRBUFFER2(pComponentPrivate->dbg, "Don't queue while doing a reconfig:: output buffer, num pending = %ld", pComponentPrivate->nNumOutputBufPending); } }else if (pComponentPrivate->curState == OMX_StatePause) { pComponentPrivate->pOutputBufHdrPending[pComponentPrivate->nNumOutputBufPending++] = pBufHeader; @@ -1710,12 +1710,12 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromApp(OMX_BUFFERHEADERTYPE* pBufHeader, } else { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d : BufferHeader %p, Buffer %p Unknown ..........\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d : BufferHeader %p, Buffer %p Unknown ..........", __LINE__,pBufHeader, pBufHeader->pBuffer); eError = OMX_ErrorBadParameter; } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "%d : Exiting from WMADECHandleDataBuf_FromApp \n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d : Exiting from WMADECHandleDataBuf_FromApp ",__LINE__); return eError; } @@ -1740,14 +1740,14 @@ OMX_ERRORTYPE WMADECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX_DIR OMX_BUFFERHEADERTYPE *pBuf = NULL; int flag = 1, i; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECGetBufferDirection Function\n",__LINE__); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p\n",__LINE__,pComponentPrivate); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECGetBufferDirection Function",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p",__LINE__,pComponentPrivate); /*Search this buffer in input buffers list */ - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: WMADECGetBufferDirection Function\n",__LINE__); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p\n",__LINE__,pComponentPrivate); - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: pComponentPrivate->pInputBufferList = %p\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: WMADECGetBufferDirection Function",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p",__LINE__,pComponentPrivate); + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: pComponentPrivate->pInputBufferList = %p", __LINE__,pComponentPrivate->pInputBufferList); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: pComponentPrivate->pInputBufferList->numBuffers = %d\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d :: pComponentPrivate->pInputBufferList->numBuffers = %d", __LINE__,pComponentPrivate->pInputBufferList->numBuffers); nBuf = pComponentPrivate->pInputBufferList->numBuffers; @@ -1757,7 +1757,7 @@ OMX_ERRORTYPE WMADECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX_DIR if(pBufHeader == pBuf) { *eDir = OMX_DirInput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Buffer %p is INPUT BUFFER\n",__LINE__, pBufHeader); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Buffer %p is INPUT BUFFER",__LINE__, pBufHeader); flag = 0; goto EXIT; } @@ -1772,7 +1772,7 @@ OMX_ERRORTYPE WMADECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX_DIR if(pBufHeader == pBuf) { *eDir = OMX_DirOutput; - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Buffer %p is OUTPUT BUFFER\n",__LINE__, + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Buffer %p is OUTPUT BUFFER",__LINE__, pBufHeader); flag = 0; goto EXIT; @@ -1781,13 +1781,13 @@ OMX_ERRORTYPE WMADECGetBufferDirection(OMX_BUFFERHEADERTYPE *pBufHeader, OMX_DIR if (flag == 1) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Buffer %p is Not Found in the List\n",__LINE__, + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Buffer %p is Not Found in the List",__LINE__, pBufHeader); eError = OMX_ErrorUndefined; goto EXIT; } EXIT: - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Exiting WMADECGetBufferDirection Function\n",__LINE__); + OMX_ERROR1(pComponentPrivate->dbg, "%d :: Exiting WMADECGetBufferDirection Function",__LINE__); return eError; } @@ -1809,25 +1809,25 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromLCML(WMADEC_COMPONENT_PRIVATE* pComponentP int ret = 0; OMX_COMPONENTTYPE* pHandle = (OMX_COMPONENTTYPE*)pComponentPrivate->pHandle; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function\n",__LINE__); - OMX_PRINT2(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p\n",__LINE__, pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function\n", __LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function",__LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: pComponentPrivate = %p",__LINE__, pComponentPrivate); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function", __LINE__); if (ret == -1) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error While reading from the LCML Pipe\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error While reading from the LCML Pipe",__LINE__); eError = OMX_ErrorHardware; goto EXIT; } - OMX_PRINT2(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function\n",__LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function",__LINE__); if (!(pComponentPrivate->bIsStopping)) { if (msgBuffer->eDir == OMX_DirInput) { - OMX_PRCOMM2(pComponentPrivate->dbg, "%d: Component Sending Empty Input buffer%p to App\n",__LINE__,msgBuffer->buffer); - OMX_PRCOMM2(pComponentPrivate->dbg, "Sending Empty INPUT BUFFER to App = %p\n", msgBuffer->buffer->pBuffer); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d: Component Sending Empty Input buffer%p to App",__LINE__,msgBuffer->buffer); + OMX_PRCOMM2(pComponentPrivate->dbg, "Sending Empty INPUT BUFFER to App = %p", msgBuffer->buffer->pBuffer); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingFrame(pComponentPrivate->pPERFcomp, @@ -1843,7 +1843,7 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromLCML(WMADEC_COMPONENT_PRIVATE* pComponentP } else if (msgBuffer->eDir == OMX_DirOutput) { - OMX_PRCOMM2(pComponentPrivate->dbg, "%d: Component Sending Filled Output buffer%p to App size = %ld\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d: Component Sending Filled Output buffer%p to App size = %ld", __LINE__,msgBuffer->buffer,msgBuffer->buffer->nFilledLen); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingFrame(pComponentPrivate->pPERFcomp, @@ -1865,25 +1865,25 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromLCML(WMADEC_COMPONENT_PRIVATE* pComponentP msgBuffer->buffer); pComponentPrivate->nOutStandingFillDones--; - OMX_PRSTATE2(pComponentPrivate->dbg, "nOutstandingFillDones = %ld\n\n", pComponentPrivate->nOutStandingFillDones); + OMX_PRSTATE2(pComponentPrivate->dbg, "nOutstandingFillDones = %ld\n", pComponentPrivate->nOutStandingFillDones); } else { - OMX_PRINT2(pComponentPrivate->dbg, "%d :: Wrong Direction dir = %d\n", __LINE__,msgBuffer->eDir); - OMX_PRDSP2(pComponentPrivate->dbg, "%d: Component Got buffer %p From LCML\n", __LINE__,msgBuffer->buffer); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: Wrong Direction dir = %d", __LINE__,msgBuffer->eDir); + OMX_PRDSP2(pComponentPrivate->dbg, "%d: Component Got buffer %p From LCML", __LINE__,msgBuffer->buffer); eError = OMX_ErrorBadParameter; goto EXIT; } } else { - OMX_PRINT2(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function\n", + OMX_PRINT2(pComponentPrivate->dbg, "%d :: Entering WMADECHandleDataBuf_FromLCML Function", __LINE__); if (msgBuffer->eDir == OMX_DirInput) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d: Component Sending Empty Input buffer%p to App\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d: Component Sending Empty Input buffer%p to App", __LINE__,msgBuffer->buffer); - OMX_PRCOMM2(pComponentPrivate->dbg, "Sending Empty INPUT BUFFER to App = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "Sending Empty INPUT BUFFER to App = %p", msgBuffer->buffer->pBuffer); #ifdef __PERF_INSTRUMENTATION__ @@ -1899,9 +1899,9 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromLCML(WMADEC_COMPONENT_PRIVATE* pComponentP } else if (msgBuffer->eDir == OMX_DirOutput) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d: Component Sending Filled Output buffer%p to App\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d: Component Sending Filled Output buffer%p to App", __LINE__,msgBuffer->buffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, "Sending Filled OUTPUT BUFFER to App = %p\n", + OMX_PRBUFFER2(pComponentPrivate->dbg, "Sending Filled OUTPUT BUFFER to App = %p", msgBuffer->buffer->pBuffer); #ifdef __PERF_INSTRUMENTATION__ @@ -1914,11 +1914,11 @@ OMX_ERRORTYPE WMADECHandleDataBuf_FromLCML(WMADEC_COMPONENT_PRIVATE* pComponentP pHandle->pApplicationPrivate, msgBuffer->buffer); pComponentPrivate->nOutStandingFillDones--; - OMX_PRCOMM2(pComponentPrivate->dbg, "nOutstandingFillDones = %ld\n\n", pComponentPrivate->nOutStandingFillDones); + OMX_PRCOMM2(pComponentPrivate->dbg, "nOutstandingFillDones = %ld\n", pComponentPrivate->nOutStandingFillDones); } } EXIT: - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting WMADECHandleDataBuf_FromLCML Function\n", + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Exiting WMADECHandleDataBuf_FromLCML Function", __LINE__); return eError; } @@ -1959,70 +1959,70 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) phandle = (LCML_DSP_INTERFACE *)args[6]; #endif pLcmlHandle = (LCML_DSP_INTERFACE *)pComponentPrivate_CC->pLcmlHandle; - OMX_PRINT1(pComponentPrivate_CC->dbg, "======================RECEIVED SOME CALLBACK===============\n"); - OMX_PRINT1(pComponentPrivate_CC->dbg, "[CURRENT STATE-------------------------------------->] %d\n", + OMX_PRINT1(pComponentPrivate_CC->dbg, "======================RECEIVED SOME CALLBACK==============="); + OMX_PRINT1(pComponentPrivate_CC->dbg, "[CURRENT STATE-------------------------------------->] %d", pComponentPrivate_CC->curState); switch(event) { case EMMCodecDspError: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecDspError\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecDspError"); break; case EMMCodecInternalError: - OMX_ERROR4(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecInternalError\n"); + OMX_ERROR4(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecInternalError"); break; case EMMCodecInitError: - OMX_ERROR4(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecInitError\n"); + OMX_ERROR4(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecInitError"); break; case EMMCodecDspMessageRecieved: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecDspMessageRecieved\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecDspMessageRecieved"); break; case EMMCodecBufferProcessed: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecBufferProcessed\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecBufferProcessed"); break; case EMMCodecProcessingStarted: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingStarted\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingStarted"); break; case EMMCodecProcessingPaused: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingPaused\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingPaused"); break; case EMMCodecProcessingStoped: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingStoped\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingStoped"); break; case EMMCodecProcessingEof: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingEof\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecProcessingEof"); break; case EMMCodecBufferNotProcessed: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecBufferNotProcessed\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecBufferNotProcessed"); break; case EMMCodecAlgCtrlAck: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecAlgCtrlAck\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecAlgCtrlAck"); break; case EMMCodecStrmCtrlAck: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecStrmCtrlAck\n"); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] EMMCodecStrmCtrlAck"); break; default: - OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] Got event = %d\n",event); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "[LCML CALLBACK EVENT] Got event = %d",event); break; } - OMX_PRINT1(pComponentPrivate_CC->dbg, "%d :: Entering the WMADECLCML_Callback Function\n",__LINE__); + OMX_PRINT1(pComponentPrivate_CC->dbg, "%d :: Entering the WMADECLCML_Callback Function",__LINE__); OMX_PRINT2(pComponentPrivate_CC->dbg, "args = %p ",args[0]); OMX_PRINT2(pComponentPrivate_CC->dbg, "event = %d ",event); if(event == EMMCodecBufferProcessed) { if( (OMX_U32)args [0] == EMMCodecInputBuffer) { - OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: Input: pBuffer = %p\n",__LINE__, pBuffer); + OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: Input: pBuffer = %p",__LINE__, pBuffer); eError = WMADECGetCorresponding_LCMLHeader(pComponentPrivate_CC, pBuffer, OMX_DirInput, @@ -2036,7 +2036,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate_CC->dbg, "%d :: Error: Invalid Buffer Came ...\n",__LINE__); + OMX_ERROR4(pComponentPrivate_CC->dbg, "%d :: Error: Invalid Buffer Came ...",__LINE__); goto EXIT; } @@ -2047,8 +2047,8 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) } else if ((OMX_U32)args [0] == EMMCodecOuputBuffer) { - OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "=======================OUTPUT BUFFER PROCESSED========================\n"); - OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: Output: pBuffer = %p\n",__LINE__, pBuffer); + OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "=======================OUTPUT BUFFER PROCESSED========================"); + OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "%d :: Output: pBuffer = %p",__LINE__, pBuffer); if (!WMADEC_IsValid(pComponentPrivate_CC,pBuffer,OMX_DirOutput)) { /* If the buffer we get back from the DSP is not valid call FillBufferDone @@ -2074,13 +2074,13 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) WMADEC_ClearPending(pComponentPrivate_CC,pLcmlHdr->buffer, OMX_DirOutput); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate_CC->dbg, "%d :: Error: Invalid Buffer Came ...\n", + OMX_ERROR4(pComponentPrivate_CC->dbg, "%d :: Error: Invalid Buffer Came ...", __LINE__); goto EXIT; } pLcmlHdr->buffer->nFilledLen = (OMX_U32)args[8]; - OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "pLcmlHdr->buffer->nFilledLen = %ld\n", pLcmlHdr->buffer->nFilledLen); + OMX_PRBUFFER2(pComponentPrivate_CC->dbg, "pLcmlHdr->buffer->nFilledLen = %ld", pLcmlHdr->buffer->nFilledLen); #ifdef __PERF_INSTRUMENTATION__ PERF_ReceivedFrame(pComponentPrivate_CC->pPERFcomp, @@ -2089,7 +2089,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) PERF_ModuleCommonLayer); pComponentPrivate_CC->lcml_nCntOpReceived++; - OMX_PRDSP2(pComponentPrivate_CC->dbg, "pComponentPrivate_CC->lcml_nCntOpReceived = %ld\n\n", pComponentPrivate_CC->lcml_nCntOpReceived); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "pComponentPrivate_CC->lcml_nCntOpReceived = %ld\n", pComponentPrivate_CC->lcml_nCntOpReceived); if ((pComponentPrivate_CC->nLcml_nCntIp >= 1) && (pComponentPrivate_CC->nLcml_nCntOpReceived == 1)) @@ -2102,14 +2102,14 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) #ifdef UNDER_CE ((OMXBufferStatus*)pLcmlHdr->buffer->pAppPrivate)->FillBufferDone = 1; #endif - OMX_PRBUFFER2(pComponentPrivate_CC->dbg, " OUTPUT RETURNING pBuffer->nFilledLen =%ld\n",pLcmlHdr->buffer->nFilledLen); + OMX_PRBUFFER2(pComponentPrivate_CC->dbg, " OUTPUT RETURNING pBuffer->nFilledLen =%ld",pLcmlHdr->buffer->nFilledLen); WMADECHandleDataBuf_FromLCML(pComponentPrivate_CC, pLcmlHdr); } } } else if (event == EMMCodecStrmCtrlAck) { - LCML_DPRINT("%d :: GOT MESSAGE USN_DSPACK_STRMCTRL ----\n",__LINE__); + OMX_PRDSP2(pComponentPrivate_CC->dbg, "%d :: GOT MESSAGE USN_DSPACK_STRMCTRL ----",__LINE__); if (args[1] == (void *)USN_STRMCMD_FLUSH) { @@ -2139,7 +2139,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) if(pComponentPrivate_CC->codecFlush_waitingsignal == 0){ pComponentPrivate_CC->codecFlush_waitingsignal = 1; pthread_cond_signal(&pComponentPrivate_CC->codecFlush_threshold); - OMX_PRCOMM2(pComponentPrivate_CC->dbg, "flush ack. received. for input port\n"); + OMX_PRCOMM2(pComponentPrivate_CC->dbg, "flush ack. received. for input port"); } pthread_mutex_unlock(&pComponentPrivate_CC->codecFlush_mutex); // mutex above signals that the dsp side has finished flushing and processing can continue @@ -2179,7 +2179,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) if(pComponentPrivate_CC->codecFlush_waitingsignal == 0){ pComponentPrivate_CC->codecFlush_waitingsignal = 1; pthread_cond_signal(&pComponentPrivate_CC->codecFlush_threshold); - OMX_PRCOMM2(pComponentPrivate_CC->dbg, "flush ack. received. for output port\n"); + OMX_PRCOMM2(pComponentPrivate_CC->dbg, "flush ack. received. for output port"); } pthread_mutex_unlock(&pComponentPrivate_CC->codecFlush_mutex); pComponentPrivate_CC->cbInfo.EventHandler(pComponentPrivate_CC->pHandle, @@ -2219,7 +2219,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) if(pComponentPrivate_CC->codecStop_waitingsignal == 0){ pComponentPrivate_CC->codecStop_waitingsignal = 1; pthread_cond_signal(&pComponentPrivate_CC->codecStop_threshold); - OMX_PRCOMM2(pComponentPrivate_CC->dbg, "stop ack. received. stop waiting for sending disable command completed\n"); + OMX_PRCOMM2(pComponentPrivate_CC->dbg, "stop ack. received. stop waiting for sending disable command completed"); } pthread_mutex_unlock(&pComponentPrivate_CC->codecStop_mutex); @@ -2264,11 +2264,11 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) #ifdef _ERROR_PROPAGATION__ for(i=0;i<9;i++) { - OMX_PRINT2(pComponentPrivate_CC->dbg, "arg [%d] = %p \n",i,args[i]); + OMX_PRINT2(pComponentPrivate_CC->dbg, "arg [%d] = %p ",i,args[i]); } /* Cheking for MMU_fault */ - OMX_PRINT2(pComponentPrivate_CC->dbg, "Printing ERROR CODE args 4 =%d\n",(int)args[4]); - OMX_PRINT2(pComponentPrivate_CC->dbg, "Printing ERROR CODE args 5 =%d\n",(int)args[5]); + OMX_PRINT2(pComponentPrivate_CC->dbg, "Printing ERROR CODE args 4 =%d",(int)args[4]); + OMX_PRINT2(pComponentPrivate_CC->dbg, "Printing ERROR CODE args 5 =%d",(int)args[5]); if((args[4] == (void *)USN_ERR_UNKNOWN_MSG) && (args[5] == NULL)) { @@ -2286,7 +2286,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) if (((int)args[4] == USN_ERR_WARNING) && ((int)args[5] == IUALG_WARN_PLAYCOMPLETED)) { - OMX_PRDSP2(pComponentPrivate_CC->dbg, "%d :: GOT MESSAGE IUALG_WARN_PLAYCOMPLETED\n", + OMX_PRDSP2(pComponentPrivate_CC->dbg, "%d :: GOT MESSAGE IUALG_WARN_PLAYCOMPLETED", __LINE__); for (i=0; i < pComponentPrivate_CC->pOutputBufferList->numBuffers; i++) { @@ -2351,9 +2351,9 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) } if(event == EMMCodecDspMessageRecieved) { - OMX_PRSTATE2(pComponentPrivate_CC->dbg, "%d :: commandedState = %p\n",__LINE__,args[0]); - OMX_PRINT2(pComponentPrivate_CC->dbg, "%d :: arg1 = %p\n",__LINE__,args[1]); - OMX_PRINT2(pComponentPrivate_CC->dbg, "%d :: arg2 = %p\n",__LINE__,args[2]); + OMX_PRSTATE2(pComponentPrivate_CC->dbg, "%d :: commandedState = %p",__LINE__,args[0]); + OMX_PRINT2(pComponentPrivate_CC->dbg, "%d :: arg1 = %p",__LINE__,args[1]); + OMX_PRINT2(pComponentPrivate_CC->dbg, "%d :: arg2 = %p",__LINE__,args[2]); } #ifdef _ERROR_PROPAGATION__ @@ -2393,7 +2393,7 @@ OMX_ERRORTYPE WMADECLCML_Callback (TUsnCodecEvent event,void * args [10]) #endif EXIT: - OMX_PRINT1(pComponentPrivate_CC->dbg, "%d :: Exiting the WMADECLCML_Callback Function\n",__LINE__); + OMX_PRINT1(pComponentPrivate_CC->dbg, "%d :: Exiting the WMADECLCML_Callback Function",__LINE__); return eError; } /* -------------------------------------------------------------------*/ @@ -2434,27 +2434,27 @@ OMX_ERRORTYPE WMADECGetCorresponding_LCMLHeader(WMADEC_COMPONENT_PRIVATE *pCompo Sleep(0); #endif } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECGetCorresponding_LCMLHeader..\n",__LINE__); - OMX_PRINT2(pComponentPrivate->dbg, "%d :: eDir = %d\n",__LINE__,eDir); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECGetCorresponding_LCMLHeader..",__LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: eDir = %d",__LINE__,eDir); if(eDir == OMX_DirInput) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate_CC = %p\n",__LINE__, + OMX_PRINT1(pComponentPrivate->dbg, "%d :: pComponentPrivate_CC = %p",__LINE__, pComponentPrivate_CC); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: pComponentPrivate_CC->pLcmlBufHeader[INPUT_PORT] = %p\n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: pComponentPrivate_CC->pLcmlBufHeader[INPUT_PORT] = %p", __LINE__,pComponentPrivate_CC->pLcmlBufHeader[INPUT_PORT]); pLcmlBufHeader = pComponentPrivate_CC->pLcmlBufHeader[INPUT_PORT]; - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: nIpBuf = %d\n",__LINE__,nIpBuf); + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: nIpBuf = %d",__LINE__,nIpBuf); for(i=0; i<nIpBuf; i++) { - OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); - OMX_PRBUFFER1(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); + OMX_PRBUFFER1(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p", pLcmlBufHeader->buffer->pBuffer); if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, "%d::Corresponding LCML Header Found\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d::Corresponding LCML Header Found",__LINE__); goto EXIT; } pLcmlBufHeader++; @@ -2464,21 +2464,21 @@ OMX_ERRORTYPE WMADECGetCorresponding_LCMLHeader(WMADEC_COMPONENT_PRIVATE *pCompo { pLcmlBufHeader = pComponentPrivate_CC->pLcmlBufHeader[OUTPUT_PORT]; - OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer- = %p\n",pLcmlBufHeader->buffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer- = %p",pLcmlBufHeader->buffer); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p", pLcmlBufHeader->buffer->pBuffer); - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: nOpBuf = %d\n",__LINE__,nOpBuf); + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d :: nOpBuf = %d",__LINE__,nOpBuf); for(i=0; i<nOpBuf; i++) { if(pBuffer == pLcmlBufHeader->buffer->pBuffer) { - OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p\n",pBuffer); - OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "pBuffer = %p",pBuffer); + OMX_PRBUFFER2(pComponentPrivate->dbg, "pLcmlBufHeader->buffer->pBuffer = %p", pLcmlBufHeader->buffer->pBuffer); *ppLcmlHdr = pLcmlBufHeader; - OMX_ERROR4(pComponentPrivate->dbg, "%d::Corresponding LCML Header Found\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d::Corresponding LCML Header Found",__LINE__); goto EXIT; } pLcmlBufHeader++; @@ -2486,7 +2486,7 @@ OMX_ERRORTYPE WMADECGetCorresponding_LCMLHeader(WMADEC_COMPONENT_PRIVATE *pCompo } else { - OMX_PRINT1(pComponentPrivate->dbg, "%d:: Invalid Buffer Type :: exiting...\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d:: Invalid Buffer Type :: exiting...",__LINE__); } EXIT: @@ -2530,7 +2530,7 @@ OMX_HANDLETYPE WMADECGetLCMLHandle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) if(eError != OMX_ErrorNone) { eError = OMX_ErrorUndefined; - OMX_ERROR4(pComponentPrivate->dbg, "eError != OMX_ErrorNone...\n"); + OMX_ERROR4(pComponentPrivate->dbg, "eError != OMX_ErrorNone..."); pHandle = NULL; goto EXIT; } @@ -2556,7 +2556,7 @@ OMX_HANDLETYPE WMADECGetLCMLHandle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) hDLL = LoadLibraryEx(TEXT("OAF_BML.dll"), NULL,0); if (hDLL == NULL) { - OMX_ERROR4(pComponentPrivate->dbg, "BML Load Failed!!!\n"); + OMX_ERROR4(pComponentPrivate->dbg, "BML Load Failed!!!"); return pHandle; } @@ -2572,7 +2572,7 @@ OMX_HANDLETYPE WMADECGetLCMLHandle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) eError = fpGetHandle1(&pHandle); if(eError != OMX_ErrorNone) { eError = OMX_ErrorUndefined; - OMX_ERROR4(pComponentPrivate->dbg, "eError != OMX_ErrorNone...\n"); + OMX_ERROR4(pComponentPrivate->dbg, "eError != OMX_ErrorNone..."); pHandle = NULL; return pHandle; } @@ -2665,14 +2665,14 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) LCML_DSP *pLcmlDsp; - OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Idle \n",__LINE__); - OMX_PRINT2(pComponentPrivate->dbg, "curstate = %d\n",pComponentPrivate->curState); + OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Idle ",__LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "curstate = %d",pComponentPrivate->curState); if (pComponentPrivate->curState == OMX_StateIdle) { pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorSameState, OMX_TI_ErrorMinor, NULL); - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application",__LINE__); } else if (pComponentPrivate->curState == OMX_StateLoaded) { @@ -2686,9 +2686,9 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) if(pComponentPrivate->streamID == 0) { - OMX_ERROR4(pComponentPrivate->dbg, "**************************************\n"); - OMX_ERROR4(pComponentPrivate->dbg, ":: Error = OMX_ErrorInsufficientResources\n"); - OMX_ERROR4(pComponentPrivate->dbg, "**************************************\n"); + OMX_ERROR4(pComponentPrivate->dbg, "**************************************"); + OMX_ERROR4(pComponentPrivate->dbg, ":: Error = OMX_ErrorInsufficientResources"); + OMX_ERROR4(pComponentPrivate->dbg, "**************************************"); eError = OMX_ErrorInsufficientResources; pComponentPrivate->curState = OMX_StateInvalid; @@ -2703,13 +2703,13 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } while (1) { - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [INPUT_PORT]->bPopulated %d \n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [INPUT_PORT]->bPopulated %d ", __LINE__,pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [INPUT_PORT]->bEnabled %d \n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [INPUT_PORT]->bEnabled %d ", __LINE__,pComponentPrivate->pPortDef[INPUT_PORT]->bEnabled); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [OUTPUT_PORT]->bPopulated %d \n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [OUTPUT_PORT]->bPopulated %d ", __LINE__,pComponentPrivate->pPortDef[OUTPUT_PORT]->bPopulated); - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [OUTPUT_PORT]->bEnabled %d \n", + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: In while loop OMX_StateLoaded [OUTPUT_PORT]->bEnabled %d ", __LINE__,pComponentPrivate->pPortDef[OUTPUT_PORT]->bEnabled); if (pComponentPrivate->pPortDef[INPUT_PORT]->bPopulated && @@ -2753,13 +2753,13 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) #endif break; } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECHandleCommand\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECHandleCommand",__LINE__); cb.LCML_Callback = (void *) WMADECLCML_Callback; pLcmlHandle = (OMX_HANDLETYPE) WMADECGetLCMLHandle(pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECHandleCommand\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Inside WMADECHandleCommand",__LINE__); if (pLcmlHandle == NULL) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: LCML Handle is NULL........exiting..\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: LCML Handle is NULL........exiting..",__LINE__); goto EXIT; } @@ -2768,38 +2768,38 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) eError = WMADECFill_LCMLInitParams(pHandle, pLcmlDsp, arr); if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error returned from WMADECFill_LCMLInitParams()\n", + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error returned from WMADECFill_LCMLInitParams()", __LINE__); goto EXIT; } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->pLcmlHandle = (LCML_DSP_INTERFACE *)pLcmlHandle; /*filling create phase params */ cb.LCML_Callback = (void *) WMADECLCML_Callback; - OMX_PRDSP2(pComponentPrivate->dbg, "%d :: Calling LCML_InitMMCodec...\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d :: Calling LCML_InitMMCodec...",__LINE__); #ifndef UNDER_CE /* TeeDN will be default for decoder component */ - OMX_PRSTATE2(pComponentPrivate->dbg, "WMA decoder support TeeDN\n"); - OMX_PRDSP2(pComponentPrivate->dbg, "pComponentPrivate Before calling InitMMCodec = %p\n", + OMX_PRSTATE2(pComponentPrivate->dbg, "WMA decoder support TeeDN"); + OMX_PRDSP2(pComponentPrivate->dbg, "pComponentPrivate Before calling InitMMCodec = %p", pComponentPrivate); - OMX_PRINT1(pComponentPrivate->dbg, "&pComponentPrivate = %p\n",&pComponentPrivate); - OMX_PRDSP2(pComponentPrivate->dbg, "pLcmlHandle = %p\n",pLcmlHandle); - OMX_PRINT2(pComponentPrivate->dbg, "p = %p\n",p); - OMX_PRDSP1(pComponentPrivate->dbg, "pLcmlHandle->pCodecinterfacehandle = %p\n", + OMX_PRINT1(pComponentPrivate->dbg, "&pComponentPrivate = %p",&pComponentPrivate); + OMX_PRDSP2(pComponentPrivate->dbg, "pLcmlHandle = %p",pLcmlHandle); + OMX_PRINT2(pComponentPrivate->dbg, "p = %p",p); + OMX_PRDSP1(pComponentPrivate->dbg, "pLcmlHandle->pCodecinterfacehandle = %p", ((LCML_DSP_INTERFACE *)pLcmlHandle)->pCodecinterfacehandle); eError = LCML_InitMMCodecEx(((LCML_DSP_INTERFACE *)pLcmlHandle)->pCodecinterfacehandle, p,&pLcmlHandle,(void *)p,&cb,(OMX_STRING)pComponentPrivate->sDeviceString); - OMX_PRDSP2(pComponentPrivate->dbg, "pComponentPrivate After calling InitMMCodec = %p\n", + OMX_PRDSP2(pComponentPrivate->dbg, "pComponentPrivate After calling InitMMCodec = %p", pComponentPrivate); if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error returned from LCML_Init() error = %d\n",__LINE__, eError); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error returned from LCML_Init() error = %d",__LINE__, eError); goto EXIT; } #else @@ -2807,7 +2807,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) p,&pLcmlHandle,(void *)p,&cb); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error : InitMMCodec failed...>>>>>> \n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error : InitMMCodec failed...>>>>>> ",__LINE__); goto EXIT; } @@ -2817,13 +2817,13 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) /* Enable the Hashing Code */ eError = LCML_SetHashingState(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, OMX_TRUE); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "Failed to set Mapping State\n"); + OMX_ERROR4(pComponentPrivate->dbg, "Failed to set Mapping State"); goto EXIT; } #endif #ifdef RESOURCE_MANAGER_ENABLED - OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: WMADEC: About to call RMProxy_SendCommand\n", __LINE__); + OMX_PRCOMM2(pComponentPrivate->dbg, "%d :: WMADEC: About to call RMProxy_SendCommand", __LINE__); pComponentPrivate->rmproxyCallback.RMPROXY_Callback = (void *) WMAD_ResourceManagerCallback; @@ -2832,7 +2832,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_WMA_Decoder_COMPONENT, WMA_CPU, 1234, NULL); - OMX_PRDSP2(pComponentPrivate->dbg, "%d :: WMADEC: RMProxy_SendCommand returned %d\n", + OMX_PRDSP2(pComponentPrivate->dbg, "%d :: WMADEC: RMProxy_SendCommand returned %d", __LINE__,rm_error); if(rm_error == OMX_ErrorNone) { @@ -2862,10 +2862,10 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_CommandStateSet, pComponentPrivate->curState, NULL); - OMX_ERROR2(pComponentPrivate->dbg, "%d :: WMADEC: Error - insufficient resources\n", __LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: WMADEC: Error - insufficient resources", __LINE__); } #else - OMX_PRSTATE2(pComponentPrivate->dbg, "Setting to OMX_StateIdle - Line %d\n",__LINE__); + OMX_PRSTATE2(pComponentPrivate->dbg, "Setting to OMX_StateIdle - Line %d",__LINE__); pComponentPrivate->curState = OMX_StateIdle; pComponentPrivate->cbInfo.EventHandler( pHandle, pHandle->pApplicationPrivate, @@ -2875,7 +2875,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) NULL); #endif - OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: WMADEC: State has been Set to Idle\n",__LINE__); + OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: WMADEC: State has been Set to Idle",__LINE__); #ifdef __PERF_INSTRUMENTATION__ PERF_Boundary(pComponentPrivate->pPERFcomp,PERF_BoundaryComplete | @@ -2891,7 +2891,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) pLcmlHandle = (LCML_DSP_INTERFACE*)pComponentPrivate->pLcmlHandle; eError = LCML_FlushHashes(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle); if (eError != OMX_ErrorNone) { - OMX_ERROR2(pComponentPrivate->dbg, "Error occurred in Codec mapping flush!\n"); + OMX_ERROR2(pComponentPrivate->dbg, "Error occurred in Codec mapping flush!"); } #endif /*Set the bIsStopping bit */ @@ -2900,7 +2900,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) PERF_BoundarySteadyState); #endif - OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADEC: About to set bIsStopping bit\n", __LINE__); + OMX_PRINT2(pComponentPrivate->dbg, "%d :: WMADEC: About to set bIsStopping bit", __LINE__); if (pComponentPrivate->codecStop_waitingsignal == 0){ pthread_mutex_lock(&pComponentPrivate->codecStop_mutex); } @@ -2914,23 +2914,23 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Stop..\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Stop..", __LINE__); goto EXIT; } else{ - OMX_PRSTATE2(pComponentPrivate->dbg, "%d: Codec has been stopped\n", __LINE__); + OMX_PRSTATE2(pComponentPrivate->dbg, "%d: Codec has been stopped", __LINE__); } } else if(pComponentPrivate->curState == OMX_StatePause) { char *pArgs = "damedesuStr"; - OMX_PRDSP2(pComponentPrivate->dbg, "%d :: Comp: Stop Command Received\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d :: Comp: Stop Command Received",__LINE__); #ifdef HASHINGENABLE /*Hashing Change*/ pLcmlHandle = (LCML_DSP_INTERFACE*)pComponentPrivate->pLcmlHandle; eError = LCML_FlushHashes(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle); if (eError != OMX_ErrorNone) { - OMX_ERROR2(pComponentPrivate->dbg, "Error occurred in Codec mapping flush!\n"); + OMX_ERROR2(pComponentPrivate->dbg, "Error occurred in Codec mapping flush!"); } #endif @@ -2963,7 +2963,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) } #endif - OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: The component is stopped\n",__LINE__); + OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: The component is stopped",__LINE__); pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, OMX_EventCmdComplete,OMX_CommandStateSet, @@ -2973,7 +2973,7 @@ OMX_ERRORTYPE WMADEC_CommandToIdle(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) else { /* This means, it is invalid state from application */ - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler(pHandle, pHandle->pApplicationPrivate, OMX_EventError, @@ -3007,7 +3007,7 @@ OMX_ERRORTYPE WMADEC_CommandToLoaded(WMADEC_COMPONENT_PRIVATE *pComponentPrivate OMX_HANDLETYPE pLcmlHandle = pComponentPrivate->pLcmlHandle; OMX_ERRORTYPE eError = OMX_ErrorNone; char *p = "hello"; - OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded - curState = %d\n", + OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded - curState = %d", __LINE__,pComponentPrivate->curState); if (pComponentPrivate->curState == OMX_StateLoaded) { @@ -3017,17 +3017,17 @@ OMX_ERRORTYPE WMADEC_CommandToLoaded(WMADEC_COMPONENT_PRIVATE *pComponentPrivate OMX_ErrorSameState, OMX_TI_ErrorMinor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application",__LINE__); goto EXIT; } - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d: pComponentPrivate->pInputBufferList->numBuffers = %d\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d: pComponentPrivate->pInputBufferList->numBuffers = %d", __LINE__,pComponentPrivate->pInputBufferList->numBuffers); - OMX_PRBUFFER1(pComponentPrivate->dbg, "%d: pComponentPrivate->pOutputBufferList->numBuffers = %d\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "%d: pComponentPrivate->pOutputBufferList->numBuffers = %d", __LINE__,pComponentPrivate->pOutputBufferList->numBuffers); if (pComponentPrivate->curState == OMX_StateWaitForResources) { - OMX_PRDSP2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded",__LINE__); #ifdef __PERF_INSTRUMENTATION__ PERF_Boundary(pComponentPrivate->pPERFcomp,PERF_BoundaryStart | PERF_BoundaryCleanup); @@ -3045,30 +3045,30 @@ OMX_ERRORTYPE WMADEC_CommandToLoaded(WMADEC_COMPONENT_PRIVATE *pComponentPrivate NULL); goto EXIT; } - OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: \n",__LINE__); + OMX_PRSTATE2(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: ",__LINE__); if (pComponentPrivate->curState != OMX_StateIdle && pComponentPrivate->curState != OMX_StateWaitForResources) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorIncorrectStateTransition, OMX_TI_ErrorMinor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application",__LINE__); goto EXIT; } #ifdef __PERF_INSTRUMENTATION__ PERF_Boundary(pComponentPrivate->pPERFcomp,PERF_BoundaryStart | PERF_BoundaryCleanup); #endif - OMX_PRBUFFER1(pComponentPrivate->dbg, "pComponentPrivate->pInputBufferList->numBuffers = %d\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "pComponentPrivate->pInputBufferList->numBuffers = %d", pComponentPrivate->pInputBufferList->numBuffers); - OMX_PRBUFFER1(pComponentPrivate->dbg, "pComponentPrivate->pOutputBufferList->numBuffers = %d\n", + OMX_PRBUFFER1(pComponentPrivate->dbg, "pComponentPrivate->pOutputBufferList->numBuffers = %d", pComponentPrivate->pOutputBufferList->numBuffers); while (1) { - OMX_PRDSP2(pComponentPrivate->dbg, "HandleCommand - in while(1) loop\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "HandleCommand - in while(1) loop"); if (!pComponentPrivate->pInputBufferList->numBuffers && !pComponentPrivate->pOutputBufferList->numBuffers) { @@ -3088,16 +3088,16 @@ OMX_ERRORTYPE WMADEC_CommandToLoaded(WMADEC_COMPONENT_PRIVATE *pComponentPrivate /* Now Deinitialize the component No error should be returned from * this function. It should clean the system as much as possible */ - OMX_PRSTATE1(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: \n",__LINE__); + OMX_PRSTATE1(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: ",__LINE__); eError = LCML_ControlCodec(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlDestroy, (void *)p); - OMX_PRSTATE1(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: \n",__LINE__); + OMX_PRSTATE1(pComponentPrivate->dbg, "%d :: In side OMX_StateLoaded State: ",__LINE__); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d : Error: in Destroying the codec: no. %x\n",__LINE__, eError); + OMX_ERROR4(pComponentPrivate->dbg, "%d : Error: in Destroying the codec: no. %x",__LINE__, eError); goto EXIT; } - OMX_PRDSP1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded\n",__LINE__); + OMX_PRDSP1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Loaded",__LINE__); #ifdef __PERF_INSTRUMENTATION__ PERF_SendingCommand(pComponentPrivate->pPERF, -1, 0, PERF_ModuleComponent); #endif @@ -3141,7 +3141,7 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv #ifdef RESOURCE_MANAGER_ENABLED int rm_error; #endif - OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Executing \n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Executing ",__LINE__); if (pComponentPrivate->curState == OMX_StateExecuting) { pComponentPrivate->cbInfo.EventHandler (pHandle, @@ -3150,12 +3150,12 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv OMX_ErrorSameState, OMX_TI_ErrorMinor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application",__LINE__); goto EXIT; } else if (pComponentPrivate->curState == OMX_StateIdle) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); /* Sending commands to DSP via LCML_ControlCodec third argument is not used for time being */ @@ -3164,7 +3164,7 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv if(pComponentPrivate->dasfmode == 1) { OMX_U32 pValues[4]; - OMX_PRDSP2(pComponentPrivate->dbg, "%d :: ---- Comp: DASF Functionality is ON ---\n",__LINE__); + OMX_PRDSP2(pComponentPrivate->dbg, "%d :: ---- Comp: DASF Functionality is ON ---",__LINE__); if (pComponentPrivate->pHeaderInfo->iChannel == 1) { pComponentPrivate->pParams->iAudioFormat = WMA_MONO_CHANNEL; @@ -3173,16 +3173,16 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv { pComponentPrivate->pParams->iAudioFormat = WMA_STEREO_NON_INTERLEAVED; } - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d\n", pComponentPrivate->pParams->iAudioFormat); + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d", pComponentPrivate->pParams->iAudioFormat); pComponentPrivate->pParams->iStrmId = pComponentPrivate->streamID; pComponentPrivate->pParams->iSamplingRate = pComponentPrivate->pHeaderInfo->iSamplePerSec; - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iSamplingRate = %ld\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iSamplingRate = %ld", pComponentPrivate->pParams->iSamplingRate); - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iStrmId = %ld\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iStrmId = %ld", pComponentPrivate->pParams->iStrmId); - OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d\n", + OMX_PRINT1(pComponentPrivate->dbg, "pParams->iAudioFormat = %d", pComponentPrivate->pParams->iAudioFormat); pValues[0] = USN_STRMCMD_SETCODECPARAMS; @@ -3193,19 +3193,19 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv EMMCodecControlStrmCtrl,(void *)pValues); if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec StreamControl..\n", + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec StreamControl..", __LINE__); goto EXIT; } } if( pComponentPrivate->dasfmode ) { - OMX_PRDSP2(pComponentPrivate->dbg, "Setting WMA_IAUDIO_BLOCK\n"); + OMX_PRDSP2(pComponentPrivate->dbg, "Setting WMA_IAUDIO_BLOCK"); pComponentPrivate->pDynParams->iOutputFormat = WMA_IAUDIO_BLOCK; /* EAUDIO_BLOCKED */ } else { - OMX_PRDSP1(pComponentPrivate->dbg, "Setting WMA_IAUDIO_INTERLEAVED\n"); + OMX_PRDSP1(pComponentPrivate->dbg, "Setting WMA_IAUDIO_INTERLEAVED"); pComponentPrivate->pDynParams->iOutputFormat = WMA_IAUDIO_INTERLEAVED; /* EAUDIO_INTERLEAVED */ } pComponentPrivate->pDynParams->size = sizeof( WMADEC_UALGParams ); @@ -3220,7 +3220,7 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec algctrl..\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec algctrl..", __LINE__); goto EXIT; } pComponentPrivate->bBypassDSP = 0; @@ -3230,21 +3230,21 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv if(eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Start..\n", __LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d: Error Occurred in Codec Start..", __LINE__); goto EXIT; } - OMX_PRSTATE2(pComponentPrivate->dbg, ": Codec Has Been Started \n"); + OMX_PRSTATE2(pComponentPrivate->dbg, ": Codec Has Been Started "); pComponentPrivate->SendAfterEOS = 1; /*Enrique Zertuche, added because it wasnt set compared with the mp3*/ } else if (pComponentPrivate->curState == OMX_StatePause) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); eError = LCML_ControlCodec(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlStart, (void *)pArgs); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "Error While Resuming the codec\n"); + OMX_ERROR4(pComponentPrivate->dbg, "Error While Resuming the codec"); goto EXIT; } if (pComponentPrivate->nNumInputBufPending < @@ -3323,14 +3323,14 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv } else { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorIncorrectStateTransition, OMX_TI_ErrorMinor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application",__LINE__); goto EXIT; } #ifdef RESOURCE_MANAGER_ENABLED @@ -3346,7 +3346,7 @@ OMX_ERRORTYPE WMADEC_CommandToExecuting(WMADEC_COMPONENT_PRIVATE *pComponentPriv PERF_BoundarySteadyState); #endif /*Send state change notificaiton to Application */ - OMX_PRINT1(pComponentPrivate->dbg, "About to call EventHandler\n"); + OMX_PRINT1(pComponentPrivate->dbg, "About to call EventHandler"); pComponentPrivate->cbInfo.EventHandler( pHandle, pHandle->pApplicationPrivate, OMX_EventCmdComplete, OMX_CommandStateSet, pComponentPrivate->curState, NULL); @@ -3379,20 +3379,20 @@ OMX_ERRORTYPE WMADEC_CommandToPause(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) char *p = "hello"; - OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Pause\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d: WMADECHandleCommand: Cmd Pause",__LINE__); if (pComponentPrivate->curState == OMX_StatePause) { pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorSameState, OMX_TI_ErrorMinor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application",__LINE__); goto EXIT; } if (pComponentPrivate->curState != OMX_StateExecuting && pComponentPrivate->curState != OMX_StateIdle) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, @@ -3401,23 +3401,23 @@ OMX_ERRORTYPE WMADEC_CommandToPause(WMADEC_COMPONENT_PRIVATE *pComponentPrivate) OMX_TI_ErrorMajor, NULL); - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Invalid State Given by Application",__LINE__); goto EXIT; } #ifdef __PERF_INSTRUMENTATION__ PERF_Boundary(pComponentPrivate->pPERFcomp,PERF_BoundaryComplete | PERF_BoundarySteadyState); #endif - OMX_PRSTATE1(pComponentPrivate->dbg, "About to command to pause\n"); + OMX_PRSTATE1(pComponentPrivate->dbg, "About to command to pause"); eError = LCML_ControlCodec(((LCML_DSP_INTERFACE*)pLcmlHandle)->pCodecinterfacehandle, EMMCodecControlPause, (void *)p); if (eError != OMX_ErrorNone) { - OMX_ERROR4(pComponentPrivate->dbg, "%d : Error: in Pausing the codec\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d : Error: in Pausing the codec",__LINE__); goto EXIT; } - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); EXIT: return eError; @@ -3446,7 +3446,7 @@ OMX_ERRORTYPE WMADEC_CommandToWaitForResources(WMADEC_COMPONENT_PRIVATE *pCompon if (pComponentPrivate->curState == OMX_StateWaitForResources) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler (pHandle, pHandle->pApplicationPrivate, @@ -3455,11 +3455,11 @@ OMX_ERRORTYPE WMADEC_CommandToWaitForResources(WMADEC_COMPONENT_PRIVATE *pCompon OMX_TI_ErrorMinor, NULL); - OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application\n",__LINE__); + OMX_ERROR2(pComponentPrivate->dbg, "%d :: Error: Same State Given by Application",__LINE__); } else if (pComponentPrivate->curState == OMX_StateLoaded) { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->curState = OMX_StateWaitForResources; pComponentPrivate->cbInfo.EventHandler(pHandle, @@ -3471,7 +3471,7 @@ OMX_ERRORTYPE WMADEC_CommandToWaitForResources(WMADEC_COMPONENT_PRIVATE *pCompon } else { - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); pComponentPrivate->cbInfo.EventHandler(pHandle, pHandle->pApplicationPrivate, @@ -3513,7 +3513,7 @@ void WMADEC_SetPending(WMADEC_COMPONENT_PRIVATE *pComponentPrivate, { pComponentPrivate->pInputBufferList->bBufferPending[i] = 1; OMX_PRBUFFER2(pComponentPrivate->dbg, "*******************INPUT BUFFER %d IS PENDING \ - ******************************\n",i); + ******************************",i); } } } @@ -3525,7 +3525,7 @@ void WMADEC_SetPending(WMADEC_COMPONENT_PRIVATE *pComponentPrivate, { pComponentPrivate->pOutputBufferList->bBufferPending[i] = 1; OMX_PRBUFFER2(pComponentPrivate->dbg, "*******************OUTPUT BUFFER %d IS PENDING \ - ******************************\n",i); + ******************************",i); } } } @@ -3560,7 +3560,7 @@ void WMADEC_ClearPending(WMADEC_COMPONENT_PRIVATE *pComponentPrivate, { pComponentPrivate->pInputBufferList->bBufferPending[i] = 0; OMX_PRBUFFER1(pComponentPrivate->dbg, "*******************INPUT BUFFER %d IS RECLAIMED\ - ******************************\n",i); + ******************************",i); } } } @@ -3571,7 +3571,7 @@ void WMADEC_ClearPending(WMADEC_COMPONENT_PRIVATE *pComponentPrivate, if (pBufHdr == pComponentPrivate->pOutputBufferList->pBufHdr[i]) { pComponentPrivate->pOutputBufferList->bBufferPending[i] = 0; - OMX_PRBUFFER1(pComponentPrivate->dbg, "*******************OUTPUT BUFFER %d IS RECLAIMED******************************\n",i); + OMX_PRBUFFER1(pComponentPrivate->dbg, "*******************OUTPUT BUFFER %d IS RECLAIMED******************************",i); } } } @@ -3693,10 +3693,10 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParamsEx(OMX_HANDLETYPE pComponent,OMX_U32 inde LCML_DSP_INTERFACE *pHandle = (LCML_DSP_INTERFACE *)pComponent; WMADEC_COMPONENT_PRIVATE *pComponentPrivate = pHandle->pComponentPrivate; - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entered WMADECFill_LCMLInitParams\n",__LINE__); - OMX_PRDSP1(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pComponentPrivate = %p\n", + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Entered WMADECFill_LCMLInitParams",__LINE__); + OMX_PRDSP1(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pComponentPrivate = %p", __LINE__,pComponentPrivate); - OMX_PRDSP1(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pHandle = %p\n", + OMX_PRDSP1(pComponentPrivate->dbg, "%d :: WMADECFill_LCMLInitParams - pHandle = %p", __LINE__,pHandle); nIpBuf = pComponentPrivate->pInputBufferList->numBuffers; @@ -3706,25 +3706,25 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParamsEx(OMX_HANDLETYPE pComponent,OMX_U32 inde nOpBufSize = pComponentPrivate->pPortDef[OUTPUT_BUFFER]->nBufferSize; - OMX_PRBUFFER1(pComponentPrivate->dbg, "nIpBuf = %ld\n",nIpBuf); - OMX_PRBUFFER1(pComponentPrivate->dbg, "nOpBuf = %ld\n",nOpBuf); + OMX_PRBUFFER1(pComponentPrivate->dbg, "nIpBuf = %ld",nIpBuf); + OMX_PRBUFFER1(pComponentPrivate->dbg, "nOpBuf = %ld",nOpBuf); if(indexport == 0 || indexport == -1){ - OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c\n",__LINE__); + OMX_PRINT1(pComponentPrivate->dbg, "%d :: Comp: OMX_WmaDecUtils.c",__LINE__); size_lcml = nIpBuf * sizeof(LCML_WMADEC_BUFHEADERTYPE); WMAD_OMX_MALLOC_SIZE(pTemp_lcml, size_lcml, LCML_WMADEC_BUFHEADERTYPE); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml); - OMX_PRDSP1(pComponentPrivate->dbg, "Line %d::pTemp_lcml = %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml); + OMX_PRDSP1(pComponentPrivate->dbg, "Line %d::pTemp_lcml = %p",__LINE__,pTemp_lcml); if(pTemp_lcml == NULL) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Memory Allocation Failed\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Memory Allocation Failed",__LINE__); eError = OMX_ErrorInsufficientResources; goto EXIT; } pComponentPrivate->pLcmlBufHeader[INPUT_PORT] = pTemp_lcml; - OMX_PRBUFFER1(pComponentPrivate->dbg, "nIpBuf = %ld\n",nIpBuf); + OMX_PRBUFFER1(pComponentPrivate->dbg, "nIpBuf = %ld",nIpBuf); for (i=0; i<nIpBuf; i++) { @@ -3747,16 +3747,16 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParamsEx(OMX_HANDLETYPE pComponent,OMX_U32 inde char_temp += 128; pTemp_lcml->pIpParam = (WMADEC_UAlgInBufParamStruct*)char_temp; - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml->pIpParam); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml->pIpParam); if (pTemp_lcml->pIpParam == NULL) { /* Free previously allocated memory before bailing */ if (pTemp_lcml != NULL) { - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:::[FREE] %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:::[FREE] %p",__LINE__,pTemp_lcml); OMX_WMADECMEMFREE_STRUCT(pTemp_lcml); } - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Malloc Failed...Exiting..\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Error: Malloc Failed...Exiting..",__LINE__); goto EXIT; } pTemp_lcml->pIpParam->bLastBuffer = 0; @@ -3772,11 +3772,11 @@ OMX_ERRORTYPE WMADECFill_LCMLInitParamsEx(OMX_HANDLETYPE pComponent,OMX_U32 inde * This memory pointer will be sent to LCML */ size_lcml = nOpBuf * sizeof(LCML_WMADEC_BUFHEADERTYPE); WMAD_OMX_MALLOC_SIZE(pTemp_lcml, size_lcml, LCML_WMADEC_BUFHEADERTYPE); - OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p\n",__LINE__,pTemp_lcml); + OMX_PRBUFFER2(pComponentPrivate->dbg, "%d:[ALLOC] %p",__LINE__,pTemp_lcml); if(pTemp_lcml == NULL) { - OMX_ERROR4(pComponentPrivate->dbg, "%d :: Memory Allocation Failed\n",__LINE__); + OMX_ERROR4(pComponentPrivate->dbg, "%d :: Memory Allocation Failed",__LINE__); eError = OMX_ErrorInsufficientResources; goto EXIT; } @@ -3856,10 +3856,10 @@ OMX_U32 WMADEC_GetBits(OMX_U32* nPosition, OMX_U8 nBits, OMX_U8* pBuffer, OMX_BO /* desc Parses the WAVEFORMATEX data structure that is sent in the 1st */ /* buffer and the it creates the RCA header and the block align */ /* ==========================================================================*/ -OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData) +OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData, struct OMX_TI_Debug dbg) { OMX_ERRORTYPE eError=0; - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Entering WMADEC_Parser function\n"); + OMX_PRINT1 (dbg, "Entering WMADEC_Parser function"); //These are the important fields that the socket node needs pStreamData->iTypeSpecific=0x1c; @@ -3880,19 +3880,19 @@ OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData) case WAVE_FORMAT_MSAUDIO : { - OMXDBG_PRINT(stderr, DSP, 2, 0, "WAVE_FORMAT_MSAUDIO\n"); + OMX_PRINT2 (dbg, "WAVE_FORMAT_MSAUDIO"); break; /*Make Necessary validations for supported parameter for specific format here */ } case WAVE_FORMAT_MSAUDIO_9 : { - OMXDBG_PRINT(stderr, DSP, 2, 0, "WAVE_FORMAT_MSAUDIO_9\n"); + OMX_PRINT2 (dbg, "WAVE_FORMAT_MSAUDIO_9"); break; /*Make Necessary validations for supported parameter for specific format here */ } case WAVE_FORMAT_MSAUDIO_9_LOOSELESS : { - OMXDBG_PRINT(stderr, DSP, 2, 0, "WAVE_FORMAT_MSAUDIO_9_LOOSELESS\n"); + OMX_PRINT2 (dbg, "WAVE_FORMAT_MSAUDIO_9_LOOSELESS"); break; /*Make Necessary validations for supported parameter for specific format here */ } @@ -3902,7 +3902,7 @@ OMX_ERRORTYPE WMADEC_Parser(OMX_U8* pBuffer, RCA_HEADER *pStreamData) } } - OMXDBG_PRINT(stderr, PRINT, 1, 0, "Exiting WMADEC_Parser function\n"); + OMX_PRINT1 (dbg, "Exiting WMADEC_Parser function"); return eError; } 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..f1ff735 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 @@ -213,7 +213,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) int i; OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d ::OMX_ComponentInit\n", __LINE__); - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d ::LINE\n", __LINE__); /*Set the all component function pointer to the handle */ pHandle->SetCallbacks = SetCallbacks; @@ -236,7 +235,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) - OMXDBG_PRINT(stderr, PRINT, 1, 0, "%d ::LINE\n", __LINE__); /*Allocate the memory for Component private data area */ WMAD_OMX_MALLOC(pHandle->pComponentPrivate, WMADEC_COMPONENT_PRIVATE); ((WMADEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->pHandle = pHandle; @@ -257,8 +255,6 @@ OMX_ERRORTYPE OMX_ComponentInit (OMX_HANDLETYPE hComp) ((WMADEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wmaParams[INPUT_PORT] = wma_ip; ((WMADEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wmaParams[OUTPUT_PORT] = (OMX_AUDIO_PARAM_WMATYPE*)wma_op; - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d Malloced wmaParams[INPUT_PORT] = %p\n",__LINE__,((WMADEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wmaParams[INPUT_PORT]); - OMXDBG_PRINT(stderr, COMM, 2, 0, "%d Malloced wmaParams[OUTPUT_PORT] = %p\n",__LINE__,((WMADEC_COMPONENT_PRIVATE *)pHandle->pComponentPrivate)->wmaParams[OUTPUT_PORT]); pComponentPrivate = pHandle->pComponentPrivate; WMAD_OMX_MALLOC(pComponentPrivate->pInputBufferList, BUFFERLIST); @@ -1675,7 +1671,6 @@ static OMX_ERRORTYPE AllocateBuffer (OMX_IN OMX_HANDLETYPE hComponent, OMX_IN OMX_U32 nSizeBytes) { - OMXDBG_PRINT(stderr, PRINT, 1, 0, "====================================OMX_ERRORTYPE AllocateBuffer ()=======================\n"); OMX_PARAM_PORTDEFINITIONTYPE *pPortDef; WMADEC_COMPONENT_PRIVATE *pComponentPrivate; OMX_ERRORTYPE eError = OMX_ErrorNone; diff --git a/omx/system/src/openmax_il/common/inc/OMX_TI_Common.h b/omx/system/src/openmax_il/common/inc/OMX_TI_Common.h index 1008169..947189d 100755 --- a/omx/system/src/openmax_il/common/inc/OMX_TI_Common.h +++ b/omx/system/src/openmax_il/common/inc/OMX_TI_Common.h @@ -63,7 +63,7 @@ typedef enum OMX_TI_SEVERITYTYPE { 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_); /* ======================================================================= */ /** @@ -80,7 +80,7 @@ typedef enum OMX_TI_SEVERITYTYPE { */ /* ======================================================================= */ #define OMX_MEMFREE_STRUCT(_pStruct_)\ - OMXDBG_PRINT(stderr, BUFFER, 2, 0, "%d :: [FREE] %p\n",__LINE__,_pStruct_);\ + OMXDBG_PRINT(stderr, BUFFER, 2, OMX_DBG_BASEMASK, "%d :: [FREE] %p\n",__LINE__,_pStruct_);\ if(_pStruct_ != NULL){\ newfree(_pStruct_);\ _pStruct_ = NULL;\ |