diff options
author | Steve Block <steveblock@google.com> | 2011-12-20 16:25:39 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-03 22:32:01 +0000 |
commit | dbcc6073c88ced818ea3e742f36191088222ca26 (patch) | |
tree | 54fed5d14e9367d7884bf0e92652dfd553b8d124 | |
parent | 71b33a71357b3ec211ae479b154cec071e379353 (diff) | |
download | omap3-dbcc6073c88ced818ea3e742f36191088222ca26.tar.gz |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I6bb39eabeda44ddbe59f396f1c6276b8d1aeb8c6
6 files changed, 19 insertions, 19 deletions
diff --git a/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp b/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp index 3c604d3..57e4eca 100644 --- a/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp +++ b/omx/core_plugin/omx_core_plugin/src/ti_omx_interface.cpp @@ -40,7 +40,7 @@ class TIOMXInterface : public OMXInterface // call failed. if (ipHandle && aInterfaceId == OMX_INTERFACE_ID) { - LOGD("TIOMXInterface: library lookup success\n"); + ALOGD("TIOMXInterface: library lookup success\n"); // the library lookup was successful return this; } @@ -51,7 +51,7 @@ class TIOMXInterface : public OMXInterface static TIOMXInterface* Instance() { - LOGD("TIOMXInterface: creating interface\n"); + ALOGD("TIOMXInterface: creating interface\n"); return OSCL_NEW(TIOMXInterface, ()); }; @@ -67,7 +67,7 @@ class TIOMXInterface : public OMXInterface TIOMXInterface() { - LOGD("Calling DLOPEN on OMX_CORE_LIBRARY (%s)\n", OMX_CORE_LIBRARY); + ALOGD("Calling DLOPEN on OMX_CORE_LIBRARY (%s)\n", OMX_CORE_LIBRARY); ipHandle = dlopen(OMX_CORE_LIBRARY, RTLD_NOW); if (NULL == ipHandle) @@ -101,7 +101,7 @@ class TIOMXInterface : public OMXInterface } else { - LOGD("DLOPEN SUCCEEDED (%s)\n", OMX_CORE_LIBRARY); + ALOGD("DLOPEN SUCCEEDED (%s)\n", OMX_CORE_LIBRARY); // Lookup all the symbols in the OMX core pOMX_Init = (tpOMX_Init)dlsym(ipHandle, "TIOMX_Init"); pOMX_Deinit = (tpOMX_Deinit)dlsym(ipHandle, "TIOMX_Deinit"); diff --git a/omx/system/src/openmax_il/common/inc/OMX_TI_Debug.h b/omx/system/src/openmax_il/common/inc/OMX_TI_Debug.h index 6dfae32..9c4ccc1 100644 --- a/omx/system/src/openmax_il/common/inc/OMX_TI_Debug.h +++ b/omx/system/src/openmax_il/common/inc/OMX_TI_Debug.h @@ -290,7 +290,7 @@ struct OMX_TI_Debug #define OMX_DBG_PRINT(file, domain, level, mask, format, list...) \ do {\ if ((file) && (OMX_U32) (level * domain) >= (OMX_U32) ((mask) & (domain * OMX_DBG_MAX_LEVEL))) \ - LOGD(OMX_DBG_FN_FMT OMX_DBG_LINE_FMT OMX_DBG_FMT \ + ALOGD(OMX_DBG_FN_FMT OMX_DBG_LINE_FMT OMX_DBG_FMT \ format OMX_DBG_FN OMX_DBG_LINE, ##list); \ } while (0) #else @@ -298,7 +298,7 @@ struct OMX_TI_Debug do {\ if ((file) && (OMX_U32) (level * domain) >= (OMX_U32) ((mask) & (domain * OMX_DBG_MAX_LEVEL))) { \ if (file == stderr || file == stdout) { \ - LOGD(OMX_DBG_FN_FMT OMX_DBG_LINE_FMT OMX_DBG_FMT \ + ALOGD(OMX_DBG_FN_FMT OMX_DBG_LINE_FMT OMX_DBG_FMT \ format OMX_DBG_FN OMX_DBG_LINE, ##list); \ } else { \ fprintf((file), \ diff --git a/omx/system/src/openmax_il/omx_core/src/OMX_Core.c b/omx/system/src/openmax_il/omx_core/src/OMX_Core.c index 33fd603..abfe9b9 100755 --- a/omx/system/src/openmax_il/omx_core/src/OMX_Core.c +++ b/omx/system/src/openmax_il/omx_core/src/OMX_Core.c @@ -126,7 +126,7 @@ OMX_ERRORTYPE TIOMX_Init() } count++; - LOGD("init count = %d\n", count); + ALOGD("init count = %d\n", count); if (count == 1) { @@ -208,7 +208,7 @@ OMX_ERRORTYPE TIOMX_GetHandle( OMX_HANDLETYPE* pHandle, OMX_STRING cComponentNam for (refIndex=0; refIndex < MAX_TABLE_SIZE; refIndex++) { //get the index for the component in the table if (strcmp(componentTable[refIndex].name, cComponentName) == 0) { - LOGD("Found component %s with refCount %d\n", + ALOGD("Found component %s with refCount %d\n", cComponentName, componentTable[refIndex].refCount); /* check if the component is already loaded */ @@ -364,7 +364,7 @@ OMX_ERRORTYPE TIOMX_FreeHandle (OMX_HANDLETYPE hComponent) for (handleIndex=0; handleIndex < componentTable[refIndex].refCount; handleIndex++){ /* get the position for the component in the table */ if (componentTable[refIndex].pHandle[handleIndex] == hComponent){ - LOGD("Found matching pHandle(%p) at index %d with refCount %d", + ALOGD("Found matching pHandle(%p) at index %d with refCount %d", hComponent, refIndex, componentTable[refIndex].refCount); if (componentTable[refIndex].refCount) { componentTable[refIndex].refCount -= 1; @@ -417,7 +417,7 @@ OMX_ERRORTYPE TIOMX_Deinit() count--; } - LOGD("deinit count = %d\n", count); + ALOGD("deinit count = %d\n", count); if(pthread_mutex_unlock(&mutex) != 0) { LOGE("%d :: Core: Error in Mutex unlock\n",__LINE__); diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c index bb6e591..ce8fc95 100644 --- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c +++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDec_Utils.c @@ -2386,7 +2386,7 @@ OMX_ERRORTYPE VIDDEC_HandleCommand (OMX_HANDLETYPE phandle, OMX_U32 nParam1) switch (nParam1) { case OMX_StateIdle: - LOGD("Handle request for state transition: %d => OMX_StateIdle", pComponentPrivate->eState); + ALOGD("Handle request for state transition: %d => OMX_StateIdle", pComponentPrivate->eState); if (pComponentPrivate->eState == OMX_StateIdle) { eError = OMX_ErrorSameState; OMX_PRSTATE4(pComponentPrivate->dbg, "Same State 0x%x\n", eError); @@ -2732,7 +2732,7 @@ OMX_ERRORTYPE VIDDEC_HandleCommand (OMX_HANDLETYPE phandle, OMX_U32 nParam1) OMX_CommandStateSet, pComponentPrivate->eState, NULL); - LOGD("OMX_StateIdle state reached"); + ALOGD("OMX_StateIdle state reached"); break; } else if (pComponentPrivate->eState == OMX_StateExecuting || pComponentPrivate->eState == OMX_StatePause) { @@ -2815,7 +2815,7 @@ OMX_ERRORTYPE VIDDEC_HandleCommand (OMX_HANDLETYPE phandle, OMX_U32 nParam1) OMX_CommandStateSet, pComponentPrivate->eState, NULL); - LOGD("OMX_StateIdle state reached"); + ALOGD("OMX_StateIdle state reached"); eError = OMX_ErrorNone; pComponentPrivate->bTransPause = 0; pComponentPrivate->bIsPaused = 0; @@ -9082,7 +9082,7 @@ OMX_ERRORTYPE VIDDEC_SetMpeg4_Parameters(VIDDEC_COMPONENT_PRIVATE* pComponentPri property_get("deblocking.video.disableIfD1", value, "0"); mDisableDeblockingIfD1 = atoi(value); - LOGD_IF(mDisableDeblockingIfD1, "Disabling deblocking if D1 resolution"); + ALOGD_IF(mDisableDeblockingIfD1, "Disabling deblocking if D1 resolution"); OMX_PRDSP2(pComponentPrivate->dbg,"Initializing DSP for mpeg4 and h263 eCompressionFormat 0x%x\n", pComponentPrivate->pInPortDef->format.video.eCompressionFormat); @@ -9111,7 +9111,7 @@ OMX_ERRORTYPE VIDDEC_SetMpeg4_Parameters(VIDDEC_COMPONENT_PRIVATE* pComponentPri if(pComponentPrivate->pOutPortDef->format.video.nFrameWidth > 480 || pComponentPrivate->pOutPortDef->format.video.nFrameHeight > 480){ bDisDeblocking = OMX_TRUE; - LOGD("D1 or higher resolution: Disable Deblocking!!"); + ALOGD("D1 or higher resolution: Disable Deblocking!!"); } } diff --git a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c index f0f082e..05986e9 100644 --- a/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c +++ b/omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c @@ -635,7 +635,7 @@ static OMX_ERRORTYPE VIDDEC_SendCommand (OMX_HANDLETYPE hComponent, switch (Cmd) { case OMX_CommandStateSet: - LOGD("VIDDEC_SendCommand: Received request from omx client to change state to %d", nParam1); + ALOGD("VIDDEC_SendCommand: Received request from omx client to change state to %d", nParam1); /* Add a pending transition */ if(AddStateTransition(pComponentPrivate) != OMX_ErrorNone) { return OMX_ErrorUndefined; @@ -909,7 +909,7 @@ static OMX_ERRORTYPE VIDDEC_GetParameter (OMX_IN OMX_HANDLETYPE hComponent, pParamProfileLevel->eLevel = pComponentPrivate->pMpeg2->eLevel; } else { - LOGD("Error in Getparameter OMX_IndexParamVideoProfileLevelCurrent"); + ALOGD("Error in Getparameter OMX_IndexParamVideoProfileLevelCurrent"); eError = OMX_ErrorBadParameter; } } @@ -1537,7 +1537,7 @@ static OMX_ERRORTYPE VIDDEC_SetParameter (OMX_HANDLETYPE hComp, char value[PROPERTY_VALUE_MAX]; property_get("debug.video.showfps", value, "0"); mDebugFps = atoi(value); - LOGD_IF(mDebugFps, "Not setting deblocking to measure fps"); + ALOGD_IF(mDebugFps, "Not setting deblocking to measure fps"); if (mDebugFps == OMX_FALSE) { if (pComponentPrivate->pInPortDef->format.video.eCompressionFormat == OMX_VIDEO_CodingMPEG4 || pComponentPrivate->pInPortDef->format.video.eCompressionFormat == OMX_VIDEO_CodingH263){ diff --git a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c index cede1bb..fd92f43 100644 --- a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c +++ b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c @@ -3956,7 +3956,7 @@ OMX_ERRORTYPE OMX_VIDENC_LCML_Callback(TUsnCodecEvent event,void* argsCb [10]) #endif OMX_PRDSP1(pComponentPrivate->dbg, " [OUT] -> %p\n", pBufHead); if(pBufHead->nFilledLen > pBufHead->nAllocLen) { - LOGD("VE Warning!!! Output buffer overflow."); + ALOGD("VE Warning!!! Output buffer overflow."); } pBufferPrivate->eBufferOwner = VIDENC_BUFFER_WITH_COMPONENT; if (pComponentPrivate->bCodecStarted == OMX_TRUE) |