From 8f424bbbfc00451fe24df5c5fff2503d2eac2974 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 28 Nov 2017 10:04:25 +0000 Subject: [PATCH] Revert "Add extra jitter buffer debugging messages." This reverts commit a6ff1f051ad7521959c10dac8758bb6010c8f961. --- DMRNetwork.cpp | 4 ++-- JitterBuffer.cpp | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/DMRNetwork.cpp b/DMRNetwork.cpp index 951549a..0b17fef 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, true); - m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, true); + 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_id[0U] = id >> 24; m_id[1U] = id >> 16; diff --git a/JitterBuffer.cpp b/JitterBuffer.cpp index e15f08f..1fa86fd 100644 --- a/JitterBuffer.cpp +++ b/JitterBuffer.cpp @@ -76,13 +76,13 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi if (headSequenceNumber < tailSequenceNumber) { if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) { if (m_debug) - LogDebug("JitterBuffer: rejecting frame with seqNo=%u, raw=%u, head=%u, tail=%u", sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber); + LogDebug("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, raw=%u, head=%u, tail=%u", sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber); + LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); return false; } } @@ -141,9 +141,6 @@ JB_STATUS CJitterBuffer::getData(unsigned char* data, unsigned int& length) return JBS_DATA; } - if (m_debug) - LogDebug("JitterBuffer: no data available, elapsed=%ums, raw=%u, head=%u", m_stopWatch.elapsed(), m_headSequenceNumber - 1U, head); - // Return the last data frame if we have it if (m_lastDataLength > 0U) { ::memcpy(data, m_lastData, m_lastDataLength);