Z991239-6004 #comment 优化媒体资源控制实体日志

Module/mod_mediacontroller/Event.h

@@ -70,7 +70,7 @@
 #define LOG_EVT_MEDIACONTROLLER_ENVCAM_FRAME_INFO			0x20880081  //上摄像头帧数信息
 #define LOG_EVT_MEDIACONTROLLER_OPTCAM_FRAME_INFO			0x20880082  //下摄像头帧数信息
 #define LOG_EVT_MEDIACONTROLLER_NOMATCHED_RESOLUTION		0x20880083  //摄像头没有满足要求的分辨率
-#define LOG_EVT_MEDIACONTROLLER_CAMERA_BRIGHTNESS			0x20880064  //摄像头亮度值信息
+#define LOG_EVT_MEDIACONTROLLER_CAMERA_BRIGHTNESS			0x20880084  //摄像头亮度值信息
 
 #define LOG_EVT_MEDIACONTROLLER_CAMERA_STARTED				0x20890001	//摄像头已开启
 #define LOG_EVT_MEDIACONTROLLER_CAMERA_STOPPED				0x20890002  //摄像头已关闭

Module/mod_mediacontroller/brightnessinfo.cpp

@@ -4,7 +4,7 @@
 
 
 void HttpsLogCallBack(const char* logtxt) {
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("HttpsLogCallBack")("HttpsLogCallBack: %s.", logtxt);
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM).setAPI("HttpsLogCallBack")("HttpsLogCallBack: %s.", logtxt);
 }
 
 
@@ -52,16 +52,16 @@ int post_camera_brightness_info_list(unsigned int& uposttime, CSimpleStringA& er
 
 	req.m_reqContent = sw.write(rootReq);
 
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("m_reqContent is %s.", req.m_reqContent.c_str());
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("m_reqContent is %s.", req.m_reqContent.c_str());
 
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin http get request, timeout is %d, printdbg flag is %s.", req.m_timeOut, req.m_printDbg ? "true" : "false");
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("begin http get request, timeout is %d, printdbg flag is %s.", req.m_timeOut, req.m_printDbg ? "true" : "false");
 
 	unsigned int ustarttime = SP::Module::Comm::RVCGetTickCount();
 
 	BrightnessInfoHTTPRet ret;
 	if (client->Post(req, ret)) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("post result is %s, returnCode:%s, code:%s, errorMsg:%s, message:%s.",
-			ret.m_success ? "success" : "failed", ret.m_returnCode.c_str(), ret.m_code.c_str(), ret.m_errorMsg.c_str(), ret.m_message.c_str());
+		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("post result is %s, returnCode:%s, code:%s, errorMsg:%s, message:%s.",
+		//	ret.m_success ? "success" : "failed", ret.m_returnCode.c_str(), ret.m_code.c_str(), ret.m_errorMsg.c_str(), ret.m_message.c_str());
 		uposttime = SP::Module::Comm::RVCGetTickCount() - ustarttime;
 		iret = 0;
 	}

Module/mod_mediacontroller/capture.cpp

@@ -452,12 +452,12 @@ static void record_portaudio_capture_stop(rvc_audio_capture_t* audio_cap)
 	if (NULL != audio_cap) {
 		if (audio_cap->stream) {
 			PaError Error = Pa_AbortStream(audio_cap->stream);
-			if (paNoError == Error) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Pa_AbortStream no error.");
+			if (paNoError != Error) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Pa_AbortStream error.");
 			}
 			Error = Pa_CloseStream(audio_cap->stream);
-			if (paNoError == Error) {
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Pa_CloseStream no error.");
+			if (paNoError != Error) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Pa_CloseStream error.");
 			}
 			audio_cap->stream = NULL;
 		}
@@ -1219,20 +1219,16 @@ static int video_capture_start_win(video_capture_t* video_cap)
 	}
 
 	int dev_id;
-	if (video_cap->camera_type == CAMERA_TYPE_ENV)
-	{
+	if (video_cap->camera_type == CAMERA_TYPE_ENV){
 		dev_id = capture_get_video_device_id(conf->strVideoEnv);
-		if (dev_id == -1) 
-		{
+		if (dev_id == -1) {
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("No environment camera,please check config file or device!");
 			return -1;
 		}
 	}
-	else
-	{
+	else{
 		dev_id = capture_get_video_device_id(conf->strVideoOpt);
-		if (dev_id == -1) 
-		{
+		if (dev_id == -1) {
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("No operation camera,please check config file or device!");
 			return -1;
 		}
@@ -1241,8 +1237,7 @@ static int video_capture_start_win(video_capture_t* video_cap)
 	int cap_mode;
 	int rc = -1;
 	rc = calc_capture_mode(REC_COMMON_VIDEO_SNAPSHOT_WIDTH, REC_COMMON_VIDEO_SNAPSHOT_HEIGHT, &cap_mode);
-	if (rc != 0) 
-	{
+	if (rc != 0) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("calc cap_mode failed!");
 		return rc;
 	}
@@ -1261,15 +1256,13 @@ static int video_capture_start_win(video_capture_t* video_cap)
 	param.logevent = &__logevent;
 
 	rc = videocap_create(&video_cap->cap, &param);
-	if (rc != 0) 
-	{
+	if (rc != 0) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("videocap create failed!");
 		return rc;
 	}
 
 	rc = videocap_start(video_cap->cap);
-	if (rc != 0) 
-	{
+	if (rc != 0) {
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("videocap start failed!");
 		videocap_destroy(video_cap->cap);
 		video_cap->cap = NULL;
@@ -1449,26 +1442,21 @@ namespace MediaController {
 	{
 		int dev_id1 = capture_get_video_device_id(config->strVideoEnv);
 		int dev_id2 = capture_get_video_device_id(config->strVideoOpt);
-		if((dev_id1 != -1)&&(nCamera==ENVCAMERA)&&(cap->env_video == NULL))
-		{
+		if((dev_id1 != -1)&&(nCamera==ENVCAMERA)&&(cap->env_video == NULL)){
 			cap->env_video = video_capture_create(cap, CAMERA_TYPE_ENV);
-			if (!cap->env_video) 
-			{
+			if (!cap->env_video){
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create env video object failed!");
 				return Error_Unexpect;
 			}
 		}
-		else if((dev_id2 != -1)&&(nCamera == OPTCAMERA)&&(cap->opt_video == NULL))
-		{
+		else if((dev_id2 != -1)&&(nCamera == OPTCAMERA)&&(cap->opt_video == NULL)){
 			cap->opt_video = video_capture_create(cap, CAMERA_TYPE_OPT);
-			if (!cap->opt_video) 
-			{
+			if (!cap->opt_video) {
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("create opt video object failed!");
 				return Error_Unexpect;
 			}
 		}
-		else
-		{
+		else{
 			return Error_Unexpect;
 		}
 		return Error_Succeed;
@@ -1562,7 +1550,6 @@ namespace MediaController {
 			}
 		}
 		else{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio_capture_t is null.");
 			rslt = Error_AudioIN;
 		}
 
@@ -1900,24 +1887,23 @@ namespace MediaController {
 				Bin2Str(x, sizeof(x), t1, sizeof(t1));
 			}
 		
-			if (dev_name != NULL && strlen(dev_name) > 1 && 
-				strstr(dev_name, ";") == NULL) 
-			{
+			if (dev_name != NULL && strlen(dev_name) > 1 && strstr(dev_name, ";") == NULL) {
 				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[dbg] device_path: %s",t2);
-				if (strstr(t2,dev_name) != NULL) 
-				{
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[dbg] %s founded in %d cameras.", dev_name, n);
+				if (strstr(t2,dev_name) != NULL) {
 					return i;
 				}
-				if (strcmp(dev_name, t) == 0) 
+
+				if (strcmp(dev_name, t) == 0) {
 					return i;
+				}
 			}
 			else
 			{
 				strcat(t, ";");
 				strcat(t, t1);
-				if (strcmp(dev_name, t) == 0)
+				if (strcmp(dev_name, t) == 0) {
 					return i;
+				}
 			}
 		}
 		return -1; // not found
@@ -1969,7 +1955,7 @@ namespace MediaController {
 
 		{
 			icamnum = videocap_get_device_count();
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("camera count is %d.", icamnum);
+			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("camera count is %d.", icamnum);
 			for (int i = 0; i < icamnum; ++i) {
 				WCHAR tmp[256] = {0};
 				char t[256] = {0};
@@ -1997,7 +1983,7 @@ namespace MediaController {
 					md5(x, t1, strlen(t1));
 					Bin2Str(x, sizeof(x), t1, sizeof(t1));
 				}
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s;%s", i, t, t1);
+				//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s;%s", i, t, t1);
 				strCamInfoJson += CSimpleStringA::Format("\"%d\":\"%s;%s\",", i, t, t1);
 			}
 
@@ -2025,13 +2011,13 @@ namespace MediaController {
 		{
 			int inumber = 0;
 			icamnum = rvc_videocap_get_device_count();
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("camera count is %d.", icamnum);
+			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("camera count is %d.", icamnum);
 			for (int i = 0; i < 64 && inumber < icamnum; ++i) {
 				char strcamera[2 * MAX_PATH] = { 0 };
 				char strpath[MAX_PATH] = { 0 };
 
 				if (0 == rvc_videocap_get_device_fullpathname(i, strcamera, 2 * MAX_PATH)){
-					DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", inumber, strcamera);
+					//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%d = %s", inumber, strcamera);
 					strCamInfoJson += CSimpleStringA::Format("\"%d\":\"%s\",", inumber, strcamera);
 					inumber++;
 
@@ -2314,7 +2300,7 @@ namespace MediaController {
 #else
 		if (cap && cap->env_video && cap->env_video->pVideoCap && (nCode != Error_EnvCamera) && (nCode != Error_AllCamera)) {
 			if (cap->env_video->pVideoCap->GetCamRawBrightnessRange(imin, imax)) {
-				DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("min brightness is %d, max brightness is %d.", *imin, *imax);
+				//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("min brightness is %d, max brightness is %d.", *imin, *imax);
 				iret = 0;
 			}
 		}

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -325,7 +325,6 @@ void CMediaControllerEntity::OnStarted()
 	{
 		CSimpleStringA uiState("");
 		GetFunction()->GetSysVar("UIState", uiState);
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Get UIState value is %s.", uiState.GetData());
 		if (uiState.GetLength() > 0 && uiState[0] == 'F') {
 			StartAllCameras(true);
 		}
@@ -346,7 +345,6 @@ void CMediaControllerEntity::OnStarted()
 	m_PhotoSaveDir += "CameraPhoto";
 	m_PhotoSaveDir += SPLIT_SLASH_STR;
 
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("photo save dir is %s.", m_PhotoSaveDir.GetData());
 #endif
 #endif
 
@@ -428,7 +426,7 @@ DeviceTypeEnum CMediaControllerEntity::RvcGetDeviceType()
 	}
 
 	if (eType >= 0 && eType < sizeof(Device_Type_Table) / sizeof(char*)) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("device type is %s.", Device_Type_Table[eType]);
+		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("device type is %s.", Device_Type_Table[eType]);
 	}
 
 	return eType;
@@ -536,7 +534,6 @@ void CMediaControllerEntity::OnPreClose(EntityCloseCauseEnum eCloseCause,CSmartP
 
 #ifdef RVC_OS_WIN
 	if (NULL != m_pAudioRenderObj) {
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("destroy audio render obj,and it's addr is 0x%08x.", m_pAudioRenderObj);
 		DestroyIAudioRenderObj(m_pAudioRenderObj);
 	}
 #else
@@ -931,13 +928,11 @@ void CMediaControllerEntity::OnReceivePkt(int sub_type, const char *buffer, int
 				}
 
 			}
-			else
-			{
+			else{
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("device type cannot adj brightness");
 			}		
 		}
-		else
-		{
+		else{
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("the camera not start!");
 		}	
 	}
@@ -951,14 +946,11 @@ ErrorCodeEnum CMediaControllerEntity::RealSelfCheck()
 		HealthManagerService_RealCheck_Req req;
 		req.name = GetEntityName();
 		HealthManagerService_RealCheck_Ans ans;
-		DWORD Timeout = 500;
-		Error = m_pHMClient->RealCheck(req,ans,Timeout);
-		if (Error!=Error_Succeed)
-		{
+		Error = m_pHMClient->RealCheck(req,ans,500);
+		if (Error!=Error_Succeed){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("RealSelfcheck fail!");
 		}
-		else
-		{
+		else{
 			LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_REAL_SELF_CHECK, "media controller entity auto restart.");
 		}
 	}
@@ -1019,15 +1011,12 @@ void CMediaControllerEntity::SendCameraBright(DeviceTypeEnum eType)
 		capture_get_camera_brightness(&nValue, m_capture, m_nCameraErrorCode, 0);
 	}
 
-	if (nValue >= 0)
-	{
+	if (nValue >= 0){
 		buf & nValue;
 		Info.data = buf.ToBlob();
 		m_pMediaControllerChannel->Send(Info);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send cur camera bright value is %d.", nValue);
 	}
-	else
-	{
+	else{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send cur camera bright value Fail!");
 	}
 }
@@ -1430,7 +1419,6 @@ void CMediaControllerEntity::OnBrocastEnvCameraCapInfo(int icaptime, int irealfr
 	CSimpleStringA strMsg = CSimpleStringA::Format("摄像头已打开%d秒, 输出图像%d帧, 实际帧率为%.2ffps, 稳定性偏差为%.4f.", icaptime, irealframes, frealfps, fstable);
 	ret.cameracapmsg = CSimpleStringA2W(strMsg);
 	SpSendBroadcast(GetFunction(), eMsg_EnvCameraCapInfo, eMsgSig_EnvCameraCapInfo, ret);
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("spsendbroadcast envcamera cap info is %s", strMsg.GetData());
 }
 
 ErrorCodeEnum CMediaControllerEntity::GetEnvCamCaptureProcess()
@@ -1663,7 +1651,6 @@ void CMediaControllerEntity::OnLog( const CAutoArray<CUUID> &SubIDs, const CUUID
 
 	case LOG_EVT_UI_STARTCAMERACAPTURE:
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_UI_STARTCAMERACAPTURE event");
 #ifdef DEVOPS_ON_PRD
 #else
 #ifdef RVC_OS_WIN
@@ -1676,7 +1663,6 @@ void CMediaControllerEntity::OnLog( const CAutoArray<CUUID> &SubIDs, const CUUID
 
 	case LOG_EVT_UI_STOPCAMERACAPTURE:
 	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("recv LOG_EVT_UI_STOPCAMERACAPTURE event");
 #ifdef DEVOPS_ON_PRD
 #else
 #ifdef RVC_OS_WIN
@@ -1833,7 +1819,9 @@ ErrorCodeEnum CMediaControllerEntity::StartCamera(bool bstartaudio)
 			CSimpleStringA strValue("");
 			Func->GetSysVar(SYSVAR_SOUNDCARDSTATE, strValue);
 			m_capture->config.strAudioState = strValue;
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Sound Card State is %s.", strValue.GetData());
+			if ('N' != strValue[0]) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sound Card State %s.", strValue.GetData());
+			}
 
 			Error = capture_start(m_capture, bstartaudio);
 			if (Error != Error_Succeed)
@@ -1934,7 +1922,7 @@ ErrorCodeEnum CMediaControllerEntity::ReStartCamera(int nCamera)
 	if (m_capture != NULL)
 	{
 		if((stopcamera(m_capture,nCamera)==-1)){
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReStartCamera %d,stop camera fail!", nCamera);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("restart camera %d, stop camera failed!", nCamera);
 		}
 #ifdef RVC_OS_WIN
 		Sleep(2000);
@@ -1949,7 +1937,7 @@ ErrorCodeEnum CMediaControllerEntity::ReStartCamera(int nCamera)
 			Error = capture_start(m_capture, nCamera);
 			if (Error != Error_Succeed)
 			{
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReStartCamera %d,capture_start fail!", nCamera);
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("restart camera %d, capture start failed!", nCamera);
 				capture_destroy(m_capture, nCamera);
 				return Error;
 			}
@@ -1960,7 +1948,7 @@ ErrorCodeEnum CMediaControllerEntity::ReStartCamera(int nCamera)
 		}
 		else
 		{
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("ReStartCamera %d,capture_create fail!", nCamera);
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("restart camera %d, capture create failed!", nCamera);
 			capture_destroy(m_capture,nCamera);
 			return Error;
 		}	
@@ -2047,11 +2035,9 @@ ErrorCodeEnum CMediaControllerEntity::StartSpeakerAudioRender(int iQueue, audio_
 	auto rc = Error_Succeed;
 #ifdef RVC_OS_WIN
 	if (m_bSpeakerCap){
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("start speak audio render.");
 		if (NULL != m_pAudioRenderObj){
 			if(0 == m_pAudioRenderObj->StartRender(0, pFrame, strName)){
 				m_bHasStartSpeakerRender = true;
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("start speak audio render success.");
 			}
 		}
 	}
@@ -2068,7 +2054,6 @@ ErrorCodeEnum CMediaControllerEntity::StopSpeakerAudioRender()
 	if (m_bSpeakerCap){
 		if (NULL != m_pAudioRenderObj){
 			m_pAudioRenderObj->StopRender();
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop Speaker Audio Render.");
 			m_bHasStartSpeakerRender = false;
 		}
 	}
@@ -2207,7 +2192,7 @@ void CMediaControllerEntity::OnCameraStarted()
 	int ioptbrightness = 0;
 	capture_get_camera_brightness(&ioptbrightness, m_capture, m_nCameraErrorCode, 1);
 
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("current env camera brightness is %d, opt camera brightness is %d.", ienvbrightness, ioptbrightness).GetData());
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)(CSimpleStringA::Format("current env camera brightness is %d, opt camera brightness is %d.", ienvbrightness, ioptbrightness).GetData());
 }
 
 
@@ -2241,7 +2226,7 @@ void CMediaControllerEntity::HandleStartCameraCapture(const char* pszMessage)
 	char strphotoname[256] = { 0 };
 	int isecond = 0;
 	sscanf(pszMessage, "%d@%d@%d@%d@%d@%s", &local_view_x, &local_view_y, &local_view_cx, &local_view_cy, &isecond, strphotoname);
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("photo name is %s, picture interval time is %d.", strphotoname, isecond);
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("photo name is %s, picture interval time is %d.", strphotoname, isecond);
 	if (isecond <= 5) {
 		isecond = 5;
 	}
@@ -2249,20 +2234,14 @@ void CMediaControllerEntity::HandleStartCameraCapture(const char* pszMessage)
 		CreateDirA(m_PhotoSaveDir.GetData(), true);
 	}
 
-	if (Error_Succeed == StartSaveEnvCamPhoto(strphotoname, isecond)) {
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Start Save EnvCam Photo success.");
-	}
-	else {
+	if (Error_Succeed != StartSaveEnvCamPhoto(strphotoname, isecond)) {
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Start Save EnvCam Photo failed.");
 	}
 }
 
 void CMediaControllerEntity::HandleStopCameraCapture()
 {
-	if (Error_Succeed == StopSaveEnvCamPhoto()) {
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Stop Save EnvCam Photo success.");
-	}
-	else {
+	if (Error_Succeed != StopSaveEnvCamPhoto()) {
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Stop Save EnvCam Photo failed.");
 	}
 }
@@ -2305,12 +2284,6 @@ void CMediaControllerEntity::SetCameraBrightness(SpReqAnsContext<MediaService_Se
 {
 	int ibrightness = ctx->Req.ibrightness;
 	if (0 == capture_set_camera_brightness(ibrightness, m_capture, m_nCameraErrorCode, ctx->Req.icameraid)) {
-		if (0 == ctx->Req.icameraid) {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("set env camera brightness to %d.", ibrightness);
-		}
-		else if (1 == ctx->Req.icameraid) {
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("set opt camera brightness to %d.", ibrightness);
-		}
 		ctx->Ans.result = 0;
 		ctx->Answer(Error_Succeed);
 	}
@@ -2514,7 +2487,7 @@ void MediaServiceSession::Handle_ManipulateCameras(SpReqAnsContext<MediaService_
 		else {
 			m_pEntity->LogTransactionRecordCtrEvt(0);
 			Error = Error_Succeed;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current is not on business, camera is not on.");
+			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current is not on business, camera is not on.");
 		}
 		m_pEntity->m_bJsOccupyCamera = true;
 	}
@@ -2530,7 +2503,7 @@ void MediaServiceSession::Handle_ManipulateCameras(SpReqAnsContext<MediaService_
 		else {
 			m_pEntity->LogTransactionRecordCtrEvt(1);
 			Error = Error_Succeed;
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current is not on business, not start camera.");
+			//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current is not on business, not start camera.");
 		}
 		m_pEntity->m_bJsOccupyCamera = false;
 	}
@@ -2662,7 +2635,7 @@ void MediaServiceSession::Handle_TurnOnCamera(SpReqAnsContext<MediaService_TurnO
 		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA2808").setAPI(__FUNCTION__)("摄像头故障，请联系厂商排查");
 		ctx->Answer(Error_AllCamera, LOG_WARN_ALLCAMERA_ERRORS);
 	}
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Error = %d, CameraErrorCode = %d, result = %d.", Error, CameraErrorCode, ctx->Ans.result);
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Error = %d, CameraErrorCode = %d, result = %d.", Error, CameraErrorCode, ctx->Ans.result);
 }
 
 void MediaServiceSession::Handle_TurnOffCamera(SpReqAnsContext<MediaService_TurnOffCamera_Req, MediaService_TurnOffCamera_Ans>::Pointer ctx)