Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove the broken last IMBE logic; add logic to ensure a consistent LDU superframe stream (this will result in in-call garble for the length of a missed LDU, where LDUs are dropped due to extreme call load on the FNE);

Browse Source
pull/85/head
Bryan Biedenkapp 10 months ago
parent e96384293e
commit 27c852e4c2
2 changed files with 27 additions and 94 deletions
Show Stats Download Patch File Download Diff File

110
src/host/p25/packet/Voice.cpp
Unescape View File

@ -83,6 +83,8 @@ void Voice::resetNet()
m_vocLDU1Count = 0U; m_vocLDU1Count = 0U;
m_roamLDU1Count = 0U; m_roamLDU1Count = 0U;
m_p25->m_networkWatchdog.stop(); m_p25->m_networkWatchdog.stop();
m_netLastDUID = DUID::TDU;
} }
/* Process a data frame from the RF interface. */ /* Process a data frame from the RF interface. */
@ -1284,11 +1286,21 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
return true; return true;
} }
// see if we've somehow missed the previous LDU2, and if we have insert null audio
if (m_netLastDUID == DUID::LDU1) {
LogWarning(LOG_NET, P25_LDU2_STR " audio, missed LDU2 for superframe, filling in lost audio");
resetWithNullAudio(m_netLDU2, m_netLC.getAlgId() != P25DEF::ALGO_UNENCRYPT);
writeNet_LDU2();
} else {
checkNet_LDU2(); checkNet_LDU2();
}
if (m_p25->m_netState != RS_NET_IDLE) { if (m_p25->m_netState != RS_NET_IDLE) {
m_p25->m_netTGHang.start(); m_p25->m_netTGHang.start();
writeNet_LDU1(); writeNet_LDU1();
} }
m_netLastDUID = duid;
} }
break; break;
case DUID::LDU2: case DUID::LDU2:
@ -1358,13 +1370,22 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
writeNet_LDU1(); writeNet_LDU1();
} }
else { else {
// see if we've somehow missed the previous LDU1, and if we have insert null audio
if (m_netLastDUID == DUID::LDU2) {
LogWarning(LOG_NET, P25_LDU1_STR " audio, missed LDU1 for superframe, filling in lost audio");
resetWithNullAudio(m_netLDU1, m_netLC.getAlgId() != P25DEF::ALGO_UNENCRYPT);
writeNet_LDU1();
} else {
checkNet_LDU1(); checkNet_LDU1();
} }
}
if (m_p25->m_netState != RS_NET_IDLE) { if (m_p25->m_netState != RS_NET_IDLE) {
m_p25->m_netTGHang.start(); m_p25->m_netTGHang.start();
writeNet_LDU2(); writeNet_LDU2();
} }
m_netLastDUID = duid;
} }
break; break;
case DUID::VSELP1: case DUID::VSELP1:
@ -1395,6 +1416,8 @@ bool Voice::processNetwork(uint8_t* data, uint32_t len, lc::LC& control, data::L
return false; return false;
} }
m_netLastDUID = duid;
if (!m_p25->m_enableControl) { if (!m_p25->m_enableControl) {
m_p25->m_affiliations.releaseGrant(m_netLC.getDstId(), false); m_p25->m_affiliations.releaseGrant(m_netLC.getDstId(), false);
} }
@ -1449,8 +1472,8 @@ Voice::Voice(Control* p25, bool debug, bool verbose) :
m_netLDU1(nullptr), m_netLDU1(nullptr),
m_gotNetLDU2(false), m_gotNetLDU2(false),
m_netLDU2(nullptr), m_netLDU2(nullptr),
m_netLastDUID(DUID::TDU),
m_lastDUID(DUID::TDU), m_lastDUID(DUID::TDU),
m_lastIMBE(nullptr),
m_lastMI(nullptr), m_lastMI(nullptr),
m_hadVoice(false), m_hadVoice(false),
m_lastRejectId(0U), m_lastRejectId(0U),
@ -1469,9 +1492,6 @@ Voice::Voice(Control* p25, bool debug, bool verbose) :
::memset(m_netLDU2, 0x00U, 9U * 25U); ::memset(m_netLDU2, 0x00U, 9U * 25U);
resetWithNullAudio(m_netLDU2, false); resetWithNullAudio(m_netLDU2, false);
m_lastIMBE = new uint8_t[RAW_IMBE_LENGTH_BYTES];
::memcpy(m_lastIMBE, NULL_IMBE, RAW_IMBE_LENGTH_BYTES);
m_lastMI = new uint8_t[MI_LENGTH_BYTES]; m_lastMI = new uint8_t[MI_LENGTH_BYTES];
::memset(m_lastMI, 0x00U, MI_LENGTH_BYTES); ::memset(m_lastMI, 0x00U, MI_LENGTH_BYTES);
} }
@ -1482,7 +1502,6 @@ Voice::~Voice()
{ {
delete[] m_netLDU1; delete[] m_netLDU1;
delete[] m_netLDU2; delete[] m_netLDU2;
delete[] m_lastIMBE;
delete[] m_lastMI; delete[] m_lastMI;
} }
@ -1903,8 +1922,6 @@ void Voice::writeNet_LDU1()
} }
} }
insertMissingAudio(m_netLDU1);
uint8_t buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U]; uint8_t buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 2U); ::memset(buffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 2U);
@ -2004,8 +2021,6 @@ void Voice::writeNet_LDU2()
m_netLC.setAlgId(control.getAlgId()); m_netLC.setAlgId(control.getAlgId());
m_netLC.setKId(control.getKId()); m_netLC.setKId(control.getKId());
insertMissingAudio(m_netLDU2);
uint8_t buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U]; uint8_t buffer[P25_LDU_FRAME_LENGTH_BYTES + 2U];
::memset(buffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 2U); ::memset(buffer, 0x00U, P25_LDU_FRAME_LENGTH_BYTES + 2U);
@ -2052,83 +2067,6 @@ void Voice::writeNet_LDU2()
m_netFrames += 9U; m_netFrames += 9U;
} }
/* Helper to insert IMBE silence frames for missing audio. */
void Voice::insertMissingAudio(uint8_t* data)
{
if (data[10U] == 0x00U) {
::memcpy(data + 10U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 10U, 11U);
}
if (data[26U] == 0x00U) {
::memcpy(data + 26U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 26U, 11U);
}
if (data[55U] == 0x00U) {
::memcpy(data + 55U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 55U, 11U);
}
if (data[80U] == 0x00U) {
::memcpy(data + 80U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 80U, 11U);
}
if (data[105U] == 0x00U) {
::memcpy(data + 105U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 105U, 11U);
}
if (data[130U] == 0x00U) {
::memcpy(data + 130U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 130U, 11U);
}
if (data[155U] == 0x00U) {
::memcpy(data + 155U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 155U, 11U);
}
if (data[180U] == 0x00U) {
::memcpy(data + 180U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 180U, 11U);
}
if (data[204U] == 0x00U) {
::memcpy(data + 204U, m_lastIMBE, 11U);
m_netLost++;
}
else {
::memcpy(m_lastIMBE, data + 204U, 11U);
}
}
/* Helper to insert IMBE null frames for missing audio. */ /* Helper to insert IMBE null frames for missing audio. */
void Voice::insertNullAudio(uint8_t *data) void Voice::insertNullAudio(uint8_t *data)

7
src/host/p25/packet/Voice.h
Unescape View File

@ -115,9 +115,9 @@ namespace p25
uint8_t* m_netLDU1; uint8_t* m_netLDU1;
bool m_gotNetLDU2; bool m_gotNetLDU2;
uint8_t* m_netLDU2; uint8_t* m_netLDU2;
defines::DUID::E m_netLastDUID;
defines::DUID::E m_lastDUID; defines::DUID::E m_lastDUID;
uint8_t* m_lastIMBE;
uint8_t* m_lastMI; uint8_t* m_lastMI;
bool m_hadVoice; bool m_hadVoice;
@ -179,11 +179,6 @@ namespace p25
*/ */
void writeNet_LDU2(); void writeNet_LDU2();
/**
* @brief Helper to insert IMBE silence frames for missing audio.
* @param data Buffer containing frame data.
*/
void insertMissingAudio(uint8_t* data);
/** /**
* @brief Helper to insert IMBE null frames for missing audio. * @brief Helper to insert IMBE null frames for missing audio.
* @param data Buffer containing frame data. * @param data Buffer containing frame data.

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.