mirror of
https://github.com/g4klx/MMDVMHost.git
synced 2026-04-07 07:23:53 +00:00
Add lookback in fast data handling to prevent first voice frame to get killed by FEC
This commit is contained in:
parent
d3ed3ce8d2
commit
876f58c05c
5 changed files with 218 additions and 105 deletions
|
|
@ -67,7 +67,7 @@ void CDStarSlowData::add(const unsigned char* data)
|
|||
m_buffer[5U] = data[11U] ^ DSTAR_SCRAMBLER_BYTES[2U];
|
||||
m_state = SDD_STATE::FIRST;
|
||||
m_complete = true;
|
||||
CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
|
||||
////CUtils::dump(1U, "D-Star slow data element", m_buffer, 6U);
|
||||
loadHeader();
|
||||
loadText();
|
||||
break;
|
||||
|
|
@ -111,7 +111,7 @@ void CDStarSlowData::loadText()
|
|||
{
|
||||
switch (m_buffer[0U]) {
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 0U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 0", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 0", m_buffer, 6U);
|
||||
m_text[0U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[1U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[2U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -121,7 +121,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 1U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 1", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 1", m_buffer, 6U);
|
||||
m_text[5U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[6U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[7U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -131,7 +131,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 2U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 2", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 2", m_buffer, 6U);
|
||||
m_text[10U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[11U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[12U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -141,7 +141,7 @@ void CDStarSlowData::loadText()
|
|||
break;
|
||||
|
||||
case DSTAR_SLOW_DATA_TYPE_TEXT | 3U:
|
||||
CUtils::dump(1U, "D-Star slow data text fragment 3", m_buffer, 6U);
|
||||
//CUtils::dump(1U, "D-Star slow data text fragment 3", m_buffer, 6U);
|
||||
m_text[15U] = m_buffer[1U] & 0x7FU;
|
||||
m_text[16U] = m_buffer[2U] & 0x7FU;
|
||||
m_text[17U] = m_buffer[3U] & 0x7FU;
|
||||
|
|
@ -161,7 +161,7 @@ const unsigned char* CDStarSlowData::getText()
|
|||
if (m_textBits != 0x0FU)
|
||||
return nullptr;
|
||||
|
||||
CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
|
||||
//CUtils::dump(1U, "D-Star slow data text", m_text, 20U);
|
||||
|
||||
m_textBits = 0x00U;
|
||||
|
||||
|
|
@ -237,9 +237,9 @@ void CDStarSlowData::getSlowData(unsigned char* data)
|
|||
}
|
||||
}
|
||||
|
||||
unsigned char CDStarSlowData::getType() const
|
||||
unsigned char CDStarSlowData::getType(bool unmasked) const
|
||||
{
|
||||
return m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK;
|
||||
return unmasked ? m_buffer[0U] : m_buffer[0U] & DSTAR_SLOW_DATA_TYPE_MASK ;
|
||||
}
|
||||
|
||||
bool CDStarSlowData::isComplete() const
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue