Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cd9cc25 authored by James Dong's avatar James Dong Committed by Gerrit Code Review
Browse files

Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"

parents cc4e6091 437ced8a

libvideoeditor/osal/inc/M4OSA_Debug.h

+2 −2
Original line number Diff line number Diff line
@@ -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)*/

libvideoeditor/vss/src/M4xVSS_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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");