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

Return the last valid data if none exists when called.

Browse Source
This commit is contained in:
Jonathan Naylor
2017-11-22 14:14:25 +00:00
parent 982b0992b3
commit 1d33405a19
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
JitterBuffer.cpp
View File

@@ -29,7 +29,9 @@ m_blockCount(0U),
m_timer(1000U, 0U, jitterTime), m_timer(1000U, 0U, jitterTime),
m_stopWatch(), m_stopWatch(),
m_buffer(NULL), m_buffer(NULL),
m_headSequenceNumber(0U) m_headSequenceNumber(0U),
m_lastData(NULL),
m_lastDataValid(false)
{ {
assert(blockSize > 0U); assert(blockSize > 0U);
assert(blockTime > 0U); assert(blockTime > 0U);
@@ -43,6 +45,8 @@ m_headSequenceNumber(0U)
for (unsigned int i = 0U; i < m_blockCount; i++) for (unsigned int i = 0U; i < m_blockCount; i++)
m_buffer[i].m_data = new unsigned char[m_blockSize]; m_buffer[i].m_data = new unsigned char[m_blockSize];
m_lastData = new unsigned char[m_blockSize];
reset(); reset();
} }
@@ -52,6 +56,7 @@ CJitterBuffer::~CJitterBuffer()
delete[] m_buffer[i].m_data; delete[] m_buffer[i].m_data;
delete[] m_buffer; delete[] m_buffer;
delete[] m_lastData;
} }
bool CJitterBuffer::addData(const unsigned char* data, unsigned int sequenceNumber) bool CJitterBuffer::addData(const unsigned char* data, unsigned int sequenceNumber)
@@ -110,11 +115,21 @@ JB_STATUS CJitterBuffer::getData(unsigned char* data)
::memcpy(data, m_buffer[head].m_data, m_blockSize); ::memcpy(data, m_buffer[head].m_data, m_blockSize);
m_buffer[head].m_used = false; m_buffer[head].m_used = false;
// Save this data in case no more data is available next time
::memcpy(m_lastData, m_buffer[head].m_data, m_blockSize);
m_lastDataValid = true;
m_headSequenceNumber++; m_headSequenceNumber++;
return JBS_DATA; return JBS_DATA;
} }
// Return the last data frame or null data if none exists
if (m_lastDataValid)
::memcpy(data, m_lastData, m_blockSize);
else
::memset(data, 0x00U, m_blockSize);
m_headSequenceNumber++; m_headSequenceNumber++;
return JBS_REPEAT; return JBS_REPEAT;
@@ -127,6 +142,8 @@ void CJitterBuffer::reset()
m_headSequenceNumber = 0U; m_headSequenceNumber = 0U;
m_lastDataValid = false;
m_timer.stop(); m_timer.stop();
} }

3
JitterBuffer.h
View File

@@ -57,6 +57,9 @@ private:
JitterEntry* m_buffer; JitterEntry* m_buffer;
unsigned int m_headSequenceNumber; unsigned int m_headSequenceNumber;
unsigned char* m_lastData;
bool m_lastDataValid;
}; };
#endif #endif