MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-21 06:55:52 +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
YSFControl.cpp
View File

@@ -33,6 +33,7 @@ m_rfState(RS_RF_LISTENING),
m_netState(RS_NET_IDLE),
m_rfTimeoutTimer(1000U, timeout),
m_netTimeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 200U),
m_networkWatchdog(1000U, 0U, 1500U),
m_elapsed(),
m_rfFrames(0U),
@@ -352,6 +353,7 @@ void CYSFControl::writeEndNet()
m_netTimeoutTimer.stop();
m_networkWatchdog.stop();
m_packetTimer.stop();
m_netPayload.reset();
@@ -397,6 +399,7 @@ void CYSFControl::writeNetwork()
m_netTimeoutTimer.start();
m_netPayload.reset();
m_packetTimer.start();
m_elapsed.start();
m_netState = RS_NET_AUDIO;
m_netFrames = 0U;
@@ -513,6 +516,7 @@ void CYSFControl::writeNetwork()
if (send) {
writeQueueNet(data + 33U);
m_packetTimer.start();
m_netFrames++;
m_netN = n;
}
@@ -541,15 +545,21 @@ void CYSFControl::clock(unsigned int ms)
}
if (m_netState == RS_NET_AUDIO) {
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / YSF_FRAME_TIME;
m_packetTimer.clock(ms);
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > (300U / YSF_FRAME_TIME)) {
LogMessage("YSF, lost audio for over 300ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames);
insertSilence(count - 1U);
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / YSF_FRAME_TIME;
if (frames > m_netFrames) {
unsigned int count = frames - m_netFrames;
if (count > 2U) {
LogDebug("YSF, lost audio for 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames);
insertSilence(count - 1U);
}
}
m_packetTimer.start();
}
}
}