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

Revert "Make jitter buffer message follow the same rules as the networking ones."

Browse Source 
This reverts commit ccb3f37d5d.
This commit is contained in:
Jonathan Naylor
2017-11-28 10:05:02 +00:00
parent fce14a745b
commit 7df5da83b7
3 changed files with 7 additions and 12 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);
m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U, debug); m_jitterBuffers[2U] = new CJitterBuffer(60U, DMR_SLOT_TIME, jitter, 256U);
m_id[0U] = id >> 24; m_id[0U] = id >> 24;
m_id[1U] = id >> 16; m_id[1U] = id >> 16;

12
JitterBuffer.cpp
View File

@@ -24,11 +24,10 @@
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
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_blockSize(blockSize),
m_blockTime(blockTime), m_blockTime(blockTime),
m_topSequenceNumber(topSequenceNumber), m_topSequenceNumber(topSequenceNumber),
m_debug(debug),
m_blockCount(0U), m_blockCount(0U),
m_timer(1000U, 0U, jitterTime), m_timer(1000U, 0U, jitterTime),
m_stopWatch(), m_stopWatch(),
@@ -75,14 +74,12 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi
// Is the data out of sequence? // Is the data out of sequence?
if (headSequenceNumber < tailSequenceNumber) { if (headSequenceNumber < tailSequenceNumber) {
if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) { if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) {
if (m_debug) LogInfo("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber);
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber);
return false; return false;
} }
} else { } else {
if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) { if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) {
if (m_debug) LogInfo("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber);
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber);
return false; return false;
} }
} }
@@ -97,8 +94,7 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi
// Do we already have the data? // Do we already have the data?
if (m_buffer[index].m_length > 0U) { if (m_buffer[index].m_length > 0U) {
if (m_debug) LogInfo("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber);
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber);
return false; return false;
} }

3
JitterBuffer.h
View File

@@ -30,7 +30,7 @@ enum JB_STATUS {
class CJitterBuffer { class CJitterBuffer {
public: 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(); ~CJitterBuffer();
bool addData(const unsigned char* data, unsigned int length, unsigned int sequenceNumber); bool addData(const unsigned char* data, unsigned int length, unsigned int sequenceNumber);
@@ -45,7 +45,6 @@ private:
unsigned int m_blockSize; unsigned int m_blockSize;
unsigned int m_blockTime; unsigned int m_blockTime;
unsigned int m_topSequenceNumber; unsigned int m_topSequenceNumber;
bool m_debug;
unsigned int m_blockCount; unsigned int m_blockCount;
CTimer m_timer; CTimer m_timer;
CStopWatch m_stopWatch; CStopWatch m_stopWatch;