diff options
Diffstat (limited to 'camera/inc/CameraHal.h')
| -rw-r--r-- | camera/inc/CameraHal.h | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 9f3230b..fd3080e 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -79,43 +79,45 @@ #define CAMHAL_LOGI LOGI -//Uncomment to enable more verbose/debug logs -//#define DEBUG_LOG - -///Camera HAL Logging Functions -#ifndef DEBUG_LOG - -#define CAMHAL_LOGDA(str) -#define CAMHAL_LOGDB(str, ...) -#define CAMHAL_LOGVA(str) -#define CAMHAL_LOGVB(str, ...) - -#define CAMHAL_LOGEA LOGE -#define CAMHAL_LOGEB LOGE - -#undef LOG_FUNCTION_NAME -#undef LOG_FUNCTION_NAME_EXIT -#define LOG_FUNCTION_NAME -#define LOG_FUNCTION_NAME_EXIT - +// logging functions +#ifdef CAMERAHAL_DEBUG +# define CAMHAL_LOGD DBGUTILS_LOGD +# define CAMHAL_LOGDA DBGUTILS_LOGDA +# define CAMHAL_LOGDB DBGUTILS_LOGDB +# ifdef CAMERAHAL_DEBUG_VERBOSE +# define CAMHAL_LOGV DBGUTILS_LOGV +# define CAMHAL_LOGVA DBGUTILS_LOGVA +# define CAMHAL_LOGVB DBGUTILS_LOGVB +# else +# define CAMHAL_LOGV(...) +# define CAMHAL_LOGVA(str) +# define CAMHAL_LOGVB(str, ...) +# endif #else +# define CAMHAL_LOGD(...) +# define CAMHAL_LOGDA(str) +# define CAMHAL_LOGDB(str, ...) +# define CAMHAL_LOGV(...) +# define CAMHAL_LOGVA(str) +# define CAMHAL_LOGVB(str, ...) +#endif -#define CAMHAL_LOGDA DBGUTILS_LOGDA -#define CAMHAL_LOGDB DBGUTILS_LOGDB -#define CAMHAL_LOGVA DBGUTILS_LOGVA -#define CAMHAL_LOGVB DBGUTILS_LOGVB - +#define CAMHAL_LOGE DBGUTILS_LOGE #define CAMHAL_LOGEA DBGUTILS_LOGEA #define CAMHAL_LOGEB DBGUTILS_LOGEB +#define CAMHAL_LOGF DBGUTILS_LOGF -#endif - +#define CAMHAL_ASSERT DBGUTILS_ASSERT +#define CAMHAL_ASSERT_X DBGUTILS_ASSERT_X +#define CAMHAL_UNUSED(x) (void)x #define NONNEG_ASSIGN(x,y) \ if(x > -1) \ y = x +#define CAMHAL_SIZE_OF_ARRAY(x) static_cast<int>(sizeof(x)/sizeof(x[0])) + namespace android { #define PARAM_BUFFER 6000 |