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

优化rtp级联时接收限流逻辑，新增支持mp4点播限流

Browse Source
This commit is contained in:
xia-chu 2026-04-11 10:09:09 +08:00
parent 502ee6a497
commit 068844b0da
4 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Rtp/RtpProcess.cpp
View File

@ -329,6 +329,13 @@ bool RtpProcess::close(mediakit::MediaSource &sender) {
return true;
}
bool RtpProcess::pause(MediaSource &sender, bool pause) {
if (_sock) {
_sock->enableRecv(!pause);
}
return static_cast<bool>(_sock);
}
toolkit::EventPoller::Ptr RtpProcess::getOwnerPoller(MediaSource &sender) {
if (_sock) {
return _sock->getPoller();

5
src/Rtp/RtpProcess.h
View File

@ -115,8 +115,9 @@ protected:
std::shared_ptr<SockInfo> getOriginSock(MediaSource &sender) const override;
toolkit::EventPoller::Ptr getOwnerPoller(MediaSource &sender) override;
float getLossRate(MediaSource &sender, TrackType type) override;
Ptr getRtpProcess(mediakit::MediaSource &sender) const override;
bool close(mediakit::MediaSource &sender) override;
Ptr getRtpProcess(MediaSource &sender) const override;
bool close(MediaSource &sender) override;
bool pause(MediaSource &sender, bool pause) override;
private:
RtpProcess(const MediaTuple &tuple);

33
src/Rtp/RtpSender.cpp
View File

@ -36,15 +36,7 @@ RtpSender::~RtpSender() {
}
void RtpSender::startSend(const MediaSourceEvent &sender, const MediaSourceEvent::SendRtpArgs &args, const function<void(uint16_t local_port, const SockException &ex)> &cb){
auto origin_socket = sender.getOriginSock(MediaSource::NullMediaSource());
_origin_socket = dynamic_pointer_cast<Socket>(origin_socket);
if (!_origin_socket) {
auto process = dynamic_pointer_cast<RtpProcess>(origin_socket);
if (process) {
_origin_socket = process->getSock();
}
}
_muxer = sender.getMuxer(MediaSource::NullMediaSource());
_args = args;
if (!_interface) {
// 重连时不重新创建对象 [AUTO-TRANSLATED:b788cd5d]
@ -323,12 +315,18 @@ void RtpSender::onConnect() {
});
}
if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _origin_socket) {
if (_socket_rtp->sockType() == toolkit::SockNum::Sock_TCP) {
// rtp 端口是TCP端口，转发速度应当控制收流速度
auto origin_socket = _origin_socket;
_socket_rtp->setOnFlush([origin_socket]() {
origin_socket->enableRecv(true);
return true;
std::weak_ptr<RtpSender> weak_self = shared_from_this();
_socket_rtp->setOnFlush([weak_self]() {
if (auto strong_self = weak_self.lock()) {
auto muxer = strong_self->_muxer.lock();
if (muxer) {
muxer->pause(MediaSource::NullMediaSource(), false);
}
return true;
}
return false;
});
}
InfoL << "startSend rtp success: " << _socket_rtp->get_peer_ip() << ":" << _socket_rtp->get_peer_port() << ", data_type: " << _args.data_type << ", con_type: " << _args.con_type;
@ -451,8 +449,11 @@ void RtpSender::onFlushRtpList(shared_ptr<List<Buffer::Ptr>> rtp_list) {
}
default: CHECK(0);
}
if (_args.enable_origin_recv_limit && _socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy() && _origin_socket) {
_origin_socket->enableRecv(false);
if (_args.enable_origin_recv_limit && _socket_rtp->sockType() == toolkit::SockNum::Sock_TCP && _socket_rtp->isSocketBusy()) {
auto muxer = _muxer.lock();
if (muxer) {
muxer->pause(MediaSource::NullMediaSource(), true);
}
}
});
};

2
src/Rtp/RtpSender.h
View File

@ -116,7 +116,6 @@ private:
private:
bool _is_connect = false;
toolkit::Socket::Ptr _origin_socket;
MediaSourceEvent::SendRtpArgs _args;
toolkit::Socket::Ptr _socket_rtp;
toolkit::Socket::Ptr _socket_rtcp;
@ -127,6 +126,7 @@ private:
toolkit::Ticker _rtcp_recv_ticker;
std::shared_ptr<RtpSession> _rtp_session;
std::function<void(const toolkit::SockException &ex)> _on_close;
std::weak_ptr<MultiMediaSourceMuxer> _muxer;
};
}//namespace mediakit