From 49b002a463ca43fc9affcb75451925f1449d487f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Thu, 14 Jul 2016 20:31:29 +0100 Subject: [PATCH] Make silence infillinf a little looser. --- DMRSlot.cpp | 4 ++-- DStarControl.cpp | 4 ++-- YSFControl.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DMRSlot.cpp b/DMRSlot.cpp index 12dcbd8..aca8b21 100644 --- a/DMRSlot.cpp +++ b/DMRSlot.cpp @@ -1235,8 +1235,8 @@ void CDMRSlot::clock() 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); + if (count > (300U / DMR_SLOT_TIME)) { + LogDebug("DMR Slot %u, lost audio for over 300ms filling in, elapsed: %ums, expected: %u, received: %u", m_slotNo, elapsed, frames, m_netFrames); insertSilence(count - 1U); } } diff --git a/DStarControl.cpp b/DStarControl.cpp index a3e4f3c..cc7cbca 100644 --- a/DStarControl.cpp +++ b/DStarControl.cpp @@ -590,8 +590,8 @@ void CDStarControl::clock() 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); + if (count > (300U / DSTAR_FRAME_TIME)) { + LogDebug("D-Star, lost audio for over 300ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames); insertSilence(count - 2U); } } diff --git a/YSFControl.cpp b/YSFControl.cpp index fea9bc2..3b44aad 100644 --- a/YSFControl.cpp +++ b/YSFControl.cpp @@ -546,8 +546,8 @@ void CYSFControl::clock(unsigned int ms) if (frames > m_netFrames) { unsigned int count = frames - m_netFrames; - if (count > 2U) { - LogDebug("YSF, lost audio for over 200ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames); + if (count > (300U / YSF_FRAME_TIME)) { + LogDebug("YSF, lost audio for over 300ms filling in, elapsed: %ums, expected: %u, received: %u", elapsed, frames, m_netFrames); insertSilence(count - 1U); } }