aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-06 10:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[what][bugfix][rtsp] 修复handleResPAUSE 回调未被正常触发 (#4631)

Browse Source 
[what][bugfix][rtsp][https://github.com/ZLMediaKit/ZLMediaKit/issues/4625]
修复handleResPAUSE 回调未被正常触发
This commit is contained in:
haorui wang 2026-01-08 20:28:30 +08:00 committed by GitHub
parent d0eeba544a
commit 48c37d4f46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Rtsp/RtspPlayer.cpp
View File

@ -446,7 +446,11 @@ void RtspPlayer::sendOptions() {
} }
void RtspPlayer::sendKeepAlive() { void RtspPlayer::sendKeepAlive() {
_on_response = [](const Parser &parser) {}; if (_play_check_timer)
{
WarnL << "receive RTP packet before handleResPAUSE";
}
_on_keepalive_reponse = [](const Parser &parser) {};
if (_supported_cmd.find("GET_PARAMETER") != _supported_cmd.end()) { if (_supported_cmd.find("GET_PARAMETER") != _supported_cmd.end()) {
// 支持GET_PARAMETER，用此命令保活 [AUTO-TRANSLATED:b45cd737] // 支持GET_PARAMETER，用此命令保活 [AUTO-TRANSLATED:b45cd737]
// Support GET_PARAMETER, use this command to keep alive // Support GET_PARAMETER, use this command to keep alive
@ -532,6 +536,10 @@ void RtspPlayer::onWholeRtspPacket(Parser &parser) {
try { try {
decltype(_on_response) func; decltype(_on_response) func;
_on_response.swap(func); _on_response.swap(func);
if (!func)
{
_on_keepalive_reponse.swap(func);
}
if (func) { if (func) {
func(parser); func(parser);
} }

1
src/Rtsp/RtspPlayer.h
View File

@ -162,6 +162,7 @@ private:
float _speed = 0.0f; float _speed = 0.0f;
std::vector<SdpTrack::Ptr> _sdp_track; std::vector<SdpTrack::Ptr> _sdp_track;
std::function<void(const Parser&)> _on_response; std::function<void(const Parser&)> _on_response;
std::function<void(const Parser&)> _on_keepalive_reponse;
protected: protected:
// RTP端口,trackid idx 为数组下标 [AUTO-TRANSLATED:77c186bb] // RTP端口,trackid idx 为数组下标 [AUTO-TRANSLATED:77c186bb]
// RTP port, trackid idx is the array subscript // RTP port, trackid idx is the array subscript