external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Perf: Avoid RTP packet copy for player NACK.

Browse source
This commit is contained in:
winlin 2021-02-28 08:07:06 +08:00
parent 51a5e283fc
commit 11454b3ced
4 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

33
trunk/src/app/srs_app_rtc_source.cpp
View file

@ -1983,7 +1983,6 @@ SrsRtcSendTrack::SrsRtcSendTrack(SrsRtcConnection* session, SrsRtcTrackDescripti
session_ = session;
track_desc_ = track_desc->copy();
statistic_ = new SrsRtcTrackStatistic();
nack_enabled_ = false;
if (is_audio) {
rtp_queue_ = new SrsRtpRingBuffer(100);
@ -2002,11 +2001,6 @@ SrsRtcSendTrack::~SrsRtcSendTrack()
srs_freep(nack_epp);
}
void SrsRtcSendTrack::set_nack_enabled(bool v)
{
nack_enabled_ = v;
}
bool SrsRtcSendTrack::has_ssrc(uint32_t ssrc)
{
return track_desc_->has_ssrc(ssrc);
@ -2055,6 +2049,21 @@ std::string SrsRtcSendTrack::get_track_id()
return track_desc_->id_;
}
srs_error_t SrsRtcSendTrack::on_nack(SrsRtpPacket2** ppkt)
{
srs_error_t err = srs_success;
SrsRtpPacket2* pkt = *ppkt;
uint16_t seq = pkt->header.get_sequence();
// insert into video_queue and audio_queue
// We directly use the pkt, never copy it, so we should set the pkt to NULL.
rtp_queue_->set(seq, pkt);
*ppkt = NULL;
return err;
}
srs_error_t SrsRtcSendTrack::on_recv_nack(const vector<uint16_t>& lost_seqs)
{
srs_error_t err = srs_success;
@ -2117,12 +2126,6 @@ srs_error_t SrsRtcAudioSendTrack::on_rtp(SrsRtpPacket2* pkt)
// TODO: FIXME: Should update PT for RTX.
}
// Put rtp packet to NACK/ARQ queue
if (nack_enabled_) {
SrsRtpPacket2* nack = pkt->copy();
rtp_queue_->set(nack->header.get_sequence(), nack);
}
// Update stats.
session_->stat_->nn_out_audios++;
@ -2177,12 +2180,6 @@ srs_error_t SrsRtcVideoSendTrack::on_rtp(SrsRtpPacket2* pkt)
// TODO: FIXME: Should update PT for RTX.
}
// Put rtp packet to NACK/ARQ queue
if (nack_enabled_) {
SrsRtpPacket2* nack = pkt->copy();
rtp_queue_->set(nack->header.get_sequence(), nack);
}
// Update stats.
session_->stat_->nn_out_videos++;