+11
-6
lines changedFilter options
+11
-6
lines changed Original file line number Diff line number Diff line change
@@ -3295,6 +3295,9 @@ void srt::CUDT::synchronizeWithGroup(CUDTGroup* gp)
3295 3295
// time to not fill a network window.
3296 3296
enterCS(m_RecvLock);
3297 3297
m_pRcvBuffer->applyGroupTime(rcv_buffer_time_base, rcv_buffer_wrap_period, m_iTsbPdDelay_ms * 1000, rcv_buffer_udrift);
3298 +
#if ENABLE_NEW_RCVBUFFER
3299 +
m_pRcvBuffer->setPeerRexmitFlag(m_bPeerRexmitFlag);
3300 +
#endif
3298 3301
leaveCS(m_RecvLock);
3299 3302 3300 3303
HLOGF(gmlog.Debug, "AFTER HS: Set Rcv TsbPd mode: delay=%u.%03us GROUP TIME BASE: %s%s",
@@ -8995,25 +8998,27 @@ void srt::CUDT::updateSrtRcvSettings()
8995 8998
// the packet can be retrieved from the buffer before its time to play comes
8996 8999
// (unlike in normal situation when reading directly from socket), however
8997 9000
// its time to play shall be properly defined.
9001 +
ScopedLock lock(m_RecvLock);
9002 + 9003 +
// NOTE: remember to also update synchronizeWithGroup() if more settings are updated here.
9004 +
#if ENABLE_NEW_RCVBUFFER
9005 +
m_pRcvBuffer->setPeerRexmitFlag(m_bPeerRexmitFlag);
9006 +
#endif
8998 9007 8999 9008
// XXX m_bGroupTsbPd is ignored with SRT_ENABLE_APP_READER
9000 9009
if (m_bTsbPd || m_bGroupTsbPd)
9001 9010
{
9002 -
/* We are TsbPd receiver */
9003 -
enterCS(m_RecvLock);
9004 9011
#if ENABLE_NEW_RCVBUFFER
9005 9012
m_pRcvBuffer->setTsbPdMode(m_tsRcvPeerStartTime, false, milliseconds_from(m_iTsbPdDelay_ms));
9006 -
m_pRcvBuffer->setPeerRexmitFlag(m_bPeerRexmitFlag);
9007 9013
#else
9008 9014
m_pRcvBuffer->setRcvTsbPdMode(m_tsRcvPeerStartTime, milliseconds_from(m_iTsbPdDelay_ms));
9009 9015
#endif
9010 -
leaveCS(m_RecvLock);
9011 9016 9012 9017
HLOGF(cnlog.Debug,
9013 9018
"AFTER HS: Set Rcv TsbPd mode%s: delay=%u.%03us RCV START: %s",
9014 9019
(m_bGroupTsbPd ? " (AS GROUP MEMBER)" : ""),
9015 -
m_iTsbPdDelay_ms/1000, // XXX use FormatDuration ?
9016 -
m_iTsbPdDelay_ms%1000,
9020 +
m_iTsbPdDelay_ms / 1000,
9021 +
m_iTsbPdDelay_ms % 1000,
9017 9022
FormatTime(m_tsRcvPeerStartTime).c_str());
9018 9023
}
9019 9024
else
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4