Z991239-5525 #comment 优化摄像头采集实体日志

Module/mod_mediacontroller/capture.cpp

@@ -984,7 +984,7 @@ static void opt_cap_on_frame(void *user_data, video_frame *frame)
 	} else if (cap->config.video_opt_rotate == 270) {
 		rotate = -1;
 	} else {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("video_opt_rotate is not 90 or 270 return.");
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("video_opt_rotate is not 90 or 270 return.");
 		return;
 	}
 

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -1172,13 +1172,20 @@ ErrorCodeEnum CMediaControllerEntity::LoadConfig(capture_config_t *conf)
 		table.AddEntryString("Video", "EnvCamera", conf->strVideoEnv, "$");
 		table.AddEntryString("Video", "OptCamera", conf->strVideoOpt, "$");
 		table.AddEntryInt("Video", "EnvRotate", conf->video_env_rotate, 0);
-		table.AddEntryInt("Video", "OptRotate", conf->video_opt_rotate, 0);
-		table.AddEntryInt("Video", "EnvFps", conf->video_env_fps, 0);
-		table.AddEntryInt("Video", "OptFps", conf->video_opt_fps, 0);
-		table.AddEntryInt("Video", "mtu", imtu, 0);
+		table.AddEntryInt("Video", "OptRotate", conf->video_opt_rotate, 270);
+		table.AddEntryInt("Video", "EnvFps", conf->video_env_fps, 15);
+		table.AddEntryInt("Video", "OptFps", conf->video_opt_fps, 15);
+		table.AddEntryInt("Video", "mtu", imtu, 1500);
 		Error = table.Load(spConfig);
 		if (Error == Error_Succeed)
 		{
+			if (0 != conf->video_env_rotate) {
+				conf->video_env_rotate = 0;
+			}
+
+			if (270 != conf->video_opt_rotate) {
+				conf->video_opt_rotate = 270;
+			}
 			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_ENV_CAMERA_INFO, conf->strVideoEnv.GetData());
 			LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_OPT_CAMERA_INFO, conf->strVideoOpt.GetData());
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_INFOS, generateCameraInfosJson(conf->strVideoEnv, conf->strVideoOpt, conf->video_env_rotate, conf->video_opt_rotate, imtu).GetData());

Other/win/libaudiorender/libaudiorender.cpp

@@ -473,9 +473,9 @@ void AudioRenderImpl::RenderFunc()
 					framedata.framesize = m_frame_format->framesize;
 					framedata.data = (char*)OutAudioBuffer;
 					framedata.iseriesnumber = iseriesnumber++;
-					BOOL bRet = m_audio_cap->InsertAudio(&framedata);
+					bool bRet = m_audio_cap->InsertAudio(&framedata);
 					if (bRet){
-						if (0 == framedata.iseriesnumber % 300){
+						if (0 == framedata.iseriesnumber % 1000){
 							RenderLog("speaker audio[%d] InsertAudio success.", framedata.iseriesnumber);
 						}
 					}