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

Completely revert the DMR silence infilling.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-08-10 20:16:06 +01:00
parent 27edf9fc1c
commit 4e35a8d47e
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DMRSlot.cpp
View File

@@ -73,7 +73,7 @@ m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U), m_networkWatchdog(1000U, 0U, 1500U),
m_rfTimeoutTimer(1000U, timeout), m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout), m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 500U), m_packetTimer(1000U, 0U, 300U),
m_interval(), m_interval(),
m_elapsed(), m_elapsed(),
m_rfFrames(0U), m_rfFrames(0U),
@@ -1030,9 +1030,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_elapsed.start(); m_elapsed.start();
m_netLost = 0U; m_netLost = 0U;
} else { } else {
bool ret = insertSilence(data, dmrData.getSeqNo()); insertSilence(data, dmrData.getSeqNo());
if (!ret)
return;
} }
writeQueueNet(data); writeQueueNet(data);
@@ -1086,9 +1084,7 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_elapsed.start(); m_elapsed.start();
m_netLost = 0U; m_netLost = 0U;
} else { } else {
bool ret = insertSilence(data, dmrData.getSeqNo()); insertSilence(data, dmrData.getSeqNo());
if (!ret)
return;
} }
writeQueueNet(data); writeQueueNet(data);
@@ -1249,8 +1245,8 @@ void CDMRSlot::clock()
if (frames > m_netFrames) { if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames; unsigned int count = frames - m_netFrames;
if (count >= 8U) { if (count > 3U) {
LogDebug("DMR Slot %u, lost audio for 500ms filling in, elapsed: %ums, expected: %u, received: %u", m_slotNo, elapsed, frames, m_netFrames); LogDebug("DMR Slot %u, lost audio for 300ms filling in, elapsed: %ums, expected: %u, received: %u", m_slotNo, elapsed, frames, m_netFrames);
insertSilence(count - 1U); insertSilence(count - 1U);
} }
} }