Merge pull request #30 from libxengine/develop

Merge V2.11.1

Author: xengine-qyt

.github/workflows/release.yml

@@ -84,7 +84,7 @@ jobs:
           patch=$(echo $latest_tag | cut -d '.' -f 3)
           build=$(echo $latest_tag | cut -d '.' -f 4)
 
-          new_minor=$((minor + 1))
+          new_minor=$((patch + 1))
           new_version="$major.$new_minor.$patch.$build"
           echo "New version: $new_version"
           echo "new_tag=$new_version" >> $GITHUB_OUTPUT

CHANGELOG

@@ -1,3 +1,9 @@
+XEngine_StreamMedia V2.11.1.1001
+
+修正:rtmp推流CSID处理不正确导致推流不正确的问题
+
+fixed:rmtp stream push failed 
+=======================================================
 XEngine_StreamMedia V2.11.0.1001
 
 增加:预拉流的协议支持

XEngine_Release/XEngine_Config/XEngine_Version.json

@@ -1,6 +1,7 @@
 {
     "XVer": [
-        "V2.11.0.1001 Build20250409",
+        "V2.11.1.1001 Build20250409",
+        "V2.11.0.1001 Build20250426",
         "V2.10.0.1001 Build20250124",
         "V2.9.0.1001 Build20241011",
         "V2.8.0.1001 Build20240531",

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp

@@ -486,7 +486,7 @@ bool PushStream_RTMPTask_Handle(XENGINE_RTMPHDR* pSt_RTMPHdr, LPCXSTR lpszClient
 		}
 		RTMPProtocol_Help_ParseAudio(&st_RTMPAudio, ptszMSGBuffer, &nPMLen, lpszMsgBuffer + sizeof(XENGINE_RTMPAUDIO), nMsgLen - sizeof(XENGINE_RTMPAUDIO));
 		XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, lpszClientAddr, ptszMSGBuffer, nPMLen, 1);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端：%s,接受推流数据"), lpszClientAddr);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端：%s,接受音频数据,数据大小:%d,实际大小:%d"), lpszClientAddr, nMsgLen, nPMLen);
 	}
 	else if (XENGINE_STREAMMEDIA_RTMP_MSGTYPE_VIDEO == pSt_RTMPHdr->byTypeID)
 	{
@@ -500,7 +500,7 @@ bool PushStream_RTMPTask_Handle(XENGINE_RTMPHDR* pSt_RTMPHdr, LPCXSTR lpszClient
 		}
 		RTMPProtocol_Help_ParseVideo(&st_RTMPVideo, ptszMSGBuffer, &nPMLen, lpszMsgBuffer + sizeof(XENGINE_RTMPVIDEO), nMsgLen - sizeof(XENGINE_RTMPVIDEO));
 		XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, lpszClientAddr, ptszMSGBuffer, nPMLen, 0);
-		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端：%s,接受推流数据,数据大小:%d"), lpszClientAddr, nMsgLen);
+		XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端：%s,接受视频数据,数据大小:%d,实际大小:%d"), lpszClientAddr, nMsgLen, nPMLen);
 	}
 
 	ManagePool_Memory_Free(xhMemoryPool, ptszRVBuffer);