Переглянути джерело

Z991239-6192 #comment: 优化mediacontroller实体日志

80274480 5 місяців тому
батько
коміт
4c8b8aa686

+ 1 - 4
Other/libaudiomgr/linux/libaudiomgr_linux.cpp

@@ -983,10 +983,7 @@ int AudioMgrImpl::stop_audio_capture()
 	/*assertions*/
 	assert(m_audio_context != NULL);
 	m_audio_context->stream_flag = AUDIO_STRM_OFF;
-	if (0 == __THREAD_JOIN(m_readthread)){
-        audiolog("read thread join success!");
-	}
-	else{
+	if (0 != __THREAD_JOIN(m_readthread)){
         audiolog("read thread join failed!");
 	}
 	return 0;

+ 1 - 3
Other/libfacecapture/libfacecapture.cpp

@@ -1514,7 +1514,7 @@ private:
 				m_eMonitorState = SomebodyOperate;
 				m_stAllFaceInfo.astFaceInfo[0].eScene = ForwardScened;
 				m_pHostEvent->GenerateMonitorEvent(EnterOperate);  //产生有人进入操作距离事件
-				m_pHostApi->Debug(FACECAP_INFO, "有人进入操作距离!");
+				m_pHostApi->Debug(FACECAP_DEBUG, "有人进入操作距离!");
 				//获取UUID
 				if (m_stAllFaceInfo.astFaceInfo[0].FaceID == 0)
 				{
@@ -1544,7 +1544,6 @@ private:
 				m_stAllFaceInfo.astFaceInfo[0].stRegion.stUpperBodyRect.x = m_nImgHeight/4;
 				m_stAllFaceInfo.astFaceInfo[0].stRegion.stUpperBodyRect.y = m_nImgWidth/4;
 				m_pHostEvent->GenerateMonitorEvent(Leave);		//产生客户离开事件
-				m_pHostApi->Debug(FACECAP_INFO, "客户离开!");
 				//清除UUID
 				m_stAllFaceInfo.astFaceInfo[0].FaceID = 0;
 			}
@@ -1556,7 +1555,6 @@ private:
 				m_stAllFaceInfo.astFaceInfo[0].eScene = BackwardScened;
 				m_eMonitorState = SomebodyClose;
 				m_pHostEvent->GenerateMonitorEvent(BackToClose);  //产生客户退回到接近距离事件
-				m_pHostApi->Debug(FACECAP_INFO, "客户退回到接近距离!");
 			} 
 			else if(SomebodyFar == m_eMonitorState)
 			{

+ 0 - 3
Other/unix/libvideocapture/linux/videocapture_linux.cpp

@@ -933,7 +933,6 @@ int VideoCaptureImpl::StopVideoCapture()
 
 		if (0 == pthread_join(m_CaptureThreadId, NULL))		{
 			m_CaptureThreadId = 0;
-			CapLog("thread join video capture thread success.");
 		}
 		else {
 			CapLog("thread join video capture thread failed for %s.", strerror(errno));
@@ -943,8 +942,6 @@ int VideoCaptureImpl::StopVideoCapture()
 		FreeAlignedMallocVideoBuffer();
 		close(m_deviceFd);
 		m_deviceFd = -1;
-
-		CapLog("video capture has stopped!");
 	}
 
 	return 0;