From 507b669b94a45632209771978443f0f5545cab03 Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Wed, 23 Apr 2025 14:06:44 +0800
Subject: [PATCH 1/2] modify:rtmp av data log info

---
 .../StreamMedia_PushStream/PushStream_RTMPTask.cpp            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp b/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp
index cda1a57..43e6e90 100644
--- a/XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp
+++ b/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);

From eca8933a3f46ab19ad47c65df957fc37fd18090d Mon Sep 17 00:00:00 2001
From: qyt <486179@qq.com>
Date: Sat, 26 Apr 2025 09:32:19 +0800
Subject: [PATCH 2/2] fixed:rmtp stream push failed

---
 .github/workflows/release.yml                       | 2 +-
 CHANGELOG                                           | 6 ++++++
 XEngine_Release/XEngine_Config/XEngine_Version.json | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 434cafc..2df760c 100644
--- a/.github/workflows/release.yml
+++ b/.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
diff --git a/CHANGELOG b/CHANGELOG
index 93beff2..fc79fc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+XEngine_StreamMedia V2.11.1.1001
+
+修正:rtmp推流CSID处理不正确导致推流不正确的问题
+
+fixed:rmtp stream push failed 
+=======================================================
 XEngine_StreamMedia V2.11.0.1001
 
 增加:预拉流的协议支持
diff --git a/XEngine_Release/XEngine_Config/XEngine_Version.json b/XEngine_Release/XEngine_Config/XEngine_Version.json
index 1a0367c..fb4e6f9 100644
--- a/XEngine_Release/XEngine_Config/XEngine_Version.json
+++ b/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",