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

Improve silence fillin messages.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-02-18 19:57:11 +00:00
parent 6c0c553a47
commit 9a3fe18e91
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
DStarControl.cpp
View File

@@ -186,10 +186,8 @@ bool CDStarControl::writeModem(unsigned char *data)
}
} else if (type == TAG_EOT) {
if (m_state == RS_RELAYING_RF_AUDIO) {
if (m_net) {
for (unsigned int i = 0U; i < 2U; i++)
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, false);
}
if (m_net)
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, false);
if (m_duplex)
writeQueueEOT();
@@ -201,10 +199,8 @@ bool CDStarControl::writeModem(unsigned char *data)
writeEndOfTransmission();
} else if (m_state == RS_RELAYING_NETWORK_AUDIO) {
if (m_net) {
for (unsigned int i = 0U; i < 2U; i++)
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, true);
}
if (m_net)
writeNetworkData(DSTAR_END_PATTERN_BYTES, 0U, true, true);
}
return false;
@@ -547,12 +543,13 @@ void CDStarControl::clock(unsigned int ms)
m_packetTimer.clock(ms);
if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
unsigned int frames = m_elapsed.elapsed() / DSTAR_FRAME_TIME;
unsigned int elapsed = m_elapsed.elapsed();
unsigned int frames = elapsed / DSTAR_FRAME_TIME;
if (frames > m_frames) {
unsigned int count = frames - m_frames;
if (count > 5U) {
LogMessage("D-Star, lost audio for 200ms filling in, %u %u", frames, m_frames);
LogMessage("D-Star, lost audio for 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_frames);
insertSilence(count - 2U);
}
}