Merged and fixed

Haivision · Sep 14, 2023 · 6830c3a · 6830c3a
1 parent de62802
commit 6830c3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -10221,8 +10221,8 @@ int srt::CUDT::handleSocketPacketReception(const vector<CUnit*>& incoming, bool&
 
                 const steady_clock::time_point tnow = steady_clock::now();
                 ScopedLock lg(m_StatsLock);
-                m_stats.rcvr.dropped.count(stats::BytesPackets(iDropCnt* rpkt.getLength(), iDropCnt));
-                m_stats.rcvr.undecrypted.count(stats::BytesPackets(rpkt.getLength(), 1));
+                m_stats.rcvr.dropped.count(stats::BytesPacketsCount(iDropCnt* rpkt.getLength(), iDropCnt));
+                m_stats.rcvr.undecrypted.count(stats::BytesPacketsCount(rpkt.getLength(), 1));
                 string why;
                 if (frequentLogAllowed(FREQLOGFA_ENCRYPTION_FAILURE, tnow, (why)))
                 {

diff --git a/srtcore/queue.cpp b/srtcore/queue.cpp
@@ -1762,7 +1762,7 @@ srt::CUDT* srt::CRcvQueue::getNewEntry()
     return u;
 }
 
-void srt::CRcvQueue::storePkt(SRTSOCKET id, const CPacket& pkt)
+void srt::CRcvQueue::storePktClone(SRTSOCKET id, const CPacket& pkt)
 {
     CUniqueSync passcond(m_BufferLock, m_BufferCond);
 

diff --git a/srtcore/queue.h b/srtcore/queue.h
@@ -556,7 +556,7 @@ class CRcvQueue
     bool  ifNewEntry();
     CUDT* getNewEntry();
 
-    void storePkt(SRTSOCKET id, const CPacket& pkt);
+    void storePktClone(SRTSOCKET id, const CPacket& pkt);
 
 private:
     sync::Mutex       m_LSLock;