Additional improvements for timespan

Haivision · Apr 12, 2021 · 6d92119 · 6d92119
1 parent 55c1d9a
commit 6d92119
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/srtcore/buffer.cpp b/srtcore/buffer.cpp
@@ -1743,15 +1743,21 @@ CRcvBuffer::ReadingState CRcvBuffer::debugGetReadingState() const
                 : m_iLastAckPos + (m_iSize - m_iStartPos);
         }
 
+        // m_iLastAckPos points to the first unacknowledged packet
         const int iLastAckPos = (m_iLastAckPos - 1) % m_iSize;
         if (m_iLastAckPos != m_iStartPos && (NULL != m_pUnit[iLastAckPos]) && (m_pUnit[iLastAckPos]->m_iFlag == CUnit::GOOD))
         {
             if (m_bTsbPdMode)
-                readstate.tsFirstUnack = getPktTsbPdTimeNoWrap(m_pUnit[iLastAckPos]->m_Packet.getMsgTimeStamp());
+                readstate.tsLastAck = getPktTsbPdTimeNoWrap(m_pUnit[iLastAckPos]->m_Packet.getMsgTimeStamp());
         }
 
         const int iEndPos = (m_iLastAckPos + m_iMaxPos - 1) % m_iSize;
-        if (m_iMaxPos != 0 && (NULL != m_pUnit[iEndPos]) && (m_pUnit[iEndPos]->m_iFlag == CUnit::GOOD))
+        if (m_iMaxPos == 0)
+        {
+            if (m_bTsbPdMode)
+                readstate.tsEnd = readstate.tsLastAck;
+        }
+        else if ((NULL != m_pUnit[iEndPos]) && (m_pUnit[iEndPos]->m_iFlag == CUnit::GOOD))
         {
             if (m_bTsbPdMode)
                 readstate.tsEnd = getPktTsbPdTimeNoWrap(m_pUnit[iEndPos]->m_Packet.getMsgTimeStamp());

diff --git a/srtcore/buffer.h b/srtcore/buffer.h
@@ -352,7 +352,7 @@ class CRcvBuffer
     struct ReadingState
     {
         time_point tsStart;
-        time_point tsFirstUnack;
+        time_point tsLastAck;
         time_point tsEnd;
         int numAcknowledged;
         int numUnacknowledged;

diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -9449,11 +9449,11 @@ int CUDT::processData(CUnit* in_unit)
 
 
                     ss << "Packets ACKed: " << bufstate.numAcknowledged << " (TSBPD ready in ";
-                    if (!is_zero(bufstate.tsStart) && !is_zero(bufstate.tsFirstUnack))
+                    if (!is_zero(bufstate.tsStart) && !is_zero(bufstate.tsLastAck))
                     {
                         ss << count_milliseconds(bufstate.tsStart - curtime);
                         ss << " : ";
-                        ss << count_milliseconds(bufstate.tsFirstUnack - curtime);
+                        ss << count_milliseconds(bufstate.tsLastAck - curtime);
                         ss << " ms)";
                     }
                     else