Z991239-5263 #comment 下线双录人型框资源文件和代码逻辑

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -916,6 +916,7 @@ int CLocalMediaPlayEntity::GetAudioOutDev()
 	return iRet;
 }
 
+
 ErrorCodeEnum CLocalMediaPlayEntity::LoadEntityConfig()
 {
 	SpIniMappingTable table;
@@ -946,7 +947,7 @@ ErrorCodeEnum CLocalMediaPlayEntity::LoadEntityConfig()
 #ifdef RVC_OS_LINUX
 	m_iPlayType = 1;
 #endif // RVC_OS_LINUX
-
+	
 	return Error;
 }
 

Module/mod_sipphone/unix/video_session.cpp

@@ -1743,72 +1743,6 @@ static void stop_ui(video_session_t *session)
 #endif
 }
 
-static int load_record_area_png(video_session_t *session)
-{
-	int iret = -1;
-	if (NULL == session){
-		return iret;
-	}
-
-	//加载双录人形背景框
-	char strPath[MAX_PATH_SIZE]={0};
-	char strRecordAreaPath[MAX_PATH_SIZE] = { 0 };
-
-#ifdef RVC_OS_WIN
-	GetCurrentRunPath(strPath);
-	sprintf(strRecordAreaPath, "%s\\bin\\recordarea.png", strPath);
-
-	if (ExistsFile(strRecordAreaPath))
-	{
-		if (session->recordareaimage == NULL)
-		{
-			if((session->conf.eDeviceType == eMobilePadType)||(session->conf.eDeviceType == ePadtype)||(session->conf.eDeviceType == eDesk2SType)||(session->conf.eDeviceType == eDesk1SType)||(session->conf.eDeviceType == eDesk2SIntegratedType))
-			{
-				//pad版对人形区域放大处理
-				session->recordareaimage = cvLoadImage(strRecordAreaPath);	
-				IplImage* tmp = cvCreateImage(cvSize(session->recordareaimage->width,session->recordareaimage->height),IPL_DEPTH_8U,3);
-				cvResize(session->recordareaimage ,tmp);
-				cvSetImageROI(tmp,cvRect(0,0,session->recordareaimage->width,session->recordareaimage->height));
-				//cvSetImageROI(tmp,cvRect(0,0,session->recordareaimage->width,session->recordareaimage->height));
-				cvCopy(tmp,session->recordareaimage);
-				cvReleaseImage(&tmp);
-			}
-			else
-			{
-				session->recordareaimage = cvLoadImage(strRecordAreaPath);		
-			}
-		}
-		if (session->recordareamask == NULL )
-		{
-			if((session->conf.eDeviceType == eMobilePadType)||(session->conf.eDeviceType == ePadtype)||(session->conf.eDeviceType == eDesk2SType)||(session->conf.eDeviceType == eDesk1SType)||(session->conf.eDeviceType == eDesk2SIntegratedType))
-			{
-				//pad版对人形区域放大处理
-				session->recordareamask = cvLoadImage(strRecordAreaPath,0);	
-				IplImage* tmp = cvCreateImage(cvSize(session->recordareamask->width,session->recordareamask->height),IPL_DEPTH_8U,1);
-				cvResize(session->recordareamask ,tmp);
-				cvSetImageROI(tmp,cvRect(0,0,session->recordareamask->width,session->recordareamask->height));
-				cvCopy(tmp,session->recordareamask);
-				cvReleaseImage(&tmp);
-			}
-			else
-			{
-				session->recordareamask = cvLoadImage(strRecordAreaPath,0);	
-			}
-		}
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Load record area img Success");
-		iret = 0;
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Load record area img Fail");
-		session->recordareaimage = NULL;
-		session->recordareamask = NULL;
-	}
-#endif // RVC_OS_WIN
-
-	return iret;
-}
-
 
 int video_session_create(const video_session_conf_t *conf, video_session_t **p_session)
 {

Module/mod_sipphone/video_render.cpp

@@ -125,7 +125,6 @@ int rvc_remote_video_render(rvc_video_render_t* prender, void* videoframe)
 
 void* rvc_videorender_func(void* arg)
 {
-	LOG_FUNCTION();
 	rvc_video_render_t* param = (rvc_video_render_t*)arg;
 	int ilocal_video_fresh_time = param->location_param.ilocal_fresh_time;
 	Clibvideoqueue* local_video_queue = new Clibvideoqueue(REC_COMMON_VIDEO_ENV_SHM_PREVIEW_QUEUE);

Module/mod_sipphone/video_session.h

@@ -103,8 +103,6 @@ struct video_session_s
 	struct SwsContext* local_encode_sws_ctx_opt;
 	IplImage* personimage;
 	IplImage* personmask;
-	IplImage* recordareaimage;
-	IplImage* recordareamask;
 	HANDLE ui_thread;
 	HANDLE ui_event;
 

Module/mod_sipphone/win/video_session.cpp

@@ -615,28 +615,6 @@ static int on_pull(videoplayer_t *player, void *user_data, video_frame **frame)
 					session->bcamera_error_posted = true;
 				}
 			}
-
-			//双录人形位置框融合处理
-			if (result&&session->recordareaimage!=NULL&&session->recordareamask!=NULL&&*session->conf.ref_Is_showRecordArea==1)
-			{		
-				IplImage*img = cvCreateImageHeader(cvSize(frm.width,frm.height),IPL_DEPTH_8U,3);
-				img->imageData = (char*)frm.data;
-				if (frm.width!=session->recordareaimage->width)
-				{
-					IplImage*tmp = cvCreateImage(cvSize(frm.width,frm.height),IPL_DEPTH_8U,3);
-					IplImage*tmpmask = cvCreateImage(cvSize(frm.width,frm.height),IPL_DEPTH_8U,1);
-					cvResize(session->recordareaimage,tmp);
-					cvResize(session->recordareamask,tmpmask);
-					cvAdd(img,tmp,img,tmpmask);
-					cvReleaseImage(&tmp);
-					cvReleaseImage(&tmpmask);
-				}
-				else
-				{
-					cvAdd(img,session->recordareaimage,img,session->recordareamask);
-				}
-				cvReleaseImageHeader(&img);
-			}
 		}
 	}
 	*frame = tmp_frame_preview;
@@ -813,28 +791,6 @@ static int get_local_video_frame(void* user_data, video_frame** frame)
 					}
 					cvReleaseImageHeader(&img);
 				}
-
-				//双录人形位置框融合处理
-				if (session->recordareaimage != NULL && session->recordareamask != NULL && *session->conf.ref_Is_showRecordArea == 1)
-				{
-					IplImage* img = cvCreateImageHeader(cvSize(frm.width, frm.height), IPL_DEPTH_8U, 3);
-					img->imageData = (char*)frm.data;
-					if (frm.width != session->recordareaimage->width)
-					{
-						IplImage* tmp = cvCreateImage(cvSize(frm.width, frm.height), IPL_DEPTH_8U, 3);
-						IplImage* tmpmask = cvCreateImage(cvSize(frm.width, frm.height), IPL_DEPTH_8U, 1);
-						cvResize(session->recordareaimage, tmp);
-						cvResize(session->recordareamask, tmpmask);
-						cvAdd(img, tmp, img, tmpmask);
-						cvReleaseImage(&tmp);
-						cvReleaseImage(&tmpmask);
-					}
-					else
-					{
-						cvAdd(img, session->recordareaimage, img, session->recordareamask);
-					}
-					cvReleaseImageHeader(&img);
-				}
 			}
 			else {
 				video_frame_fill_black(tmp_frame_preview);
@@ -1025,14 +981,6 @@ static int record_agent_picture_show_session_destory(video_session_t* session)
 		cvReleaseImage(&session->personmask);
 	}
 
-	if (session->recordareaimage){
-		cvReleaseImage(&session->recordareaimage);
-	}
-
-	if (session->recordareamask){
-		cvReleaseImage(&session->recordareamask);
-	}
-
 	return 0;
 }
 
@@ -2050,41 +1998,6 @@ static void stop_ui(video_session_t *session)
 }
 
 
-static int load_record_area_png(video_session_t *session)
-{
-	int iret = -1;
-	if (NULL == session){
-		return iret;
-	}
-
-	//加载双录人形背景框
-	char strPath[MAX_PATH_SIZE]={0};
-	GetCurrentRunPath(strPath);
-	char strRecordAreaPath[MAX_PATH_SIZE]={0} ;
-	sprintf(strRecordAreaPath,"%s\\bin\\recordarea.png",strPath);
-	if (_access(strRecordAreaPath,0)!=-1)
-	{
-		if (session->recordareaimage == NULL)
-		{
-			session->recordareaimage = cvLoadImage(strRecordAreaPath);		
-		}
-		if (session->recordareamask == NULL )
-		{
-			session->recordareamask = cvLoadImage(strRecordAreaPath,0);	
-		}
-		iret = 0;
-	}
-	else
-	{
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Load record area img Fail");
-		session->recordareaimage = NULL;
-		session->recordareamask = NULL;
-	}
-
-	return iret;
-}
-
-
 int Local_video_session_create(const video_session_conf_t *conf, video_session_t **p_session, const bool bremote)
 {
 	video_session_t *session = ZALLOC_T(video_session_t);
@@ -2116,11 +2029,6 @@ int Local_video_session_create(const video_session_conf_t *conf, video_session_t
 		}
 		session->local_clock = NULL;
 
-		if (false == bremote){
-			if (0 == load_record_area_png(session)){
-				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("load record area picture failed.");
-			}
-		}
 		*p_session = session;
 	}
 	return 0;
@@ -2327,13 +2235,6 @@ void video_session_destroy(video_session_t *session)
 		cvReleaseImage(&session->personmask);
 	}
 
-	if (session->recordareaimage){
-		cvReleaseImage(&session->recordareaimage);
-	}
-
-	if (session->recordareamask){
-		cvReleaseImage(&session->recordareamask);
-	}
 	free(session);
 }
 

Other/win/libvideorecord/CMakeLists.txt

@@ -71,10 +71,8 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS} PRIVATE
 	videoqueue
 	libaudions
 	)  
-
-target_compile_definitions(${MODULE_NAME} PUBLIC "LIBWMVRECORD_API")
-
-
+	
+target_compile_definitions(${MODULE_NAME} PUBLIC "LIBVIDEORECORD_EXPORTS")
 
 if(MSVC)
 	install(TARGETS ${MODULE_NAME}