From 432cfe4ba9a9ee0fc145a2a21415cbe8ba7146b0 Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Thu, 29 Sep 2022 16:27:03 +0800 Subject: [PATCH] [core] Moved m_FreshLoss.push_back() out of the incoming loop. --- srtcore/core.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/srtcore/core.cpp b/srtcore/core.cpp index 57e975837..e640eb28a 100644 --- a/srtcore/core.cpp +++ b/srtcore/core.cpp @@ -10327,23 +10327,7 @@ int srt::CUDT::processData(CUnit* in_unit) { int32_t seqlo = CSeqNo::incseq(m_iRcvCurrSeqNo); int32_t seqhi = CSeqNo::decseq(rpkt.m_iSeqNo); - srt_loss_seqs.push_back(make_pair(seqlo, seqhi)); - - if (initial_loss_ttl) - { - // pack loss list for (possibly belated) NAK - // The LOSSREPORT will be sent in a while. - ScopedLock lock(m_RcvLossLock); - for (loss_seqs_t::iterator i = srt_loss_seqs.begin(); i != srt_loss_seqs.end(); ++i) - { - m_FreshLoss.push_back(CRcvFreshLoss(i->first, i->second, initial_loss_ttl)); - } - HLOGC(qrlog.Debug, - log << CONID() << "FreshLoss: added sequences: " << Printable(srt_loss_seqs) - << " tolerance: " << initial_loss_ttl); - reorder_prevent_lossreport = true; - } } } @@ -10360,6 +10344,24 @@ int srt::CUDT::processData(CUnit* in_unit) } } + if (!srt_loss_seqs.empty()) + { + if (initial_loss_ttl) + { + // pack loss list for (possibly belated) NAK + // The LOSSREPORT will be sent in a while. + ScopedLock lock(m_RcvLossLock); + for (loss_seqs_t::iterator i = srt_loss_seqs.begin(); i != srt_loss_seqs.end(); ++i) + { + m_FreshLoss.push_back(CRcvFreshLoss(i->first, i->second, initial_loss_ttl)); + } + HLOGC(qrlog.Debug, + log << CONID() << "FreshLoss: added sequences: " << Printable(srt_loss_seqs) + << " tolerance: " << initial_loss_ttl); + reorder_prevent_lossreport = true; + } + } + // This is moved earlier after introducing filter because it shouldn't // be executed in case when the packet was rejected by the receiver buffer. // However now the 'excessive' condition may be true also in case when