Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Fixed skip non-empty data #2033

Merged
merged 2 commits into from
Jun 3, 2021
Merged

[core] Fixed skip non-empty data #2033

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5869b8
[core] Fixed skip non-empty data
gou4shi1 Jun 2, 2021
fb02b6c
should pass pos instead of seq to freeUnitAt()
gou4shi1 Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions srtcore/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,10 +1169,11 @@ bool CRcvBuffer::getRcvFirstMsg(steady_clock::time_point& w_tsbpdtime,
* No acked packets ready but caller want to know next packet to wait for
* Check the not yet acked packets that may be stuck by missing packet(s).
*/
bool haslost = false;
steady_clock::time_point tsbpdtime = steady_clock::time_point();
w_tsbpdtime = steady_clock::time_point();
w_passack = true;
bool haslost = false;
int last_ready_pos = -1;
steady_clock::time_point tsbpdtime = steady_clock::time_point();
w_tsbpdtime = steady_clock::time_point();
w_passack = true;

// XXX SUSPECTED ISSUE with this algorithm:
// The above call to getRcvReadyMsg() should report as to whether:
Expand Down Expand Up @@ -1215,11 +1216,20 @@ bool CRcvBuffer::getRcvFirstMsg(steady_clock::time_point& w_tsbpdtime,
else
{
tsbpdtime = getPktTsbPdTime(m_pUnit[i]->m_Packet.getMsgTimeStamp());
/* Packet ready to play */
if (tsbpdtime <= steady_clock::now())
{
/* Packet ready to play */
w_tsbpdtime = tsbpdtime;
w_curpktseq = m_pUnit[i]->m_Packet.m_iSeqNo;
// If the last ready-to-play packet exists, free it.
if (!is_zero(w_tsbpdtime)) {
HLOGC(brlog.Debug,
log << "getRcvFirstMsg: found next ready packet, free last %"
<< w_curpktseq << " POS=" << last_ready_pos);
SRT_ASSERT(w_curpktseq != SRT_SEQNO_NONE);
freeUnitAt(last_ready_pos);
}
w_tsbpdtime = tsbpdtime;
w_curpktseq = m_pUnit[i]->m_Packet.m_iSeqNo;
last_ready_pos = i;
if (haslost)
w_skipseqno = w_curpktseq;

Expand Down