Skip to content

Commit 0ef6662

Browse files
authored
Merge pull request #30 from libxengine/develop
Merge V2.11.1
2 parents 5764d47 + eca8933 commit 0ef6662

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
patch=$(echo $latest_tag | cut -d '.' -f 3)
8585
build=$(echo $latest_tag | cut -d '.' -f 4)
8686
87-
new_minor=$((minor + 1))
87+
new_minor=$((patch + 1))
8888
new_version="$major.$new_minor.$patch.$build"
8989
echo "New version: $new_version"
9090
echo "new_tag=$new_version" >> $GITHUB_OUTPUT

CHANGELOG

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
XEngine_StreamMedia V2.11.1.1001
2+
3+
修正:rtmp推流CSID处理不正确导致推流不正确的问题
4+
5+
fixed:rmtp stream push failed
6+
=======================================================
17
XEngine_StreamMedia V2.11.0.1001
28

39
增加:预拉流的协议支持

XEngine_Release/XEngine_Config/XEngine_Version.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"XVer": [
3-
"V2.11.0.1001 Build20250409",
3+
"V2.11.1.1001 Build20250409",
4+
"V2.11.0.1001 Build20250426",
45
"V2.10.0.1001 Build20250124",
56
"V2.9.0.1001 Build20241011",
67
"V2.8.0.1001 Build20240531",

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/StreamMedia_PushStream/PushStream_RTMPTask.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ bool PushStream_RTMPTask_Handle(XENGINE_RTMPHDR* pSt_RTMPHdr, LPCXSTR lpszClient
486486
}
487487
RTMPProtocol_Help_ParseAudio(&st_RTMPAudio, ptszMSGBuffer, &nPMLen, lpszMsgBuffer + sizeof(XENGINE_RTMPAUDIO), nMsgLen - sizeof(XENGINE_RTMPAUDIO));
488488
XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, lpszClientAddr, ptszMSGBuffer, nPMLen, 1);
489-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端:%s,接受推流数据"), lpszClientAddr);
489+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端:%s,接受音频数据,数据大小:%d,实际大小:%d"), lpszClientAddr, nMsgLen, nPMLen);
490490
}
491491
else if (XENGINE_STREAMMEDIA_RTMP_MSGTYPE_VIDEO == pSt_RTMPHdr->byTypeID)
492492
{
@@ -500,7 +500,7 @@ bool PushStream_RTMPTask_Handle(XENGINE_RTMPHDR* pSt_RTMPHdr, LPCXSTR lpszClient
500500
}
501501
RTMPProtocol_Help_ParseVideo(&st_RTMPVideo, ptszMSGBuffer, &nPMLen, lpszMsgBuffer + sizeof(XENGINE_RTMPVIDEO), nMsgLen - sizeof(XENGINE_RTMPVIDEO));
502502
XEngine_AVPacket_AVFrame(ptszSDBuffer, &nSDLen, ptszRVBuffer, &nRVLen, lpszClientAddr, ptszMSGBuffer, nPMLen, 0);
503-
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端:%s,接受推流数据,数据大小:%d"), lpszClientAddr, nMsgLen);
503+
XLOG_PRINT(xhLog, XENGINE_HELPCOMPONENTS_XLOG_IN_LOGLEVEL_DEBUG, _X("RTMP推流端:%s,接受视频数据,数据大小:%d,实际大小:%d"), lpszClientAddr, nMsgLen, nPMLen);
504504
}
505505

506506
ManagePool_Memory_Free(xhMemoryPool, ptszRVBuffer);

0 commit comments

Comments
 (0)