Z991239-6077 #comment: 优化视频回显库日志

Module/mod_sipphone/mod_sipphone.cpp

@@ -119,18 +119,16 @@ static void __audiomgrlog(void* user_data, const char* fmt, va_list arg)
 static void __video_render_log(render_loglevel elevel, void* user_data, const char* fmt, va_list arg)
 {
 	int n = rvc_vsnprintf(NULL, 0, fmt, arg);
-	if (elevel >= RENDER_LOG_INFO) {
-		if (n >= MAX_PATH) {
-			char* buf = (char*)malloc((size_t)(n + 1));
-			rvc_vsnprintf(buf, n + 1, fmt, arg);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", buf);
-			free(buf);
-		}
-		else {
-			char strlog[MAX_PATH] = { 0 };
-			rvc_vsnprintf(strlog, MAX_PATH, fmt, arg);
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", strlog);
-		}
+	if (n >= MAX_PATH) {
+		char* buf = (char*)malloc((size_t)(n + 1));
+		rvc_vsnprintf(buf, n + 1, fmt, arg);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", buf);
+		free(buf);
+	}
+	else {
+		char strlog[MAX_PATH] = { 0 };
+		rvc_vsnprintf(strlog, MAX_PATH, fmt, arg);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", strlog);
 	}
 }
 

Module/mod_sipphone/unix/video_session.cpp

@@ -1656,13 +1656,13 @@ static void __video_render_log(render_loglevel elevel, void* user_data, const ch
 	if (n >= MAX_PATH) {
 		char* buf = (char*)malloc((size_t)(n + 1));
 		vsnprintf(buf, n + 1, fmt, arg);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", buf);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", buf);
 		free(buf);
 	}
 	else {
 		char strlog[MAX_PATH] = { 0 };
 		vsnprintf(strlog, MAX_PATH, fmt, arg);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", strlog);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", strlog);
 	}
 }
 

Module/mod_sipphone/win/video_session.cpp

@@ -1675,19 +1675,18 @@ static unsigned int __stdcall ui_proc(void *arg)
 static void __video_render_log(render_loglevel elevel, void* user_data, const char* fmt, va_list arg)
 {
 	int n = _vsnprintf(NULL, 0, fmt, arg);
-	if (elevel >= RENDER_LOG_INFO) {
-		if (n >= MAX_LOG_LEN) {
-			char* buf = (char*)malloc((size_t)(n + 1));
-			_vsnprintf(buf, n + 1, fmt, arg);
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", buf);
-			free(buf);
-		}
-		else {
-			char strlog[MAX_LOG_LEN] = { 0 };
-			_vsnprintf(strlog, MAX_LOG_LEN, fmt, arg);
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", strlog);
-		}
+	if (n >= MAX_LOG_LEN) {
+		char* buf = (char*)malloc((size_t)(n + 1));
+		_vsnprintf(buf, n + 1, fmt, arg);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", buf);
+		free(buf);
+	}
+	else {
+		char strlog[MAX_LOG_LEN] = { 0 };
+		_vsnprintf(strlog, MAX_LOG_LEN, fmt, arg);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s", strlog);
 	}
+	
 }
 
 

Other/libvideorender/ivideorenderinterface.h

@@ -35,12 +35,12 @@ typedef struct videorender_param_s {
 	bool bmoveable;
 }videorender_param_t;
 
-
 enum render_loglevel {
-	RENDER_LOG_NO,
 	RENDER_LOG_DEBUG,
 	RENDER_LOG_INFO,
-	RENDER_LOG_ERROR
+	RENDER_LOG_WARN,
+	RENDER_LOG_ERROR,
+	RENDER_LOG_FATAL
 };
 
 typedef struct videorender_callback_s