commit 6962f253e3a95605b5111bb4788827df796b4d61
author gji2 <guoliang.ji@intel.com> Tue Oct 15 01:38:15 2013 +0800
committer Patrick Tjin <pattjin@google.com> Mon Jul 21 21:51:42 2014 -0700
tree 3defa2d71b2038fd0b4d9c4e9753d5f5546c8698
parent 5cf93daa2da4da7f2b8a2d052a92807533ec1bd4

refine the log function in the libmix encoder, dynamic enable
the log fucntion

BZ: 145154

enable the log function dynamically
Enable: adb shell setprop libmix.debug 1
Disable: adb shell setprop libmix.debug 0

Change-Id: I73fcf982123f548fa974810987020bddff148625
Signed-off-by: gji2 <guoliang.ji@intel.com>
Reviewed-on: http://android.intel.com:8080/138728
Reviewed-by: Shi, PingX <pingx.shi@intel.com>
Tested-by: Shi, PingX <pingx.shi@intel.com>
Reviewed-by: cactus <cactus@intel.com>
Tested-by: cactus <cactus@intel.com>

videoencoder/Android.mk

diff --git a/videoencoder/Android.mk b/videoencoder/Android.mk
index 6b8b3a5..5821c5c 100644
--- a/videoencoder/Android.mk
+++ b/videoencoder/Android.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-#VIDEO_ENC_LOG_ENABLE := true
 #NO_BUFFER_SHARE := true
 
 ifeq ($(ENABLE_IMG_GRAPHICS),)

videoencoder/VideoEncoderHost.cpp

diff --git a/videoencoder/VideoEncoderHost.cpp b/videoencoder/VideoEncoderHost.cpp
index f636d9c..00a8e40 100644
--- a/videoencoder/VideoEncoderHost.cpp
+++ b/videoencoder/VideoEncoderHost.cpp
@@ -14,13 +14,23 @@
 #include "PVSoftMPEG4Encoder.h"
 #endif
 #include "VideoEncoderHost.h"
-#include "VideoEncoderLog.h"
 #include <string.h>
+#include <cutils/properties.h>
+#include <cutils/log.h>
+
+int32_t gLogLevel = 0;
 
 IVideoEncoder *createVideoEncoder(const char *mimeType) {
 
+    char logLevelProp[PROPERTY_VALUE_MAX];
+
+    if (property_get("libmix.debug", logLevelProp, NULL)) {
+        gLogLevel = atoi(logLevelProp);
+        LOGD("Debug level is %d", gLogLevel);
+    }
+
     if (mimeType == NULL) {
-        LOG_E("NULL mime type");
+        LOGE("NULL mime type");
         return NULL;
     }
 
@@ -47,7 +57,7 @@
         VideoEncoderVP8 *p = new VideoEncoderVP8();
         return (IVideoEncoder *)p;
     } else {
-        LOG_E ("Unknown mime type: %s", mimeType);
+        LOGE ("Unknown mime type: %s", mimeType);
     }
     return NULL;
 }

videoencoder/VideoEncoderLog.h

diff --git a/videoencoder/VideoEncoderLog.h b/videoencoder/VideoEncoderLog.h
index 3b8910d..8176489 100644
--- a/videoencoder/VideoEncoderLog.h
+++ b/videoencoder/VideoEncoderLog.h
@@ -10,32 +10,14 @@
 #define __VIDEO_ENCODER_LOG_H__
 
 // Components
-#define VIDEO_ENC_COMP 		"VideoEncoder"
+#include <cutils/log.h>
 
-#include <utils/Log.h>
-
-#define VIDEO_ENC_LOG_LEVEL_ERROR     ANDROID_LOG_ERROR
-#define VIDEO_ENC_LOG_LEVEL_WARNING   ANDROID_LOG_WARN
-#define VIDEO_ENC_LOG_LEVEL_INFO	ANDROID_LOG_INFO
-#define VIDEO_ENC_LOG_LEVEL_VERBOSE   ANDROID_LOG_VERBOSE
-
-#define mix_log(comp, level, format, ...) \
-    __android_log_print(level, comp, "%s():%d: "format, \
-    __FUNCTION__, __LINE__, ##__VA_ARGS__)
-
-//#define VIDEO_ENC_LOG_ENABLE
-#if  1
-#ifdef VIDEO_ENC_LOG_ENABLE
-#define LOG_V(format, ...) mix_log(VIDEO_ENC_COMP, VIDEO_ENC_LOG_LEVEL_VERBOSE, format, ##__VA_ARGS__)
-#define LOG_I(format, ...) mix_log(VIDEO_ENC_COMP, VIDEO_ENC_LOG_LEVEL_INFO, format, ##__VA_ARGS__)
-#define LOG_W(format, ...) mix_log(VIDEO_ENC_COMP, VIDEO_ENC_LOG_LEVEL_WARNING, format, ##__VA_ARGS__)
-#else
-#define LOG_V(format, ...)
-#define LOG_I(format, ...)
-#define LOG_W(format, ...)
-#endif
-
-#define LOG_E(format, ...) mix_log(VIDEO_ENC_COMP, VIDEO_ENC_LOG_LEVEL_ERROR, format, ##__VA_ARGS__)
+#define LOG_TAG "VideoEncoder"
+#if 1
+#define LOG_V(...) LOGV_IF(gLogLevel, __VA_ARGS__)
+#define LOG_I(...) LOGI_IF(gLogLevel, __VA_ARGS__)
+#define LOG_W(...) LOGW_IF(gLogLevel, __VA_ARGS__)
+#define LOG_E(...) LOGE_IF(gLogLevel, __VA_ARGS__)
 #else
 #define LOG_V printf
 #define LOG_I printf
@@ -43,6 +25,7 @@
 #define LOG_E printf
 #endif
 
+extern int32_t gLogLevel;
 #define CHECK_VA_STATUS_RETURN(FUNC)\
     if (vaStatus != VA_STATUS_SUCCESS) {\
         LOG_E(FUNC" failed. vaStatus = %d\n", vaStatus);\