diff options
| author | James Dong <jdong@google.com> | 2012-12-21 14:09:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-21 14:09:14 -0800 |
| commit | 12834fe289e8173e94f31603fa6d313abe56ad70 (patch) | |
| tree | 63289554db6ac52fdd4cc49975bd7b335cedc9a8 | |
| parent | b54cedabdf0261211241e2f3af09c75cffd911ed (diff) | |
| parent | 437ced8a14944bf5450df50c5e7e7a6dfe20ea40 (diff) | |
Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"jb-mr1-dev-plus-aosp
| -rwxr-xr-x | libvideoeditor/osal/inc/M4OSA_Debug.h | 4 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_internal.c | 2 | ||||
| -rwxr-xr-x | 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 b06183da..826ab51d 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 5844115c..64a6f403 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 f735c0bf..3c8915ad 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"); |