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

Change the network late entry and be less aggressive at filling silence.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-01-22 06:43:08 +00:00
parent 435ad79e47
commit 73375fb41e
5 changed files with 108 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

268
DMRSlot.cpp
View File

@@ -50,7 +50,7 @@ m_seqNo(0U),
m_n(0U), m_n(0U),
m_networkWatchdog(1000U, 0U, 1500U), m_networkWatchdog(1000U, 0U, 1500U),
m_timeoutTimer(1000U, timeout), m_timeoutTimer(1000U, timeout),
m_packetTimer(1000U, 0U, 200U), m_packetTimer(1000U, 0U, 300U),
m_elapsed(), m_elapsed(),
m_frames(0U), m_frames(0U),
m_lost(0U), m_lost(0U),
@@ -75,17 +75,16 @@ void CDMRSlot::writeModem(unsigned char *data)
if (data[0U] == TAG_LOST && m_state == RS_RELAYING_RF_DATA) { if (data[0U] == TAG_LOST && m_state == RS_RELAYING_RF_DATA) {
LogMessage("DMR Slot %u, transmission lost", m_slotNo); LogMessage("DMR Slot %u, transmission lost", m_slotNo);
writeTerminator(true);
writeEndOfTransmission(); writeEndOfTransmission();
return; return;
} }
if (data[0U] == TAG_LOST && m_state == RS_RF_LATE_ENTRY) { if (data[0U] == TAG_LOST && m_state == RS_LATE_ENTRY) {
m_state = RS_LISTENING; m_state = RS_LISTENING;
return; return;
} }
if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA || m_state == RS_NETWORK_LATE_ENTRY) if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA)
return; return;
bool dataSync = (data[1U] & DMR_SYNC_DATA) == DMR_SYNC_DATA; bool dataSync = (data[1U] & DMR_SYNC_DATA) == DMR_SYNC_DATA;
@@ -249,7 +248,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
writeNetwork(data, DT_VOICE_SYNC); writeNetwork(data, DT_VOICE_SYNC);
} else if (m_state == RS_LISTENING) { } else if (m_state == RS_LISTENING) {
m_state = RS_RF_LATE_ENTRY; m_state = RS_LATE_ENTRY;
} }
} else { } else {
CEMB emb; CEMB emb;
@@ -272,7 +271,7 @@ void CDMRSlot::writeModem(unsigned char *data)
writeQueue(data); writeQueue(data);
writeNetwork(data, DT_VOICE); writeNetwork(data, DT_VOICE);
} else if (m_state == RS_RF_LATE_ENTRY) { } else if (m_state == RS_LATE_ENTRY) {
// If we haven't received an LC yet, then be strict on the color code // If we haven't received an LC yet, then be strict on the color code
unsigned char colorCode = emb.getColorCode(); unsigned char colorCode = emb.getColorCode();
if (colorCode != m_colorCode) if (colorCode != m_colorCode)
@@ -375,7 +374,7 @@ void CDMRSlot::writeEndOfTransmission()
void CDMRSlot::writeNetwork(const CDMRData& dmrData) void CDMRSlot::writeNetwork(const CDMRData& dmrData)
{ {
if (m_state == RS_RELAYING_RF_AUDIO || m_state == RS_RELAYING_RF_DATA || m_state == RS_RF_LATE_ENTRY) if (m_state == RS_RELAYING_RF_AUDIO || m_state == RS_RELAYING_RF_DATA || m_state == RS_LATE_ENTRY)
return; return;
m_networkWatchdog.start(); m_networkWatchdog.start();
@@ -519,6 +518,32 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
// LogMessage("DMR Slot %u, received network data header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId()); // LogMessage("DMR Slot %u, received network data header from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
LogMessage("DMR Slot %u, received network data header", m_slotNo); LogMessage("DMR Slot %u, received network data header", m_slotNo);
} else if (dataType == DT_VOICE_SYNC) { } else if (dataType == DT_VOICE_SYNC) {
if (m_state == RS_LISTENING) {
m_lc = new CLC(dmrData.getFLCO(), dmrData.getSrcId(), dmrData.getDstId());
m_timeoutTimer.start();
// 540ms of idle to give breathing space for lost frames
for (unsigned int i = 0U; i < 9U; i++)
writeQueue(m_idle);
#if defined(DUMP_DMR)
openFile();
#endif
m_frames = 0U;
m_bits = 1U;
m_errs = 0U;
m_state = RS_RELAYING_NETWORK_AUDIO;
setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId());
LogMessage("DMR Slot %u, received network late entry from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
}
if (m_state == RS_RELAYING_NETWORK_AUDIO) { if (m_state == RS_RELAYING_NETWORK_AUDIO) {
// Initialise the lost packet data // Initialise the lost packet data
if (m_frames == 0U) { if (m_frames == 0U) {
@@ -527,7 +552,9 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_elapsed.start(); m_elapsed.start();
m_lost = 0U; m_lost = 0U;
} else { } else {
insertSilence(dmrData.getSeqNo()); bool allow = insertSilence(dmrData);
if (!allow)
return;
} }
// Convert the Audio Sync to be from the BS // Convert the Audio Sync to be from the BS
@@ -554,122 +581,49 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
#if defined(DUMP_DMR) #if defined(DUMP_DMR)
writeFile(data); writeFile(data);
#endif #endif
} else {
m_state = RS_NETWORK_LATE_ENTRY;
} }
} } else if (dataType == DT_VOICE) {
else if (dataType == DT_VOICE) { if (m_state != RS_RELAYING_NETWORK_AUDIO)
CEMB emb; return;
emb.putData(data + 2U);
if (m_state == RS_RELAYING_NETWORK_AUDIO) { // Initialise the lost packet data
// Initialise the lost packet data if (m_frames == 0U) {
if (m_frames == 0U) {
m_seqNo = dmrData.getSeqNo();
m_n = dmrData.getN();
m_elapsed.start();
m_lost = 0U;
} else {
insertSilence(dmrData.getSeqNo());
}
unsigned char fid = m_lc->getFID();
if (fid == FID_ETSI || fid == FID_DMRA)
m_errs += m_fec.regenerateDMR(data + 2U);
m_bits += 216U;
// Change the color code in the EMB
emb.setColorCode(m_colorCode);
emb.getData(data + 2U);
data[0U] = TAG_DATA;
data[1U] = 0x00U;
writeQueue(data);
m_packetTimer.start();
m_frames++;
// Save details in case we need to infill data
m_seqNo = dmrData.getSeqNo(); m_seqNo = dmrData.getSeqNo();
m_n = dmrData.getN(); m_n = dmrData.getN();
m_elapsed.start();
#if defined(DUMP_DMR) m_lost = 0U;
writeFile(data); } else {
#endif bool allow = insertSilence(dmrData);
} else if (m_state == RS_NETWORK_LATE_ENTRY) { if (!allow)
// If we haven't received an LC yet, then be strict on the color code
unsigned char colorCode = emb.getColorCode();
if (colorCode != m_colorCode)
return; return;
m_lc = m_embeddedLC.addData(data + 2U, emb.getLCSS());
if (m_lc != NULL) {
// Create a dummy start frame to replace the received frame
unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];
CDMRSync sync;
sync.addSync(start + 2U, DST_BS_DATA);
CFullLC fullLC;
fullLC.encode(*m_lc, start + 2U, DT_VOICE_LC_HEADER);
CSlotType slotType;
slotType.setColorCode(m_colorCode);
slotType.setDataType(DT_VOICE_LC_HEADER);
slotType.getData(start + 2U);
m_timeoutTimer.start();
// 540ms of idle to give breathing space for lost frames
for (unsigned int i = 0U; i < 9U; i++)
writeQueue(m_idle);
for (unsigned int i = 0U; i < 3U; i++)
writeQueue(start);
#if defined(DUMP_DMR)
openFile();
writeFile(start);
#endif
// Change the color code in the EMB
emb.setColorCode(m_colorCode);
emb.getData(data + 2U);
// Initialise the lost packet data
m_seqNo = dmrData.getSeqNo();
m_n = dmrData.getN();
m_elapsed.start();
m_lost = 0U;
// Send the original audio frame out
unsigned char fid = m_lc->getFID();
if (fid == FID_ETSI || fid == FID_DMRA)
m_errs = m_fec.regenerateDMR(data + 2U);
m_bits = 216U;
data[0U] = TAG_DATA;
data[1U] = 0x00U;
writeQueue(data);
m_packetTimer.start();
m_frames = 1U;
#if defined(DUMP_DMR)
writeFile(data);
#endif
m_state = RS_RELAYING_NETWORK_AUDIO;
setShortLC(m_slotNo, m_lc->getDstId(), m_lc->getFLCO());
m_display->writeDMR(m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP, m_lc->getDstId());
LogMessage("DMR Slot %u, received network late entry from %u to %s%u", m_slotNo, m_lc->getSrcId(), m_lc->getFLCO() == FLCO_GROUP ? "TG " : "", m_lc->getDstId());
}
} }
unsigned char fid = m_lc->getFID();
if (fid == FID_ETSI || fid == FID_DMRA)
m_errs += m_fec.regenerateDMR(data + 2U);
m_bits += 216U;
// Change the color code in the EMB
CEMB emb;
emb.putData(data + 2U);
emb.setColorCode(m_colorCode);
emb.getData(data + 2U);
data[0U] = TAG_DATA;
data[1U] = 0x00U;
writeQueue(data);
m_packetTimer.start();
m_frames++;
// Save details in case we need to infill data
m_seqNo = dmrData.getSeqNo();
m_n = dmrData.getN();
#if defined(DUMP_DMR)
writeFile(data);
#endif
} else { } else {
// Change the Color Code of the Slot Type // Change the Color Code of the Slot Type
CSlotType slotType; CSlotType slotType;
@@ -696,7 +650,7 @@ void CDMRSlot::clock(unsigned int ms)
{ {
m_timeoutTimer.clock(ms); m_timeoutTimer.clock(ms);
if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA || m_state == RS_NETWORK_LATE_ENTRY) { if (m_state == RS_RELAYING_NETWORK_AUDIO || m_state == RS_RELAYING_NETWORK_DATA) {
m_networkWatchdog.clock(ms); m_networkWatchdog.clock(ms);
if (m_networkWatchdog.hasExpired()) { if (m_networkWatchdog.hasExpired()) {
@@ -704,19 +658,16 @@ void CDMRSlot::clock(unsigned int ms)
// We've received the voice header haven't we? // We've received the voice header haven't we?
m_frames += 1U; m_frames += 1U;
LogMessage("DMR Slot %u, network watchdog has expired, %u%% packet loss, BER: %u%%", m_slotNo, (m_lost * 100U) / m_frames, (m_errs * 100U) / m_bits); LogMessage("DMR Slot %u, network watchdog has expired, %u%% packet loss, BER: %u%%", m_slotNo, (m_lost * 100U) / m_frames, (m_errs * 100U) / m_bits);
writeTerminator(false);
writeEndOfTransmission();
#if defined(DUMP_DMR)
closeFile();
#endif
} else if (m_state == RS_RELAYING_NETWORK_DATA) {
LogMessage("DMR Slot %u, network watchdog has expired", m_slotNo);
writeEndOfTransmission(); writeEndOfTransmission();
#if defined(DUMP_DMR) #if defined(DUMP_DMR)
closeFile(); closeFile();
#endif #endif
} else { } else {
m_state = RS_LISTENING; LogMessage("DMR Slot %u, network watchdog has expired", m_slotNo);
writeEndOfTransmission();
#if defined(DUMP_DMR)
closeFile();
#endif
} }
} }
} }
@@ -730,8 +681,9 @@ void CDMRSlot::clock(unsigned int ms)
if (frames > m_frames) { if (frames > m_frames) {
unsigned int count = frames - m_frames; unsigned int count = frames - m_frames;
if (count > 3U) { if (count > 3U) {
LogMessage("DMR Slot %u, lost audio for 200ms filling in", m_slotNo); count -= 1U;
insertSilence(m_seqNo + count - 1U); LogMessage("DMR Slot %u, lost audio for 300ms filling in", m_slotNo);
insertSilence(m_seqNo + count);
} }
} }
@@ -752,41 +704,6 @@ void CDMRSlot::writeQueue(const unsigned char *data)
m_queue.addData(data, len); m_queue.addData(data, len);
} }
// XXX Once the PF flag is fixed in the LC, always use this for the terminator
void CDMRSlot::writeTerminator(bool toNetwork)
{
unsigned char data[DMR_FRAME_LENGTH_BYTES + 2U];
// Generate the LC
CFullLC fullLC;
fullLC.encode(*m_lc, data + 2U, DT_TERMINATOR_WITH_LC);
// Generate the Slot Type
CSlotType slotType;
slotType.setColorCode(m_colorCode);
slotType.setDataType(DT_TERMINATOR_WITH_LC);
slotType.getData(data + 2U);
// Set the Data Sync to be from the BS
CDMRSync sync;
sync.addSync(data + 2U, DST_BS_DATA);
data[0U] = TAG_EOT;
data[1U] = 0x00U;
// 480ms of terminator to space things out
for (unsigned int i = 0U; i < 8U; i++)
writeQueue(data);
if (toNetwork)
writeNetwork(data, DT_TERMINATOR_WITH_LC);
#if defined(DUMP_DMR)
writeFile(data);
closeFile();
#endif
}
void CDMRSlot::writeNetwork(const unsigned char* data, unsigned char dataType) void CDMRSlot::writeNetwork(const unsigned char* data, unsigned char dataType)
{ {
assert(m_lc != NULL); assert(m_lc != NULL);
@@ -946,6 +863,29 @@ void CDMRSlot::closeFile()
} }
} }
bool CDMRSlot::insertSilence(const CDMRData& dmrData)
{
unsigned int oldSeqNo = m_seqNo;
unsigned int newSeqNo = dmrData.getSeqNo();
unsigned int count;
if (newSeqNo > oldSeqNo)
count = newSeqNo - oldSeqNo;
else
count = (256U + newSeqNo) - oldSeqNo;
if (count > 10U) {
LogMessage("DMR Slot %u, rejecting frame as being too old", m_slotNo);
return false;
}
insertSilence(dmrData.getSeqNo());
// Store frame for last frame here if needed
return true;
}
void CDMRSlot::insertSilence(unsigned char newSeqNo) void CDMRSlot::insertSilence(unsigned char newSeqNo)
{ {
// Check to see if we have any spaces to fill // Check to see if we have any spaces to fill

2
DMRSlot.h
View File

@@ -82,13 +82,13 @@ private:
void writeQueue(const unsigned char* data); void writeQueue(const unsigned char* data);
void writeNetwork(const unsigned char* data, unsigned char dataType); void writeNetwork(const unsigned char* data, unsigned char dataType);
void writeTerminator(bool toNetwork);
void writeEndOfTransmission(); void writeEndOfTransmission();
bool openFile(); bool openFile();
bool writeFile(const unsigned char* data); bool writeFile(const unsigned char* data);
void closeFile(); void closeFile();
bool insertSilence(const CDMRData& dmrData);
void insertSilence(unsigned char seqNo); void insertSilence(unsigned char seqNo);
static void setShortLC(unsigned int slotNo, unsigned int id, FLCO flco = FLCO_GROUP); static void setShortLC(unsigned int slotNo, unsigned int id, FLCO flco = FLCO_GROUP);

3
Defines.h
View File

@@ -31,8 +31,7 @@ const unsigned char TAG_EOT = 0x03U;
enum RPT_STATE { enum RPT_STATE {
RS_LISTENING, RS_LISTENING,
RS_RF_LATE_ENTRY, RS_LATE_ENTRY,
RS_NETWORK_LATE_ENTRY,
RS_RELAYING_RF_AUDIO, RS_RELAYING_RF_AUDIO,
RS_RELAYING_NETWORK_AUDIO, RS_RELAYING_NETWORK_AUDIO,
RS_RELAYING_RF_DATA, RS_RELAYING_RF_DATA,

2
MMDVMHost.cpp
View File

@@ -422,7 +422,7 @@ bool CMMDVMHost::createDMRNetwork()
LogInfo(" Address: %s", address.c_str()); LogInfo(" Address: %s", address.c_str());
LogInfo(" Port: %u", port); LogInfo(" Port: %u", port);
m_dmrNetwork = new CHomebrewDMRIPSC(address, port, id, password, VERSION, "MMDVMHost", debug); m_dmrNetwork = new CHomebrewDMRIPSC(address, port, id, password, VERSION, "MMDVM", debug);
std::string callsign = m_conf.getCallsign(); std::string callsign = m_conf.getCallsign();
unsigned int rxFrequency = m_conf.getRxFrequency(); unsigned int rxFrequency = m_conf.getRxFrequency();

2
Version.h
View File

@@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20160121"; const char* VERSION = "20160122";
#endif #endif