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

Remove packet timer and use the elapsed timer directly.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-14 18:20:06 +01:00
parent 026a8a2e06
commit ad29c5c4b6
6 changed files with 21 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DMRSlot.cpp
View File

@@ -70,7 +70,6 @@ m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U),
m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 300U),
m_interval(),
m_elapsed(),
m_rfFrames(0U),
@@ -679,7 +678,6 @@ void CDMRSlot::writeEndNet(bool writeEnd)
m_networkWatchdog.stop();
m_netTimeoutTimer.stop();
m_packetTimer.stop();
m_netFrames = 0U;
m_netLost = 0U;
@@ -1031,8 +1029,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
writeQueueNet(data);
m_packetTimer.start();
m_netFrames++;
// Save details in case we need to infill data
@@ -1084,8 +1080,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
writeQueueNet(data);
m_packetTimer.start();
m_netFrames++;
// Save details in case we need to infill data
@@ -1236,21 +1230,15 @@ void CDMRSlot::clock()
}
if (m_netState == RS_NET_AUDIO) {
m_packetTimer.clock(ms);
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / DMR_SLOT_TIME;
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / DMR_SLOT_TIME;
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > 3U) {
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);
}
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > 3U) {
LogDebug("DMR Slot %u, lost audio for over 200ms filling in, elapsed: %ums, expected: %u, received: %u", m_slotNo, elapsed, frames, m_netFrames);
insertSilence(count - 1U);
}
m_packetTimer.start();
}
}
}