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

Final jitter buffer rollback cleanups.

Browse Source
This commit is contained in:
Jonathan Naylor
2018-02-08 20:34:18 +00:00
parent e6ed2e17a1
commit bf1773ebcc
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DMRNetwork.cpp
View File

@@ -246,8 +246,15 @@ bool CDMRNetwork::write(const CDMRData& data)
} else if (dataType == DT_VOICE) { } else if (dataType == DT_VOICE) {
buffer[15U] |= data.getN(); buffer[15U] |= data.getN();
} else { } else {
if (dataType == DT_VOICE_LC_HEADER) if (dataType == DT_VOICE_LC_HEADER) {
m_streamId[slotIndex] = ::rand() + 1U;
count = 2U; count = 2U;
}
if (dataType == DT_CSBK || dataType == DT_DATA_HEADER) {
m_streamId[slotIndex] = ::rand() + 1U;
count = 1U;
}
buffer[15U] |= (0x20U | dataType); buffer[15U] |= (0x20U | dataType);
} }

6
DMRSlot.cpp
View File

@@ -571,8 +571,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
} else { } else {
if (m_rfState == RS_RF_AUDIO) { if (m_rfState == RS_RF_AUDIO) {
m_rfN = data[1U] & 0x0FU; m_rfN = data[1U] & 0x0FU;
if (m_rfN > 5U)
if(m_rfN > 5U)
return false; return false;
unsigned int errors = 0U; unsigned int errors = 0U;
@@ -814,8 +813,7 @@ bool CDMRSlot::writeModem(unsigned char *data, unsigned int len)
writeNetworkRF(start, DT_VOICE_LC_HEADER); writeNetworkRF(start, DT_VOICE_LC_HEADER);
m_rfN = data[1U] & 0x0FU; m_rfN = data[1U] & 0x0FU;
if (m_rfN > 5U)
if(m_rfN > 5U)
return false; return false;
// Regenerate the EMB // Regenerate the EMB