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

Semi-revert to the older silence filling method.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-08-09 07:28:10 +01:00
parent f1f69bb4ee
commit a4d8d7a121
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
DMRSlot.cpp
View File

@@ -744,12 +744,8 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
dmrData.getData(data + 2U); dmrData.getData(data + 2U);
if (dataType == DT_VOICE_LC_HEADER) { if (dataType == DT_VOICE_LC_HEADER) {
if (m_netState == RS_NET_AUDIO) { if (m_netState == RS_NET_AUDIO)
// Reset the missing audio timers
m_packetTimer.start();
m_elapsed.start();
return; return;
}
CDMRFullLC fullLC; CDMRFullLC fullLC;
m_netLC = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER); m_netLC = fullLC.decode(data + 2U, DT_VOICE_LC_HEADER);
@@ -785,18 +781,12 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
m_packetTimer.start();
m_elapsed.start();
m_netFrames = 0U; m_netFrames = 0U;
m_netLost = 0U; m_netLost = 0U;
m_netBits = 1U; m_netBits = 1U;
m_netErrs = 0U; m_netErrs = 0U;
m_netN = dmrData.getN();
m_netSeqNo = dmrData.getSeqNo();
if (m_duplex) { if (m_duplex) {
m_queue.clear(); m_queue.clear();
m_modem->writeDMRAbort(m_slotNo); m_modem->writeDMRAbort(m_slotNo);
@@ -849,10 +839,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
bptc.decode(data + 2U, payload); bptc.decode(data + 2U, payload);
bptc.encode(payload, data + 2U); bptc.encode(payload, data + 2U);
// Reset the missing audio timers
m_packetTimer.start();
m_elapsed.start();
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
@@ -971,9 +957,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netTimeoutTimer.start(); m_netTimeoutTimer.start();
m_packetTimer.start();
m_elapsed.start();
if (m_duplex) { if (m_duplex) {
m_queue.clear(); m_queue.clear();
m_modem->writeDMRAbort(m_slotNo); m_modem->writeDMRAbort(m_slotNo);
@@ -1036,9 +1019,20 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// Convert the Audio Sync to be from the BS // Convert the Audio Sync to be from the BS
CSync::addDMRAudioSync(data + 2U); CSync::addDMRAudioSync(data + 2U);
bool ret = insertSilence(data, dmrData.getSeqNo()); // Initialise the lost packet data
if (!ret) if (!m_lastFrameValid) {
return; ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
m_packetTimer.start();
m_elapsed.start();
m_netLost = 0U;
} else {
bool ret = insertSilence(data, dmrData.getSeqNo());
if (!ret)
return;
}
writeQueueNet(data); writeQueueNet(data);
@@ -1080,9 +1074,20 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
data[0U] = TAG_DATA; data[0U] = TAG_DATA;
data[1U] = 0x00U; data[1U] = 0x00U;
bool ret = insertSilence(data, dmrData.getSeqNo()); // Initialise the lost packet data
if (!ret) if (!m_lastFrameValid) {
return; ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN();
m_packetTimer.start();
m_elapsed.start();
m_netLost = 0U;
} else {
bool ret = insertSilence(data, dmrData.getSeqNo());
if (!ret)
return;
}
writeQueueNet(data); writeQueueNet(data);