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

Revert "Add debugging messages to teh jitter buffer class."

Browse Source 
This reverts commit 17f38bcab3.
This commit is contained in:
Jonathan Naylor
2017-11-28 10:09:15 +00:00
parent 475aff91e7
commit c1d0add875
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
JitterBuffer.cpp
View File

@@ -18,8 +18,6 @@
#include "JitterBuffer.h" #include "JitterBuffer.h"
#include "Log.h"
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
@@ -72,16 +70,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)
LogInfo("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)
LogInfo("JitterBuffer: rejecting frame with seqNo=%u, head=%u, tail=%u", sequenceNumber, headSequenceNumber, tailSequenceNumber);
return false; return false;
} }
}
unsigned int number; unsigned int number;
if (sequenceNumber >= headSequenceNumber) if (sequenceNumber >= headSequenceNumber)
@@ -92,10 +86,8 @@ bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsi
unsigned int index = (m_headSequenceNumber + number) % m_blockCount; unsigned int index = (m_headSequenceNumber + number) % m_blockCount;
// 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)
LogInfo("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber);
return false; return false;
}
::memcpy(m_buffer[index].m_data, data, length); ::memcpy(m_buffer[index].m_data, data, length);
m_buffer[index].m_length = length; m_buffer[index].m_length = length;