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

Revert packet timer changes.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-15 06:32:56 +01:00
parent f18c505852
commit 2a53923c9a
6 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
DStarControl.cpp
View File

@@ -56,6 +56,7 @@ m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U),
m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 200U),
m_ackTimer(1000U, 0U, 750U),
m_interval(),
m_elapsed(),
@@ -423,6 +424,7 @@ void CDStarControl::writeEndNet()
m_netTimeoutTimer.stop();
m_networkWatchdog.stop();
m_packetTimer.stop();
if (m_network != NULL)
m_network->reset();
@@ -466,6 +468,7 @@ void CDStarControl::writeNetwork()
m_netHeader = header;
m_netTimeoutTimer.start();
m_packetTimer.start();
m_elapsed.start();
m_ackTimer.stop();
@@ -541,6 +544,7 @@ void CDStarControl::writeNetwork()
if (n == 0U)
CSync::addDStarSync(data + 2U);
m_packetTimer.start();
m_netFrames++;
#if defined(DUMP_DSTAR)
@@ -585,15 +589,21 @@ void CDStarControl::clock()
}
if (m_netState == RS_NET_AUDIO) {
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / DSTAR_FRAME_TIME;
m_packetTimer.clock(ms);
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > (300U / DSTAR_FRAME_TIME)) {
LogMessage("D-Star, lost audio for over 300ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames);
insertSilence(count - 2U);
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / DSTAR_FRAME_TIME;
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > 5U) {
LogDebug("D-Star, lost audio for 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames);
insertSilence(count - 2U);
}
}
m_packetTimer.start();
}
}
}