summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-05 23:27:58 +0000
committerSteve Block <steveblock@google.com>2012-01-05 23:27:58 +0000
commit969334aaa54230ed3a9172452489a52ce07cc5cf (patch)
treeeb30799600e0b8ca05a04f1fdf24ad10f2b4846b
parent85e28eec8163c776f2f3a093f4053a96ed2d6f98 (diff)
downloadomap3-969334aaa54230ed3a9172452489a52ce07cc5cf.tar.gz
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I8fff60922b4ef7572bb17476c3f1f2a04c7106e2
-rw-r--r--omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h8
-rw-r--r--omx/audio/src/openmax_il/nbamr_enc/inc/OMX_AmrEnc_Utils.h8
-rw-r--r--omx/video/src/openmax_il/video_decode/src/OMX_VideoDecoder.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
index 92468ee..4b74b90 100644
--- a/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
+++ b/omx/audio/src/openmax_il/mp3_dec/inc/OMX_Mp3Dec_Utils.h
@@ -191,10 +191,10 @@
#ifdef MP3DEC_DEBUG
#ifdef ANDROID
- #define MP3DEC_DPRINT LOGW
- #define MP3DEC_BUFPRINT LOGW
- #define MP3DEC_MEMPRINT LOGW
- #define MP3DEC_STATEPRINT LOGW
+ #define MP3DEC_DPRINT ALOGW
+ #define MP3DEC_BUFPRINT ALOGW
+ #define MP3DEC_MEMPRINT ALOGW
+ #define MP3DEC_STATEPRINT ALOGW
#else
#define MP3DEC_DPRINT printf
#define MP3DEC_BUFPRINT printf
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 91a0455..13a872a 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
@@ -145,7 +145,7 @@
#ifdef ANDROID
#undef AMRENC_DPRINT
- #define AMRENC_DPRINT LOGW
+ #define AMRENC_DPRINT ALOGW
#endif
#else
@@ -163,7 +163,7 @@
#ifdef ANDROID
#undef AMRENC_MEMPRINT
- #define AMRENC_MEMPRINT LOGW
+ #define AMRENC_MEMPRINT ALOGW
#endif
#else
@@ -196,8 +196,8 @@
#ifdef DEBUG
#ifdef ANDROID
- #define AMRENC_DPRINT LOGW
- #define AMRENC_MEMPRINT LOGW
+ #define AMRENC_DPRINT ALOGW
+ #define AMRENC_MEMPRINT ALOGW
#else
#define AMRENC_DPRINT printf
#define AMRENC_MEMPRINT printf
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 98fab8c..357bffb 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
@@ -890,17 +890,17 @@ static OMX_ERRORTYPE VIDDEC_GetParameter (OMX_IN OMX_HANDLETYPE hComponent,
{
OMX_VIDEO_PARAM_PROFILELEVELTYPE *pParamProfileLevel = (OMX_VIDEO_PARAM_PROFILELEVELTYPE *)ComponentParameterStructure;
if (pComponentPrivate->pInPortDef->format.video.eCompressionFormat == OMX_VIDEO_CodingAVC) {
- LOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent AVC");
+ ALOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent AVC");
pParamProfileLevel->eProfile = pComponentPrivate->pH264->eProfile;
pParamProfileLevel->eLevel = pComponentPrivate->pH264->eLevel;
}
else if (pComponentPrivate->pInPortDef->format.video.eCompressionFormat == OMX_VIDEO_CodingMPEG4) {
- LOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent MPEG4");
+ ALOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent MPEG4");
pParamProfileLevel->eProfile = pComponentPrivate->pMpeg4->eProfile;
pParamProfileLevel->eLevel = pComponentPrivate->pMpeg4->eLevel;
}
else if (pComponentPrivate->pInPortDef->format.video.eCompressionFormat == OMX_VIDEO_CodingH263) {
- LOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent H.263");
+ ALOGW("Getparameter OMX_IndexParamVideoProfileLevelCurrent H.263");
pParamProfileLevel->eProfile = pComponentPrivate->pH263->eProfile;
pParamProfileLevel->eLevel = pComponentPrivate->pH263->eLevel;
}