ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Fix the silence insertion for D-Star." 

This reverts commit 9cc2bfaaec.
This commit is contained in:
Tim Stewart 2020-11-27 17:44:33 -05:00
parent c94f4f5d4a
commit 7ea37fc5e9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DStarControl.cpp
View File

@ -730,10 +730,10 @@ void CDStarControl::writeNetwork()
writeEndNet(); writeEndNet();
} }
} else if (type == TAG_DATA) { } else if (type == TAG_DATA) {
unsigned char n = data[1U]; unsigned char m_netN = data[1U];
// Check for the fast data signature // Check for the fast data signature
if (m_netState == RS_NET_AUDIO && (n % 2U) == 1U) { if (m_netState == RS_NET_AUDIO && (m_netN % 2U) == 1U) {
unsigned char slowDataType = data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] & DSTAR_SLOW_DATA_TYPE_MASK; unsigned char slowDataType = data[DSTAR_VOICE_FRAME_LENGTH_BYTES + 2U] & DSTAR_SLOW_DATA_TYPE_MASK;
if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) { if (slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA1 || slowDataType == DSTAR_SLOW_DATA_TYPE_FAST_DATA2) {
LogMessage("D-Star, switching to fast data mode"); LogMessage("D-Star, switching to fast data mode");
@ -749,8 +749,6 @@ void CDStarControl::writeNetwork()
m_netBits += 72U; m_netBits += 72U;
m_netErrs = 0U; m_netErrs = 0U;
m_netN = n;
// Regenerate the sync // Regenerate the sync
if (m_netN == 0U) if (m_netN == 0U)
CSync::addDStarSync(data + 2U); CSync::addDStarSync(data + 2U);
@ -780,15 +778,13 @@ void CDStarControl::writeNetwork()
data[1U] = TAG_DATA; data[1U] = TAG_DATA;
// Insert silence and reject if in the past // Insert silence and reject if in the past
bool ret = insertSilence(data + 1U, n); bool ret = insertSilence(data + 1U, m_netN);
if (!ret) if (!ret)
return; return;
m_netErrs += errors; m_netErrs += errors;
m_netBits += 48U; m_netBits += 48U;
m_netN = n;
// Regenerate the sync // Regenerate the sync
if (m_netN == 0U) if (m_netN == 0U)
CSync::addDStarSync(data + 2U); CSync::addDStarSync(data + 2U);