Revert "#IQRV #comment [sipphone] 优化视频回显功能"

This reverts commit 3b7e7c1500b0809e57986de70deab59e4b215f7a.

Module/mod_sipphone/video_session.cpp

@@ -458,13 +458,13 @@ static int on_rx_frame(video_frame *frame, void *user_data)
 		//Dbg("session plocal_render RenderVideoFrame");
 		video_frame* echoframe = NULL;
 		if (0 == translate_image_resolution(&echoframe,session->conf.remote_video_view_cx,session->conf.remote_video_view_cy, frame)) {
-			session->premote_render->RenderVideoFrame(echoframe, RVC_FLIP_VERTICAL);
+			session->premote_render->RenderVideoFrame(echoframe);
 			session->bshow_remote = true;
 			video_frame_delete(echoframe);
 			echoframe = NULL;
 		}
 		else {
-			session->premote_render->RenderVideoFrame(frame, RVC_FLIP_VERTICAL);
+			session->premote_render->RenderVideoFrame(frame);
 			session->bshow_remote = true;
 		}
 		used = 1;
@@ -1254,7 +1254,6 @@ static int start_video_rtpsession(video_session_t* session)
 	config.on_rx_frame = &on_rx_frame;
 	config.dbg = &__dbg;
 	videortp_create(&config, &session->rtp);
-	session->premote_render->StartVideoRender();
 	rc = videortp_start(session->rtp);
 	if (rc != 0)
 	{
@@ -1747,7 +1746,6 @@ static void stop_video(video_session_t *session)
 		Dbg("remote video player destroy.");
 	}
 #else
-	session->premote_render->StopVideoRender();
 	if (session->plocal_render){
 		delete session->plocal_render;
 		session->plocal_render = NULL;
@@ -2185,7 +2183,7 @@ void* videorender_func(void* arg)
 		//tparam.uvideowidth = REC_COMMON_VIDEO_PREVIEW_WIDTH;
 		//tparam.uvideoheight = REC_COMMON_VIDEO_PREVIEW_HEIGHT;
 		tparam.ivideoformat = VIDEO_FORMAT_RGB24;
-		if (0 == session->plocal_render->VideoRenderSetParam(&tparam)){
+		if (0 == session->plocal_render->SetVideoRenderParam(&tparam)){
 			session->plocal_render->HideVideoWindow();
 		}
 		else {
@@ -2206,7 +2204,7 @@ void* videorender_func(void* arg)
 			//tparam_remote.uvideowidth = REC_COMMON_VIDEO_DSM_AGENT_WIDTH;
 			//tparam_remote.uvideoheight = REC_COMMON_VIDEO_DSM_AGENT_HEIGHT;
 			tparam_remote.ivideoformat = VIDEO_FORMAT_RGB24;
-			if (0 == session->premote_render->VideoRenderSetParam(&tparam_remote)) {
+			if (0 == session->premote_render->SetVideoRenderParam(&tparam_remote)) {
 				//session->premote_render->ShowVideoWindow();
 			}
 		}
@@ -2221,8 +2219,6 @@ void* videorender_func(void* arg)
 		bool bshow_local = false;
 		bool bset = true;
 		//session->premote_render->ShowVideoWindow();
-		
-		session->plocal_render->StartVideoRender();
 		for (; ; ) {
 			struct timespec ts;
 			clock_gettime(CLOCK_REALTIME, &ts);
@@ -2243,12 +2239,12 @@ void* videorender_func(void* arg)
 					//Dbg("%s:%d, video size is (%d,%d), showPersonArea flag is %d.", __FUNCTION__, __LINE__, local_video_frame->width, local_video_frame->height, *session->conf.ref_Is_showPersonArea);
 					video_frame* localframe = NULL;
 					if (0 == translate_image_resolution(&localframe, session->conf.local_video_view_cx, session->conf.local_video_view_cy, local_video_frame)) {
-						session->plocal_render->RenderVideoFrame(localframe, RVC_FLIP_VERTICAL);
+						session->plocal_render->RenderVideoFrame(localframe);
 						video_frame_delete(localframe);
 						localframe = NULL;
 					}
 					else {
-						session->plocal_render->RenderVideoFrame(local_video_frame, RVC_FLIP_VERTICAL);
+						session->plocal_render->RenderVideoFrame(local_video_frame);
 					}
 					bshow_local = true;
 					video_frame_delete(local_video_frame);
@@ -2272,7 +2268,6 @@ void* videorender_func(void* arg)
 				}
 			}
 		}
-		session->plocal_render->StopVideoRender();
 	}
 
 	return 0;

Module/mod_sipphone/videorenderobj.cpp

@@ -55,48 +55,21 @@ int VideoRenderObj::HideVideoWindow()
 	return m_pVideoRender->HideVideoWindow();
 }
 
-int VideoRenderObj::RenderVideoFrame(video_frame* pframe, RVC_RendererFlip eFlipType)
+int VideoRenderObj::RenderVideoFrame(video_frame* pframe)
 {
 	int iRet = -1;
 	if (NULL == m_pVideoRender) {
 		return iRet;
 	}
-	return m_pVideoRender->RenderVideoFrame(pframe, eFlipType);
+	return m_pVideoRender->RenderVideoFrame(pframe);
 }
 
 
-int VideoRenderObj::VideoRenderSetParam(videorender_param_t* param)
+int VideoRenderObj::SetVideoRenderParam(videorender_param_t* param)
 {
 	int iRet = -1;
 	if (NULL == m_pVideoRender){
 		return iRet;
 	}
 	return m_pVideoRender->VideoRenderSetParam(param);
-}
-
-int VideoRenderObj::StartVideoRender()
-{
-	int iRet = -1;
-	if (NULL == m_pVideoRender) {
-		return iRet;
-	}
-	return m_pVideoRender->StartVideoRender();
-}
-
-int VideoRenderObj::StopVideoRender()
-{
-	int iRet = -1;
-	if (NULL == m_pVideoRender) {
-		return iRet;
-	}
-	return m_pVideoRender->StopVideoRender();
-}
-
-
-void VideoRenderObj::VideoRenderDestroy()
-{
-	if (NULL == m_pVideoRender) {
-		return;
-	}
-	return m_pVideoRender->VideoRenderDestroy();
 }

Module/mod_sipphone/videorenderobj.h

@@ -3,7 +3,7 @@
 #include "../../Other/libvideorender/ivideorenderinterface.h"
 
 
-class VideoRenderObj : public IRenderCallback, public IVideoRender
+class VideoRenderObj : public IRenderCallback
 {
 public:
 	VideoRenderObj();
@@ -13,15 +13,10 @@ public:
 	void OnRenderFailed();
 	void OnVideoRenderExcption();
 	
-
-	int StartVideoRender();
-	int StopVideoRender();
-	void VideoRenderDestroy();
-
-	int VideoRenderSetParam(videorender_param_t* param);
+	int SetVideoRenderParam(videorender_param_t* param);
 	int ShowVideoWindow();
 	int HideVideoWindow();
-	int RenderVideoFrame(video_frame* pframe, RVC_RendererFlip eFlipType);
+	int RenderVideoFrame(video_frame* pframe);
 
 private:
 	IVideoRender* m_pVideoRender;