From 437ced8a14944bf5450df50c5e7e7a6dfe20ea40 Mon Sep 17 00:00:00 2001 From: beanz Date: Wed, 7 Nov 2012 10:58:59 +0800 Subject: libvideoeditor: fix code bugs when enabling all-level debugging macros Change-Id: Ic8aedfa821d79698d31cf7ee3bf382aae85981f6 Signed-off-by: beanz --- libvideoeditor/osal/inc/M4OSA_Debug.h | 4 ++-- libvideoeditor/vss/src/M4xVSS_internal.c | 2 +- libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libvideoeditor/osal/inc/M4OSA_Debug.h b/libvideoeditor/osal/inc/M4OSA_Debug.h index b06183d..826ab51 100755 --- a/libvideoeditor/osal/inc/M4OSA_Debug.h +++ b/libvideoeditor/osal/inc/M4OSA_Debug.h @@ -68,14 +68,14 @@ extern M4OSA_Void M4OSA_DEBUG_traceFunction(M4OSA_UInt32 line, if(cond)\ {\ M4OSA_DEBUG_traceFunction(__LINE__, (M4OSA_Char*)__FILE__, level,\ - (M4OSA_Char*)#cond, (M4OSA_Char*)msg, + (M4OSA_Char*)#cond, (M4OSA_Char*)msg,\ (errorCode));\ return(errorCode);\ } #define M4OSA_DEBUG(errorCode, msg)\ M4OSA_DEBUG_traceFunction(__LINE__, (M4OSA_Char*)__FILE__, 1,\ - (M4OSA_Char*)#errorCode, (M4OSA_Char*)msg, + (M4OSA_Char*)#errorCode, (M4OSA_Char*)msg,\ (errorCode)); #else /*(M4OSA_DEBUG_LEVEL >= 1) || (M4OSA_SUPER_DEBUG_LEVEL >= 1)*/ diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c index 5844115..64a6f40 100755 --- a/libvideoeditor/vss/src/M4xVSS_internal.c +++ b/libvideoeditor/vss/src/M4xVSS_internal.c @@ -4025,7 +4025,7 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectFifties( M4OSA_Void *pUserData, M4xVSS_FiftiesStruct* p_FiftiesData = (M4xVSS_FiftiesStruct *)pUserData; /* Check the inputs (debug only) */ - M4OSA_DEBUG_IF2((pFiftiesData == M4OSA_NULL),M4ERR_PARAMETER, + M4OSA_DEBUG_IF2((p_FiftiesData == M4OSA_NULL),M4ERR_PARAMETER, "xVSS: p_FiftiesData is M4OSA_NULL in M4VSS3GPP_externalVideoEffectFifties"); M4OSA_DEBUG_IF2((pPlaneOut == M4OSA_NULL),M4ERR_PARAMETER, "xVSS: p_PlaneOut is M4OSA_NULL in M4VSS3GPP_externalVideoEffectFifties"); diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp index 5026073..b7d4cc0 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp @@ -975,7 +975,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextAu(M4OSA_Context context, status_t error; int32_t i32Tmp = 0; - M4OSA_DEBUG_IF1((pReaderContext == 0), M4ERR_PARAMETER, + M4OSA_DEBUG_IF1(( pC== 0), M4ERR_PARAMETER, "VideoEditor3gpReader_getNextAu: invalid context"); M4OSA_DEBUG_IF1((pStreamHandler == 0), M4ERR_PARAMETER, "VideoEditor3gpReader_getNextAu: invalid pointer to M4_StreamHandler"); -- cgit v1.1