mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-12 19:24:22 +08:00
This reverts commit 21d1ea9676.
之前代码改多了,会导致空指针错误,现进行还原
This commit is contained in:
@@ -1497,10 +1497,13 @@ void WebRtcTransportImp::onSendRtp(const RtpPacket::Ptr &rtp, bool flush, bool r
|
||||
sendRtpPacket(rtp->data() + RtpPacket::kRtpTcpHeaderSize, rtp->size() - RtpPacket::kRtpTcpHeaderSize, flush, &ctx);
|
||||
_bytes_usage += rtp->size() - RtpPacket::kRtpTcpHeaderSize;
|
||||
|
||||
if (track->rtcp_context_send) {
|
||||
auto sr = track->rtcp_context_send->createRtcpSR(track->answer_ssrc_rtp);
|
||||
if (sr && sr->size() > 0) {
|
||||
sendRtcpPacket(sr->data(), sr->size(), true);
|
||||
if (_rtcp_sr_send_ticker.elapsedTime() > 5000) {
|
||||
_rtcp_sr_send_ticker.resetTime();
|
||||
if (track->rtcp_context_send) {
|
||||
auto sr = track->rtcp_context_send->createRtcpSR(track->answer_ssrc_rtp);
|
||||
if (sr && sr->size() > 0) {
|
||||
sendRtcpPacket(sr->data(), sr->size(), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -380,6 +380,7 @@ private:
|
||||
// pli rtcp timer
|
||||
toolkit::Ticker _pli_ticker;
|
||||
|
||||
toolkit::Ticker _rtcp_sr_send_ticker;
|
||||
toolkit::Ticker _rtcp_rr_send_ticker;
|
||||
|
||||
// twcc rtcp发送上下文对象 [AUTO-TRANSLATED:aef6476a]
|
||||
|
||||
Reference in New Issue
Block a user