g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-05 14:35:31 +00:00
Code Issues Projects Releases Packages 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

24
DStarControl.cpp
View file

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