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 "Add extra logging and re-do the initial timer."

Browse Source 
This reverts commit edfda9d2f6.
This commit is contained in:
Jonathan Naylor
2017-11-28 10:03:41 +00:00
parent edfda9d2f6
commit 2ced495723
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
JitterBuffer.cpp
View File

@@ -35,8 +35,7 @@ m_stopWatch(),
m_buffer(NULL),
m_headSequenceNumber(0U),
m_lastData(NULL),
m_lastDataLength(0U),
m_running(false)
m_lastDataLength(0U)
{
assert(blockSize > 0U);
assert(blockTime > 0U);
@@ -99,7 +98,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 duplicate frame with seqNo=%u, raw=%u, head=%u, tail=%u", sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
LogDebug("JitterBuffer: rejecting frame with seqNo=%u, already exists", sequenceNumber);
return false;
}
@@ -116,8 +115,10 @@ JB_STATUS CJitterBuffer::getData(unsigned char* data, unsigned int& length)
{
assert(data != NULL);
if (!m_running)
if (!m_timer.isRunning() || !m_timer.hasExpired()) {
m_stopWatch.start();
return JBS_NO_DATA;
}
unsigned int sequenceNumber = m_stopWatch.elapsed() / m_blockTime;
if (m_headSequenceNumber > sequenceNumber)
@@ -140,8 +141,8 @@ 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);
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) {
@@ -164,17 +165,9 @@ void CJitterBuffer::reset()
m_lastDataLength = 0U;
m_timer.stop();
m_running = false;
}
void CJitterBuffer::clock(unsigned int ms)
{
m_timer.clock(ms);
if (m_timer.isRunning() && m_timer.hasExpired()) {
if (!m_running) {
m_stopWatch.start();
m_running = true;
}
}
}