#IQRV #comment UOS下的编译回归验证

Module/mod_CameraConfigManage/CMakeLists.txt

@@ -12,7 +12,7 @@ if(MSVC)
     )
 else()
     set(${MODULE_PREFIX}_SRCS
-        ${MODULE_BASE_DIR}/mod_mediacontroller/capture.cpp
+        ${MODULE_BASE_DIR}/mod_mediacontroller/${MODULE_PLAFORM_SUBDIR}/capture.cpp
         mod_CameraConfigManage.cpp
         mod_CameraConfigManage.h
         CameraConfigManage_client_g.h
@@ -39,7 +39,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libmediadeviceinfo
 	${OTHER_LIB_BASE_DIR}/libaudiomgr
-	${OTHER_LIB_BASE_DIR}/libvideocapture
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideocapture
     ${CONAN_INCLUDE_DIRS_PORTAUDIO}
     ${CONAN_INCLUDE_DIRS_FFMPEG}
 )

Module/mod_SalesRecorder/mod_SalesRecorder.h

@@ -151,12 +151,8 @@ namespace SalesRecorder {
 
 		ErrorCodeEnum DeleteVideo(const char* wmvfilename);
 
-		ErrorCodeEnum HandleDeleteVideo();
-
 		void HandleUkeyPullout();
 
-		ErrorCodeEnum HandleVideoAppendWatermark(const char* pszVideoName, const char* pszWaterMark);
-
 		int GetSystemMemoryUsage();
 
 		double GetSystemCpuUsage();
@@ -171,14 +167,12 @@ namespace SalesRecorder {
 
 		bool GetHighQualityOnSiteSalesRecorder();
 
-		void DeleteVideo(const char* videofilename);
+		ErrorCodeEnum DeleteVideo(const char* videofilename);
 
 		bool SecureClientConnect();
 
 		void SecureClientRelease();
 
-		void HandleDeleteVideo();
-
 		
 
 		bool InitSalesRecorder();
@@ -203,9 +197,9 @@ namespace SalesRecorder {
 
 		ErrorCodeEnum HandleDisplayVideo();
 		ErrorCodeEnum HandleSaveVideo();
-		
+		ErrorCodeEnum HandleDeleteVideo();
 		void HandleReturnMenu();
-		void HandleVideoAppendWatermark(const char* pszMessage);
+		ErrorCodeEnum HandleVideoAppendWatermark(const char* pszVideoName, const wchar_t* pszWaterMark);
 		ErrorCodeEnum HandleStartRecord(const char *pszMessage, const bool bRemoteRecord);
 		ErrorCodeEnum HandleSalesRecordEntityException(const char* pszMessage);
 		ErrorCodeEnum RealSelfCheck();

Module/mod_SalesRecorder/unix/mod_SalesRecorder.cpp

@@ -8,6 +8,11 @@
 #include <algorithm>
 #ifdef RVC_OS_WIN
 #include <Windows.h>
+#else
+#include <dirent.h> 
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/fcntl.h>
 #endif 
 
 #include "mod_customeraware/Event.h"
@@ -244,11 +249,13 @@ static CSimpleStringA DecryptString(LPCTSTR lpszEncrpyted)
 
 void SalesRecordServiceSession::Handle_GetOFLVideoRecords( SpReqAnsContext<SalesRecorderSerVice_GetOFLVideoRecords_Req, SalesRecorderSerVice_GetOFLVideoRecords_Ans>::Pointer ctx )
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	ctx->Answer(Error_Succeed);
 }
 
 void SalesRecordServiceSession::Handle_CheckVideoDiskStatus( SpReqAnsContext<SalesRecorderSerVice_CheckVideoDiskStatus_Req, SalesRecorderSerVice_CheckVideoDiskStatus_Ans>::Pointer ctx )
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	int nFreeRatio = 0;
 	int bSufficient = CheckDiskStatus((LPCTSTR)ctx->Req.DriveLetter,m_pEntity->m_max_disk_percent,&nFreeRatio);
 	ctx->Ans.IsSufficient = bSufficient;
@@ -258,21 +265,21 @@ void SalesRecordServiceSession::Handle_CheckVideoDiskStatus( SpReqAnsContext<Sal
 
 void SalesRecordServiceSession::Handle_PlayVideo(SpReqAnsContext<SalesRecorderSerVice_PlayVideo_Req, SalesRecorderSerVice_PlayVideo_Ans>::Pointer ctx)
 {
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("PlayVideo.");
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleDisplayVideo();
 	ctx->Answer(ErrorCode);
 }
 
 void SalesRecordServiceSession::Handle_SaveVideo(SpReqAnsContext<SalesRecorderSerVice_SaveVideo_Req, SalesRecorderSerVice_SaveVideo_Ans>::Pointer ctx)
 {
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Save Video.");
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleSaveVideo();
 	ctx->Answer(ErrorCode);
 }
 
 void SalesRecordServiceSession::Handle_StopRecord(SpReqAnsContext<SalesRecorderSerVice_StopRecord_Req, SalesRecorderSerVice_StopRecord_Ans>::Pointer ctx)
 {
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Stop Record.");
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleStopRecord((LPCTSTR)CSimpleStringW2A(ctx->Req.VideoName));
 	ctx->Answer(ErrorCode);
 }
@@ -280,6 +287,7 @@ void SalesRecordServiceSession::Handle_StopRecord(SpReqAnsContext<SalesRecorderS
 
 void SalesRecordServiceSession::Handle_SetAudioTransFlag(SpReqAnsContext<SalesRecorderSerVice_SetAudioTransFlag_Req, SalesRecorderSerVice_SetAudioTransFlag_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Audio transmission flag is %s.", ctx->Req.TransFlag ? "true" : "false");
 	ctx->Answer(Error_Succeed);
 }
@@ -287,6 +295,7 @@ void SalesRecordServiceSession::Handle_SetAudioTransFlag(SpReqAnsContext<SalesRe
 
 void SalesRecordServiceSession::Handle_StopShowVideo(SpReqAnsContext<SalesRecorderSerVice_StopShowVideo_Req, SalesRecorderSerVice_StopShowVideo_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Stop Show Video.");
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleStopShowVideo();
 	ctx->Answer(ErrorCode);
@@ -294,6 +303,7 @@ void SalesRecordServiceSession::Handle_StopShowVideo(SpReqAnsContext<SalesRecord
 
 void SalesRecordServiceSession::Handle_PlaySalesRecord(SpReqAnsContext<SalesRecorderSerVice_PlaySalesRecord_Req, SalesRecorderSerVice_PlaySalesRecord_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Stop Show Video.");
 	ErrorCodeEnum ErrorCode = m_pEntity->HandlePlaySalesRecordVideo(ctx->Req.WndX, ctx->Req.WndY, ctx->Req.WndWidth, ctx->Req.WndHeight);
 	ctx->Answer(ErrorCode);
@@ -301,10 +311,26 @@ void SalesRecordServiceSession::Handle_PlaySalesRecord(SpReqAnsContext<SalesReco
 
 void SalesRecordServiceSession::Handle_StartRemoteRecord(SpReqAnsContext<SalesRecorderSerVice_StartRemoteRecord_Req, SalesRecorderSerVice_StartRemoteRecord_Ans>::Pointer ctx)
 {
+	DbgToBeidou(ctx->link, __FUNCTION__)();
 	ErrorCodeEnum ErrorCode = m_pEntity->HandleStartRecord(ctx->Req.VideoName.GetData(), true);
 	ctx->Answer(ErrorCode);
 }
 
+
+void SalesRecordServiceSession::Handle_DeleteVideo(SpReqAnsContext<SalesRecorderSerVice_DeleteVideo_Req, SalesRecorderSerVice_DeleteVideo_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	ErrorCodeEnum ErrorCode = m_pEntity->HandleDeleteVideo();
+	ctx->Answer(ErrorCode);
+}
+
+void SalesRecordServiceSession::Handle_AppendWatermark(SpReqAnsContext<SalesRecorderSerVice_AppendWatermark_Req, SalesRecorderSerVice_AppendWatermark_Ans>::Pointer ctx)
+{
+	DbgToBeidou(ctx->link, __FUNCTION__)();
+	ErrorCodeEnum ErrorCode = m_pEntity->HandleVideoAppendWatermark(CSimpleStringW2A(ctx->Req.VideoName).GetData(), ctx->Req.Watermark.GetData());
+	ctx->Answer(ErrorCode);
+}
+
 CServerSessionBase * CSalesRecorderEntity::OnNewSession( const char* pszRemoteEntityName, const char * pszClass )
 {
 	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("%s connected class = %s!", pszRemoteEntityName, pszClass);
@@ -394,12 +420,11 @@ ErrorCodeEnum CSalesRecorderEntity::__OnStart( ErrorCodeEnum preOperationError )
 	
 	int i = 0;
 
-	m_arrListener.Init(4);
-	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_Middle, Error_IgnoreAll, LOG_EVT_UI_DELETEVIDEO, NULL, false);
+	m_arrListener.Init(3);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_UI_RETURNMENU, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_None, Error_IgnoreAll, LOG_EVT_UI_VIDEOAPPENDWATERMARK, NULL, false);
 	GetFunction()->SubscribeLog(m_arrListener[i++], this, Log_Event, Severity_High, Error_IgnoreAll, LOG_EVT_SALESRECORD_ENTITY_EXCEPTION, NULL, false);
-
+	
 	GetFunction()->RegistSysVarEvent(SYSVAR_ACTIVETRACKINGCAMERA,this);
 	GetFunction()->RegistSysVarEvent(SYSVAR_CAMERASTATE,this);
 	CSimpleStringA strValue;
@@ -671,29 +696,10 @@ void CSalesRecorderEntity::OnLog( const CAutoArray<CUUID> &SubIDs, const CUUID n
 	// 响应客户经理销售录像相关的事件
 	switch (dwUserCode)
 	{
-	case LOG_EVT_UI_SHOWVIDEO:
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("show video record.");
-		HandleDisplayVideo();
-		break;
-
-	case LOG_EVT_UI_SAVEVIDEO:
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("save record!");
-		HandleSaveVideo();
-		break;
-
-	case LOG_EVT_UI_DELETEVIDEO:
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("delete record!");
-		HandleDeleteVideo();
-		break;
-
 	case LOG_EVT_UI_RETURNMENU:
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("return menu.");
 		//HandleReturnMenu();
 		break;
-	case LOG_EVT_UI_VIDEOAPPENDWATERMARK:
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("handle video append water mark param is %s.", pszMessage);
-		HandleVideoAppendWatermark(pszMessage);
-		break;
 
 	case LOG_EVT_SALESRECORD_ENTITY_EXCEPTION:
 		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("handle sales record entity exception, and message is %s.", pszMessage);
@@ -793,8 +799,9 @@ ErrorCodeEnum CSalesRecorderEntity::PlaySalesRecordVideo( const char *videofilen
 }
 
 
-void CSalesRecorderEntity::DeleteVideo( const char *videofilename)
+ErrorCodeEnum CSalesRecorderEntity::DeleteVideo( const char *videofilename)
 {
+	ErrorCodeEnum ErrorCode = Error_Succeed;
 	if(!m_bStarted)
 	{
 		CSimpleStringA strPath;
@@ -826,10 +833,16 @@ void CSalesRecorderEntity::DeleteVideo( const char *videofilename)
 			}
 			else
 			{
+				ErrorCode = Error_NotExist;
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("[DeleteVideo] videos not exist or have been deleted!");
 			}
 		}
 	}
+	else {
+		ErrorCode = Error_NotImpl;
+	}
+
+	return ErrorCode;
 }
 
 
@@ -848,6 +861,7 @@ static unsigned long GetFileSize(const char* filename)
 	return statbuf.st_size;
 }
 
+
 ErrorCodeEnum CSalesRecorderEntity::SaveVideo( const char * videofilename)
 {
 	ErrorCodeEnum ErrorCode = Error_Succeed;
@@ -924,6 +938,7 @@ ErrorCodeEnum CSalesRecorderEntity::SaveVideo( const char * videofilename)
 	return ErrorCode;
 }
 
+
 CSimpleStringA CSalesRecorderEntity::GetTerminalStage()
 {
 	CSmartPointer<IEntityFunction> Func = GetFunction();
@@ -947,27 +962,23 @@ void CSalesRecorderEntity::SecureClientRelease()
 }
 
 
-// 请求InteractiveControl结束录像 add by ly 2018/03/12
 ErrorCodeEnum CSalesRecorderEntity::StopRecordVideo()
 {
 	auto rc = Error_Succeed;
 
 	auto pUIClient = new InteractiveControl::UIService_ClientBase(this);
 
-	if(pUIClient->Connect() != Error_Succeed)
-	{
+	if(pUIClient->Connect() != Error_Succeed){
 		pUIClient->SafeDelete();
 		pUIClient = NULL;
 		rc = Error_DevConnFailed;
 	}
-	else
-	{
+	else{
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("UIClient connected success!");
 		InteractiveControl::UIService_StopRecordVideo_Req req;
 		InteractiveControl::UIService_StopRecordVideo_Ans ans;
 		rc = (*pUIClient)(EntityResource::getLink().upgradeLink())->StopRecordVideo(req, ans, 5000);
-		if(rc != Error_Succeed)
-		{
+		if(rc != Error_Succeed){
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Stop record video failed return 0x%08x", rc);
 		}
 
@@ -1150,18 +1161,8 @@ ErrorCodeEnum CSalesRecorderEntity::HandlePlaySalesRecordVideo(int iWndX, int iW
 ErrorCodeEnum CSalesRecorderEntity::HandleStopShowVideo()
 {
 	// 视频播放 libwmpplayer
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("stop show video record file name is %s!", m_SalesVideoName);
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("stop show video record file name is %s!", m_SalesVideoName);
 	ErrorCodeEnum ErrorCode = Error_Succeed;
-	if(m_bIsShowVideo)
-	{
-		//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_pPlayer = %p while play!", m_pPlayer);
-		//m_pPlayer->Close();
-		m_bIsShowVideo = FALSE;
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("succeed to stop show video!");
-	}
-	else{
-		ErrorCode = Error_NotImpl;
-	}
 	return ErrorCode;
 }
 
@@ -1170,15 +1171,11 @@ ErrorCodeEnum CSalesRecorderEntity::HandleStopShowVideo()
 ErrorCodeEnum CSalesRecorderEntity::HandleSaveVideo()
 {
 	ErrorCodeEnum ErrorCode = Error_Succeed;
+
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Save Record Name is %s.", m_SalesVideoName);
+
 	// 将视频从tmp移动到uploadvideo
-	if (!strstr(m_SalesVideoName, "OFL")) // edit by ly 20180228
-	{
-		ErrorCode = SaveVideo(m_SalesVideoName+2);
-	}
-	else
-	{
-		ErrorCode = SaveVideo(m_SalesVideoName+4);
-	}
+	ErrorCode = SaveVideo(m_SalesVideoName+2);
 
 	ZeroMemory(m_SalesVideoName,sizeof(m_SalesVideoName));
 
@@ -1186,14 +1183,20 @@ ErrorCodeEnum CSalesRecorderEntity::HandleSaveVideo()
 }
 
 
-void CSalesRecorderEntity::HandleDeleteVideo()
+ErrorCodeEnum CSalesRecorderEntity::HandleDeleteVideo()
 {
+	ErrorCodeEnum ErrorCode = Error_Succeed;
+
+	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Delete Record Name is %s.", m_SalesVideoName);
 	// 删除tmp中的视频
-	DeleteVideo(m_SalesVideoName);  
+	ErrorCode = DeleteVideo(m_SalesVideoName);
 
 	ZeroMemory(m_SalesVideoName,sizeof(m_SalesVideoName));
+
+	return ErrorCode;
 }
 
+
 void CSalesRecorderEntity::HandleReturnMenu()
 {
 	CSimpleStringA strValue;
@@ -1211,28 +1214,24 @@ void CSalesRecorderEntity::HandleReturnMenu()
 	}
 }
 
-void CSalesRecorderEntity::HandleVideoAppendWatermark(const char* pszMessage)
+
+ErrorCodeEnum CSalesRecorderEntity::HandleVideoAppendWatermark(const char* pszVideoName, const wchar_t* pszWaterMark)
 {
-	if (NULL == pszMessage){
-		return;
+	ErrorCodeEnum Error = Error_Failed;
+	if (NULL == pszWaterMark){
+		return Error_Param;
 	}
 
-	wchar_t*result[10] = {0};
-	auto arr1 = CSimpleStringA2W(pszMessage).Split('|');
-	auto arr2 = CAutoArray<CSimpleStringW>(arr1.GetCount());
-	int icount = sizeof(result)/sizeof(char*);
-	for (int i = 0; i < arr1.GetCount() && i < sizeof(result)/sizeof(char*); i++)
-	{
-		arr2[i] = CSimpleStringW(arr1[i]);
-		result[i] = (wchar_t*)arr2[i].GetData();
+	if (m_bStarted && (NULL != m_pRecorder)){
+		if (m_pRecorder->SetRightVideoWaterMark(pszWaterMark)) {
+			Error = Error_Succeed;
+		}
 	}
 
-	if (m_bStarted && (NULL != m_pRecorder)) 
-	{
-		m_pRecorder->SetRightVideoWaterMark(result[1]);
-	}
+	return Error;
 }
 
+
 ErrorCodeEnum CSalesRecorderEntity::HandleSalesRecordEntityException(const char* pszMessage)
 {
 	// 通知到业务中台
@@ -1252,6 +1251,7 @@ ErrorCodeEnum CSalesRecorderEntity::HandleSalesRecordEntityException(const char*
 	return Error_Succeed;
 }
 
+
 bool CSalesRecorderEntity::InitSalesRecorder()
 {
 	bool bRet = FALSE;

Module/mod_guiconsole/guitask.cpp

@@ -4,12 +4,12 @@
 #include "mainfrm.h"
 #include "SpIni.h"
 #include "path.h"
+#include <winpr/sysinfo.h>
 
 #include "AccessAuthorization_client_g.h"
 using namespace AccessAuthorization;
 
 #include "mod_CenterSetting/Event.h"
-
 int level = 2;
 
 GUITask::GUITask() : m_pEntity(NULL), m_hWndMainFrame(NULL), m_hThread(NULL), m_hThread2(NULL), m_hWndStartPage(NULL),

Module/mod_mediacontroller/CMakeLists.txt

@@ -29,7 +29,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
-	${OTHER_LIB_BASE_DIR}/libvideohorflip
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideocapture
+	#todo
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudioqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
@@ -42,7 +44,7 @@ else()
 	target_include_directories(${MODULE_NAME} PRIVATE
 		${CMAKE_CURRENT_SOURCE_DIR}
 		${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
-		${OTHER_LIB_BASE_DIR}/libvideohorflip
+		${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
 		${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
 		${OTHER_LIB_PLATFORM_BASE_DIR}/libaudioqueue
 		${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue

Module/mod_recorder/CMakeLists.txt

@@ -24,9 +24,11 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 )
 
+if(MSVC)
+set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS} libfilecryption)
+else()
 set(${MODULE_PREFIX}_LIBS ${MODULE_BASE_LIBS})
-target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${CONAN_PKG_LIBS_FFMPEG} libvideorecord libfilecryption)  
-
-target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+endif(MSVC)
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} ${CONAN_PKG_LIBS_FFMPEG} libvideorecord)  
 
 deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_sipphone/CMakeLists.txt

@@ -79,7 +79,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideorender
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudions
-	${OTHER_LIB_BASE_DIR}/libvideohorflip
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
 	${OTHER_LIB_BASE_DIR}/libaudiomgr
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideorender
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideocapture

Module/mod_sipphone/mod_sipphone.h

@@ -328,6 +328,11 @@ public:
 	void Handle_RecordVideoLocation_Info(const char* pszMessage);
 	void Handle_AdjustVideoEchoEvent(const char* pszMessage);
 
+
+
+private:
+
+	ErrorCodeEnum LoadConfig(endpoint_conf_t *conf);
 #if defined(RVC_OS_WIN)
 	eVideoRenderType GetMediaConfig();
 	ErrorCodeEnum LoadEntityConfig();
@@ -348,10 +353,6 @@ public:
 	void ShowBothVideo();
 #endif //RVC_OS_WIN
 
-private:
-
-	ErrorCodeEnum LoadConfig(endpoint_conf_t *conf);
-	void InitFreshTimeConfig();
 	//载入运行时配置
 	ErrorCodeEnum LoadAudioRunConfig(int&nHandfreeout,int&nPickupout,int&nHandfreein,int&nPickupin);
 	//保存运行时
@@ -363,16 +364,12 @@ private:
 	ErrorCodeEnum RvcGetAudioDeviceInfo();
 	ErrorCodeEnum RvcSetSaveAudioVolume();
 	ErrorCodeEnum ConnectAssistChannel();
-	void HideLocalVideo();
-	void ShowLocalVideo();
-	void HideBothVideo();
-	void ShowBothVideo();
 
 public:
 	int m_kept_volume_in[2];
 	int m_kept_volume_out[2];
+	IAudioMgr* m_pAudioMgr;
 #ifdef RVC_OS_WIN
-    IAudioMgr* m_pAudioMgr;
 	void* m_pKeeperIn[2];
 	void* m_pKeeperOut[2];
 	eVideoRenderType m_eVideoRenderType;

Other/CMakeLists.txt

@@ -9,8 +9,6 @@ add_subdirectory(acmstrenc)
 add_subdirectory(libCMBPrint)
 add_subdirectory(libRestfulFunc)
 add_subdirectory(libscreencodec)
-#UOS do not need it??
-add_subdirectory(libvideohorflip)
 add_subdirectory(libaudiomgr)
 
 if(MSVC)

Other/unix/libvideocapture/CMakeLists.txt

@@ -30,7 +30,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 message(STATUS "CONAN_INCLUDE_DIRS_LIBYUV = ${CONAN_INCLUDE_DIRS_LIBYUV}")
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CMAKE_CURRENT_SOURCE_DIR}
-	${OTHER_LIB_BASE_DIR}/libvideohorflip
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${CONAN_INCLUDE_DIRS_FFMPEG}

Other/unix/libvideorecord/libvideorecord.cpp

@@ -63,14 +63,16 @@ bool Clibvideorecord::ReNameVideoFile(const char*newfilename)
 	return true;
 }
 
-bool Clibvideorecord::SetRightVideoWaterMark(wchar_t* strWaterMark)
+bool Clibvideorecord::SetRightVideoWaterMark(const wchar_t* strWaterMark)
 {
 	bool bRet = false;
+
 	if (NULL == strWaterMark){
 		return bRet;
 	}
 
 	size_t ulen = wcslen(strWaterMark);
+
 	bRet = m_pImpl->setRightWaterMark(strWaterMark, ulen * sizeof(wchar_t));
 
 	return bRet;

Other/unix/libvideorecord/libvideorecord.h

@@ -161,7 +161,7 @@ public:
 	bool StopVideoRecord();			//退出
 	void CloseVideoFile();			//结束当前录像
 	bool ReNameVideoFile(const char*newfilename);         //session变化，修改当前录像文件名
-	bool SetRightVideoWaterMark(wchar_t* strWaterMark);	  //设置拼接后右侧视频的水印
+	bool SetRightVideoWaterMark(const wchar_t* strWaterMark);	  //设置拼接后右侧视频的水印
 
 	bool PauseRecord();				//暂停录像
 	bool ContinueRecord();			//继续录像

Other/unix/libvideorecord/libvideorecord_impl.cpp

@@ -1610,7 +1610,7 @@ bool libvideorecord_impl::ReceiveRecordAudioData(unsigned char* pData, unsigned
 }
 
 
-bool libvideorecord_impl::setRightWaterMark(wchar_t* strWaterMark, size_t ulen)
+bool libvideorecord_impl::setRightWaterMark(const wchar_t* strWaterMark, size_t ulen)
 {
 	bool bRet = false;
 	memset(m_SubtitleParam.strRightAgentInfo, 0, MAX_PATH);

Other/unix/libvideorecord/libvideorecord_impl.h

@@ -47,7 +47,7 @@ public:
 	bool PauseRecord();				//暂停录像
 	bool ContinueRecord();			//继续录像
 	void ChangeFilename(const char* newfilename);
-	bool setRightWaterMark(wchar_t* strWaterMark, size_t ulen);
+	bool setRightWaterMark(const wchar_t* strWaterMark, size_t ulen);
 	bool EndRecord();
 	void Debug(const char* fmt, ...);
 	void vDebug(const char* str, va_list list);

Other/win/CMakeLists.txt

@@ -3,6 +3,9 @@ if(SIMULATE_ON)
 endif(SIMULATE_ON)
 
 # add_subdirectory(showdev)
+
+add_subdirectory(libvideohorflip)
+
 add_subdirectory(libsharememory)
 add_subdirectory(libvideoqueue)
 add_subdirectory(libfacecapture)

Other/win/libvideoframework/CMakeLists.txt

@@ -120,7 +120,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${RVC_COMMON_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${OTHER_LIB_BASE_DIR}/libvideohorflip
+    ${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
     ${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
     ${CONAN_INCLUDE_DIRS_LIBYUV}
 	)

Plugins/MediaDevDetectBasePulse/CMakeLists.txt

@@ -35,7 +35,7 @@ if(WIN32)
 else()
     target_include_directories(${MODULE_NAME} PRIVATE 
         ${CONAN_INCLUDE_DIRS_PULSEAUDIO}
-        ${OTHER_LIB_PLATFORM_BASE_DIR}/libaudiomgr
+        ${OTHER_LIB_BASE_DIR}/libaudiomgr
         )
         target_link_directories(${MODULE_NAME} PRIVATE
     ${CONAN_LIB_DIRS_PULSEAUDIO}