modify:screen capture format support scale

ci:update

Author: xengine-qyt

.github/workflows/msbuild.yml

@@ -51,15 +51,15 @@ jobs:
         run: |
             cd vcpkg
             ./bootstrap-vcpkg.bat
-            ./vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows
+            ./vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows
             ./vcpkg.exe integrate install
         shell: pwsh
       - name: vcpkg install (x64)
         if: matrix.platform == 'x64'  
         run: |
             cd vcpkg
             ./bootstrap-vcpkg.bat
-            ./vcpkg.exe install lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows
+            ./vcpkg.exe install lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows
             ./vcpkg.exe integrate install
         shell: pwsh
       - name: vcpkg install (ARM64)

README.en.md

@@ -84,7 +84,7 @@ Modify the database configuration in XSQL in the configuration file to your
 The default configuration does not enable database support. If the database interface is required, you need to enable the database yourself
 
 #### Windows
-need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows  
+need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows  
 use vs open and compile,suport windows 7sp1 and above  
 Just Run it
 

README.md

@@ -96,7 +96,7 @@ git clone https://gitee.com/xengine/XEngine_IPMacData.git XEngine_Source/XEngine
 git clone https://gitee.com/xengine/XEngine_PhoneData.git XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData  
 
 #### Windows
-需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows  
+需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows  
 使用VS打开并且编译,支持WINDOWS 7SP1以上系统  
 直接运行即可
 

XEngine_Docment/Docment_zh.docx

@@ -6,18 +6,24 @@ static XHANDLE xhAudio = NULL;
 static XHANDLE xhSound = NULL;
 static XHANDLE xhScreen = NULL;
 static XHANDLE xhPacket = NULL;
-static XHANDLE xhFilter = 0;
+static XHANDLE xhFilter = NULL;
+static XHANDLE xhScale = NULL;
 
 void XCALLBACK HTTPTask_TaskPost_CBVideo(XHANDLE*** pppSt_AVBuffer, XPVOID lParam)
 {
-	int nListCount = 0;
-	XHANDLE** ppSt_AVPacket;
-	VideoCodec_Stream_EnCodec(xhVideo, pppSt_AVBuffer, &ppSt_AVPacket, &nListCount);
-	for (int i = 0; i < nListCount; i++)
+	XHANDLE** ppSt_AVFrame;
+	if (VideoCodec_Help_ScaleConvert(xhScale, (*pppSt_AVBuffer)[0], &ppSt_AVFrame))
 	{
-		AVFormat_Packet_StreamWrite(xhPacket, 0, ppSt_AVPacket[i]);
+		int nListCount = 0;
+		XHANDLE** ppSt_AVPacket;
+		VideoCodec_Stream_EnCodec(xhVideo, ppSt_AVFrame[0], &ppSt_AVPacket, &nListCount);
+		for (int j = 0; j < nListCount; j++)
+		{
+			AVFormat_Packet_StreamWrite(xhPacket, 0, ppSt_AVPacket[j]);
+		}
+		AVHelp_Memory_FreeAVList(&ppSt_AVPacket, nListCount);
 	}
-	AVHelp_Memory_FreeAVList(&ppSt_AVPacket, nListCount);
+	AVHelp_Memory_FreeAVList(&ppSt_AVFrame, 1, false);
 }
 void XCALLBACK HTTPTask_TaskPost_CBAudio(XHANDLE*** pppSt_AVBuffer, XPVOID lParam)
 {
@@ -61,6 +67,10 @@ bool HTTPTask_TaskPost_AVRecordStart(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuff
 	XENGINE_AVRECORD st_AVRecord = {};
 	if (!ModuleProtocol_Parse_AVRecord(lpszMsgBuffer, nMsgLen, &st_AVRecord))
 	{
+		st_HDRParam.nHttpCode = 400;
+		HttpProtocol_Server_SendMsgEx(xhHTTPPacket, m_MemorySend.get(), &nSDLen, &st_HDRParam);
+		XEngine_Network_Send(lpszClientAddr, m_MemorySend.get(), nSDLen);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_ERROR, _X("HTTP客户端:%s,请求屏幕录制失败,解析协议失败,错误码:%lX"), lpszClientAddr, ModuleProtocol_GetLastError());
 		return false;
 	}
 	//屏幕采集
@@ -98,6 +108,10 @@ bool HTTPTask_TaskPost_AVRecordStart(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuff
 	//初始化屏幕编码器
 	XENGINE_PROTOCOL_AVINFO st_AVInfo = {};
 	AVCollect_Video_GetInfo(xhScreen, &st_AVInfo);
+
+	xhScale = VideoCodec_Help_ScaleInit(st_AVInfo.st_VideoInfo.nWidth, st_AVInfo.st_VideoInfo.nHeight, st_AVInfo.st_VideoInfo.nFormat, st_AVInfo.st_VideoInfo.nWidth, st_AVInfo.st_VideoInfo.nHeight, ENUM_AVCODEC_VIDEO_SAMPLEFMT_YUV420P);
+
+	st_AVInfo.st_VideoInfo.nFormat = 0;
 	st_AVInfo.st_VideoInfo.enAVCodec = ENUM_XENGINE_AVCODEC_VIDEO_TYPE_H264;
 	xhVideo = VideoCodec_Stream_EnInit(&st_AVInfo.st_VideoInfo);
 	if (NULL == xhVideo)
@@ -111,6 +125,8 @@ bool HTTPTask_TaskPost_AVRecordStart(LPCXSTR lpszClientAddr, LPCXSTR lpszMsgBuff
 	VideoCodec_Stream_GetAVCodec(xhVideo, &xhVideoCodec);
 	AVFormat_Packet_StreamCreate(xhPacket, xhVideoCodec);
 	BaseLib_Memory_FreeCStyle((XPPMEM)&xhVideoCodec);
+	//转换
+	
 	//启用音频
 	if (_tcsxlen(st_AVRecord.tszAudioDevice) > 0)
 	{
@@ -187,6 +203,7 @@ bool HTTPTask_TaskPost_AVRecordStop(LPCXSTR lpszClientAddr)
 	AVFilter_Audio_Destroy(xhFilter);
 
 	AVFormat_Packet_Stop(xhPacket);
+	VideoCodec_Help_ScaleUninit(xhScale);
 	xhScreen = NULL;
 	xhSound = NULL;
 	xhVideo = NULL;