From 7df5da83b76ceb2814c4a50c67bdba4b5709b7cf Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 28 Nov 2017 10:05:02 +0000 Subject: [PATCH] Revert "Make jitter buffer message follow the same rules as the networking ones." This reverts commit ccb3f37d5de816c2149081aabeb06d5887f82b0a. --- DMRNetwork.cpp | 4 ++-- JitterBuffer.cpp | 12 ++++-------- JitterBuffer.h | 3 +-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 0b17fef..4ff02f4 100644 --- a/DMRNetwork.cpp +++ b/DMRNetwork.cpp @@ -83,8 +83,8 @@ m_beacon(false) m_streamId[0U] = 0x00U; m_streamId[1U] = 0x00U; - m_jitterBuffers[1U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, debug); - m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, debug); + m_jitterBuffers[1U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U); + m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U); m_id[0U] = id >> 24; m_id[1U] = id >> 16; diff --git a/JitterBuffer.cpp b/JitterBuffer.cpp index 1fa86fd..087285d 100644 --- a/JitterBuffer.cpp +++ b/JitterBuffer.cpp @@ -24,11 +24,10 @@ #include #include -CJitterBuffer::CJitterBuffer(unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber, bool debug) : +CJitterBuffer::CJitterBuffer(unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber) : m_blockSize(blockSize), m_blockTime(blockTime), m_topSequenceNumber(topSequenceNumber), -m_debug(debug), m_blockCount(0U), m_timer(1000U, 0U, jitterTime), m_stopWatch(), @@ -75,14 +74,12 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi // Is the data out of sequence? if (headSequenceNumber < tailSequenceNumber) { if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) { - if (m_debug) - LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); + LogInfo("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); return false; } } else { if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) { - if (m_debug) - LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); + LogInfo("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); return false; } } @@ -97,8 +94,7 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi // Do we already have the data? if (m_buffer[index].m_length > 0U) { - if (m_debug) - LogDebug("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber); + LogInfo("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber); return false; } diff --git a/JitterBuffer.h b/JitterBuffer.h index 1f5c5e7..a37339e 100644 --- a/JitterBuffer.h +++ b/JitterBuffer.h @@ -30,7 +30,7 @@ enum JB_STATUS { class CJitterBuffer { public: - CJitterBuffer(unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber, bool debug); + CJitterBuffer(unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber); ~CJitterBuffer(); bool addData(const unsigned char* data, unsigned int length, unsigned int sequenceNumber); @@ -45,7 +45,6 @@ private: unsigned int m_blockSize; unsigned int m_blockTime; unsigned int m_topSequenceNumber; - bool m_debug; unsigned int m_blockCount; CTimer m_timer; CStopWatch m_stopWatch;