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

Roll back the jitter buffer changes.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-08 20:25:03 +00:00
parent f8c85a8043
commit e6ed2e17a1
26 changed files with 256 additions and 750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
DMRSlot.cpp
View File

@@ -45,6 +45,9 @@ unsigned int CDMRSlot::m_hangCount = 3U * 17U;
CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;
unsigned int CDMRSlot::m_jitterTime = 300U;
unsigned int CDMRSlot::m_jitterSlots = 5U;
unsigned char* CDMRSlot::m_idle = NULL;
FLCO CDMRSlot::m_flco1;
@@ -84,16 +87,18 @@ m_netTalkerId(TALKER_ID_NONE),
m_rfLC(NULL),
m_netLC(NULL),
m_rfSeqNo(0U),
m_netSeqNo(0U),
m_rfN(0U),
m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U),
m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 50U),
m_interval(),
m_elapsed(),
m_rfFrames(0U),
m_netFrames(0U),
m_netLost(0U),
m_netMissed(0U),
m_fec(),
m_rfBits(1U),
m_netBits(1U),
@@ -101,6 +106,8 @@ m_rfErrs(0U),
m_netErrs(0U),
m_rfTimeout(false),
m_netTimeout(false),
m_lastFrame(NULL),
m_lastFrameValid(false),
m_rssi(0U),
m_maxRSSI(0U),
m_minRSSI(0U),
@@ -110,6 +117,8 @@ m_fp(NULL)
{
m_rfTalkerAlias = new unsigned char[32U];
m_lastFrame = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U];
m_rfEmbeddedData = new CDMREmbeddedData[2U];
m_netEmbeddedData = new CDMREmbeddedData[2U];
@@ -120,6 +129,7 @@ CDMRSlot::~CDMRSlot()
{
delete[] m_rfEmbeddedData;
delete[] m_netEmbeddedData;
delete[] m_lastFrame;
delete[] m_rfTalkerAlias;
}
@@ -900,9 +910,6 @@ void CDMRSlot::writeEndRF(bool writeEnd)
}
}
if (m_network != NULL)
m_network->reset(m_slotNo);
m_rfTimeoutTimer.stop();
m_rfTimeout = false;
@@ -925,6 +932,8 @@ void CDMRSlot::writeEndNet(bool writeEnd)
m_display->clearDMR(m_slotNo);
m_lastFrameValid = false;
if (writeEnd && !m_netTimeout) {
// Create a dummy start end frame
unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U];
@@ -951,11 +960,9 @@ void CDMRSlot::writeEndNet(bool writeEnd)
}
}
if (m_network != NULL)
m_network->reset(m_slotNo);
m_networkWatchdog.stop();
m_netTimeoutTimer.stop();
m_packetTimer.stop();
m_netTimeout = false;
m_netFrames = 0U;
@@ -979,22 +986,13 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_rfState != RS_RF_LISTENING && m_netState == RS_NET_IDLE)
return;
m_networkWatchdog.start();
unsigned char dataType = dmrData.getDataType();
unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U];
dmrData.getData(data + 2U);
bool missing = dmrData.isMissing();
unsigned char dataType;
if (missing) {
m_netN = (m_netN + 1U) % 6U;
dataType = repeatFrame(data + 2U);
} else {
dataType = dmrData.getDataType();
m_netN = dmrData.getN();
m_networkWatchdog.start();
m_netMissed = 0U;
}
if (dataType == DT_VOICE_LC_HEADER) {
if (m_netState == RS_NET_AUDIO)
return;
@@ -1037,6 +1035,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = TAG_DATA;
data[1U] = 0x00U;
m_lastFrameValid = false;
m_netTimeoutTimer.start();
m_netTimeout = false;
@@ -1054,6 +1054,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_modem->writeDMRAbort(m_slotNo);
}
for (unsigned int i = 0U; i < m_jitterSlots; i++)
writeQueueNet(m_idle);
if (m_duplex) {
for (unsigned int i = 0U; i < NO_HEADERS_DUPLEX; i++)
writeQueueNet(data);
@@ -1085,6 +1088,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netLC = lc;
m_lastFrameValid = false;
m_netTimeoutTimer.start();
m_netTimeout = false;
@@ -1093,6 +1098,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_modem->writeDMRAbort(m_slotNo);
}
for (unsigned int i = 0U; i < m_jitterSlots; i++)
writeQueueNet(m_idle);
// Create a dummy start frame
unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];
@@ -1231,6 +1239,10 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = m_netFrames == 0U ? TAG_EOT : TAG_DATA;
data[1U] = 0x00U;
// Put a small delay into starting transmission
writeQueueNet(m_idle);
writeQueueNet(m_idle);
writeQueueNet(data);
m_netState = RS_NET_DATA;
@@ -1262,6 +1274,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netEmbeddedData[0U].setLC(*m_netLC);
m_netEmbeddedData[1U].setLC(*m_netLC);
m_lastFrameValid = false;
m_netTimeoutTimer.start();
m_netTimeout = false;
@@ -1270,6 +1284,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_modem->writeDMRAbort(m_slotNo);
}
for (unsigned int i = 0U; i < m_jitterSlots; i++)
writeQueueNet(m_idle);
// Create a dummy start frame
unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];
@@ -1330,6 +1347,17 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// Convert the Audio Sync to be from the BS or MS as needed
CSync::addDMRAudioSync(data + 2U, m_duplex);
// Initialise the lost packet data
if (m_netFrames == 0U) {
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
m_netLost = 0U;
} else {
insertSilence(data, dmrData.getSeqNo());
}
if (!m_netTimeout)
writeQueueNet(data);
@@ -1338,11 +1366,15 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netEmbeddedData[m_netEmbeddedWriteN].reset();
if (missing)
m_netLost++;
m_packetTimer.start();
m_elapsed.start();
m_netFrames++;
// Save details in case we need to infill data
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
#if defined(DUMP_DMR)
writeFile(data);
#endif
@@ -1469,14 +1501,29 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = TAG_DATA;
data[1U] = 0x00U;
// Initialise the lost packet data
if (m_netFrames == 0U) {
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
m_netLost = 0U;
} else {
insertSilence(data, dmrData.getSeqNo());
}
if (!m_netTimeout)
writeQueueNet(data);
if (missing)
m_netLost++;
m_packetTimer.start();
m_elapsed.start();
m_netFrames++;
// Save details in case we need to infill data
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
#if defined(DUMP_DMR)
writeFile(data);
#endif
@@ -1687,6 +1734,21 @@ void CDMRSlot::clock()
}
}
}
if (m_netState == RS_NET_AUDIO) {
m_packetTimer.clock(ms);
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
unsigned int elapsed = m_elapsed.elapsed();
if (elapsed >= m_jitterTime) {
LogDebug("DMR Slot %u, lost audio for %ums filling in", m_slotNo, elapsed);
insertSilence(m_jitterSlots);
m_elapsed.start();
}
m_packetTimer.start();
}
}
}
void CDMRSlot::writeQueueRF(const unsigned char *data)
@@ -1760,7 +1822,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data)
m_queue.addData(data, len);
}
void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper)
void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter)
{
assert(modem != NULL);
assert(display != NULL);
@@ -1779,6 +1841,9 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData
m_rssiMapper = rssiMapper;
m_jitterTime = jitter;
m_jitterSlots = jitter / DMR_SLOT_TIME;
m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U];
::memcpy(m_idle, DMR_IDLE_DATA, DMR_FRAME_LENGTH_BYTES + 2U);
@@ -1924,33 +1989,88 @@ void CDMRSlot::closeFile()
}
}
unsigned char CDMRSlot::repeatFrame(unsigned char* data)
bool CDMRSlot::insertSilence(const unsigned char* data, unsigned char seqNo)
{
// Repeat the last audio for 60ms then silence after that
if (m_netMissed == 0U) {
::memcpy(data, data + 24U, 9U); // Copy the last audio block to the first
::memcpy(data + 9U, data + 24U, 5U); // Copy the last audio block to the middle (1/2)
::memcpy(data + 19U, data + 24U, 5U); // Copy the last audio block to the middle (2/2)
} else {
::memcpy(data, DMR_SILENCE_DATA + 2U, DMR_FRAME_LENGTH_BYTES);
assert(data != NULL);
// Check to see if we have any spaces to fill?
unsigned char seq = m_netSeqNo + 1U;
if (seq == seqNo) {
// Just copy the data, nothing else to do here
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
return true;
}
if (m_netN == 0U) {
CSync::addDMRAudioSync(data, m_duplex);
unsigned int oldSeqNo = m_netSeqNo + 1U;
unsigned int newSeqNo = seqNo;
m_netMissed++;
unsigned int count;
if (newSeqNo > oldSeqNo)
count = newSeqNo - oldSeqNo;
else
count = (256U + newSeqNo) - oldSeqNo;
return DT_VOICE_SYNC;
if (count >= 10U)
return false;
insertSilence(count);
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
return true;
}
void CDMRSlot::insertSilence(unsigned int count)
{
unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U];
if (m_lastFrameValid) {
::memcpy(data, m_lastFrame, 2U); // The control data
::memcpy(data + 2U, m_lastFrame + 24U + 2U, 9U); // Copy the last audio block to the first
::memcpy(data + 24U + 2U, data + 2U, 9U); // Copy the last audio block to the last
::memcpy(data + 9U + 2U, data + 2U, 5U); // Copy the last audio block to the middle (1/2)
::memcpy(data + 19U + 2U, data + 4U + 2U, 5U); // Copy the last audio block to the middle (2/2)
} else {
m_netEmbeddedLC.getData(data, 0U);
// Not sure what to do if this isn't AMBE audio
::memcpy(data, DMR_SILENCE_DATA, DMR_FRAME_LENGTH_BYTES + 2U);
}
CDMREMB emb;
emb.setColorCode(m_colorCode);
emb.setLCSS(0U);
emb.getData(data);
unsigned char n = (m_netN + 1U) % 6U;
unsigned char seqNo = m_netSeqNo + 1U;
m_netMissed++;
unsigned char fid = m_netLC->getFID();
return DT_VOICE;
CDMREMB emb;
emb.setColorCode(m_colorCode);
emb.setLCSS(0U);
for (unsigned int i = 0U; i < count; i++) {
// Only use our silence frame if its AMBE audio data
if (fid == FID_ETSI || fid == FID_DMRA) {
if (i > 0U) {
::memcpy(data, DMR_SILENCE_DATA, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = false;
}
}
if (n == 0U) {
CSync::addDMRAudioSync(data + 2U, m_duplex);
} else {
m_netEmbeddedLC.getData(data + 2U, 0U);
emb.getData(data + 2U);
}
writeQueueNet(data);
m_netSeqNo = seqNo;
m_netN = n;
m_netFrames++;
m_netLost++;
seqNo++;
n = (n + 1U) % 6U;
}
}