MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 23:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add extra jitter buffer debugging messages.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-11-27 11:43:21 +00:00
parent e5201a5e3e
commit a6ff1f051a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DMRNetwork.cpp
View File

@@ -83,8 +83,8 @@ m_beacon(false)
m_streamId[0U] = 0x00U; m_streamId[0U] = 0x00U;
m_streamId[1U] = 0x00U; m_streamId[1U] = 0x00U;
m_jitterBuffers[1U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, debug); m_jitterBuffers[1U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, true);
m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, debug); m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, true);
m_id[0U] = id >> 24; m_id[0U] = id >> 24;
m_id[1U] = id >> 16; m_id[1U] = id >> 16;

7
JitterBuffer.cpp
View File

@@ -76,13 +76,13 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi
if (headSequenceNumber < tailSequenceNumber) { if (headSequenceNumber < tailSequenceNumber) {
if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) { if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) {
if (m_debug) if (m_debug)
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); LogDebug("JitterBuffer: rejecting frame with seqNo=%u, raw=%u, head=%u, tail=%u", sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
return false; return false;
} }
} else { } else {
if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) { if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) {
if (m_debug) if (m_debug)
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber); LogDebug("JitterBuffer: rejecting frame with seqNo=%u, raw=%u, head=%u, tail=%u", sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
return false; return false;
} }
} }
@@ -141,6 +141,9 @@ JB_STATUS CJitterBuffer::getData(unsigned char* data, unsigned int& length)
return JBS_DATA; 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 // Return the last data frame if we have it
if (m_lastDataLength > 0U) { if (m_lastDataLength > 0U) {
::memcpy(data, m_lastData, m_lastDataLength); ::memcpy(data, m_lastData, m_lastDataLength);