Crash_Override/MMDVMHost-Private
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into nxdn

Browse source
This commit is contained in:
Andy CA6JAU 2018-02-10 20:57:44 -03:00
commit aa1a3f471a
4 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
DMRDefines.h
View file

@ -61,12 +61,9 @@ const unsigned char DMR_IDLE_DATA[] = {TAG_DATA, 0x00U,
// A silence frame only // A silence frame only
const unsigned char DMR_SILENCE_DATA[] = {TAG_DATA, 0x00U, const unsigned char DMR_SILENCE_DATA[] = {TAG_DATA, 0x00U,
0xACU, 0xAAU, 0x40U, 0x20U, 0x00U, 0x44U, 0x40U, 0x80U, 0x80U, 0xACU, 0xAAU, 0xB9U, 0xE8U, 0x81U, 0x52U, 0x61U, 0x73U, 0x00U, 0x2AU, 0x6BU, 0xB9U, 0xE8U,
0x40U, 0x20U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x44U, 0x40U, 0x81U, 0x52U, 0x60U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x01U, 0x73U, 0x00U,
0x80U, 0x80U, 0xACU, 0xAAU, 0x40U, 0x20U, 0x00U, 0x44U, 0x40U, 0x80U, 0x80U}; 0x2AU, 0x6BU, 0xB9U, 0xE8U, 0x81U, 0x52U, 0x61U, 0x73U, 0x00U, 0x2AU, 0x6BU};
// 0x88U, 0xC8U, 0xA3U, 0x54U, 0x22U, 0x16U, 0x31U, 0x69U, 0x6AU, 0xAAU, 0xCAU,
// 0x81U, 0x54U, 0x20U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x01U, 0x27U, 0x13U,
// 0x29U, 0x48U, 0xAAU, 0xCAU, 0x81U, 0x54U, 0x21U, 0x27U, 0x31U, 0x39U, 0x6AU};
const unsigned char PAYLOAD_LEFT_MASK[] = {0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xF0U}; const unsigned char PAYLOAD_LEFT_MASK[] = {0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xF0U};
const unsigned char PAYLOAD_RIGHT_MASK[] = {0x0FU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU}; const unsigned char PAYLOAD_RIGHT_MASK[] = {0x0FU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU, 0xFFU};

52
DMRSlot.cpp
View file

@ -30,6 +30,7 @@
#include <ctime> #include <ctime>
#include <algorithm> #include <algorithm>
#include <cstdint> #include <cstdint>
#include <cmath>
unsigned int CDMRSlot::m_colorCode = 0U; unsigned int CDMRSlot::m_colorCode = 0U;
@ -45,8 +46,8 @@ unsigned int CDMRSlot::m_hangCount = 3U * 17U;
CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL; CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;
unsigned int CDMRSlot::m_jitterTime = 300U; unsigned int CDMRSlot::m_jitterTime = 360U;
unsigned int CDMRSlot::m_jitterSlots = 5U; unsigned int CDMRSlot::m_jitterSlots = 6U;
unsigned char* CDMRSlot::m_idle = NULL; unsigned char* CDMRSlot::m_idle = NULL;
@ -87,7 +88,6 @@ m_netTalkerId(TALKER_ID_NONE),
m_rfLC(NULL), m_rfLC(NULL),
m_netLC(NULL), m_netLC(NULL),
m_rfSeqNo(0U), m_rfSeqNo(0U),
m_netSeqNo(0U),
m_rfN(0U), m_rfN(0U),
m_netN(0U), m_netN(0U),
m_networkWatchdog(1000U, 0U, 1500U), m_networkWatchdog(1000U, 0U, 1500U),
@ -1349,15 +1349,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netFrames == 0U) { if (m_netFrames == 0U) {
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U); ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true; m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo(); m_netN = 5U;
m_netN = dmrData.getN();
m_netLost = 0U; m_netLost = 0U;
} else {
insertSilence(data, dmrData.getSeqNo());
} }
if (insertSilence(data, dmrData.getN())) {
if (!m_netTimeout) if (!m_netTimeout)
writeQueueNet(data); writeQueueNet(data);
}
m_netEmbeddedReadN = (m_netEmbeddedReadN + 1U) % 2U; m_netEmbeddedReadN = (m_netEmbeddedReadN + 1U) % 2U;
m_netEmbeddedWriteN = (m_netEmbeddedWriteN + 1U) % 2U; m_netEmbeddedWriteN = (m_netEmbeddedWriteN + 1U) % 2U;
@ -1370,7 +1369,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netFrames++; m_netFrames++;
// Save details in case we need to infill data // Save details in case we need to infill data
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN(); m_netN = dmrData.getN();
#if defined(DUMP_DMR) #if defined(DUMP_DMR)
@ -1503,15 +1501,14 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
if (m_netFrames == 0U) { if (m_netFrames == 0U) {
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U); ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
m_lastFrameValid = true; m_lastFrameValid = true;
m_netSeqNo = dmrData.getSeqNo(); m_netN = 5U;
m_netN = dmrData.getN();
m_netLost = 0U; m_netLost = 0U;
} else {
insertSilence(data, dmrData.getSeqNo());
} }
if (insertSilence(data, dmrData.getN())) {
if (!m_netTimeout) if (!m_netTimeout)
writeQueueNet(data); writeQueueNet(data);
}
m_packetTimer.start(); m_packetTimer.start();
m_elapsed.start(); m_elapsed.start();
@ -1519,7 +1516,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
m_netFrames++; m_netFrames++;
// Save details in case we need to infill data // Save details in case we need to infill data
m_netSeqNo = dmrData.getSeqNo();
m_netN = dmrData.getN(); m_netN = dmrData.getN();
#if defined(DUMP_DMR) #if defined(DUMP_DMR)
@ -1840,7 +1836,9 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData
m_rssiMapper = rssiMapper; m_rssiMapper = rssiMapper;
m_jitterTime = jitter; m_jitterTime = jitter;
m_jitterSlots = jitter / DMR_SLOT_TIME;
float jitter_tmp = float(jitter) / 360.0F;
m_jitterSlots = (unsigned int) (std::ceil(jitter_tmp) * 6.0F);
m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U]; m_idle = new unsigned char[DMR_FRAME_LENGTH_BYTES + 2U];
::memcpy(m_idle, DMR_IDLE_DATA, DMR_FRAME_LENGTH_BYTES + 2U); ::memcpy(m_idle, DMR_IDLE_DATA, DMR_FRAME_LENGTH_BYTES + 2U);
@ -1991,8 +1989,13 @@ bool CDMRSlot::insertSilence(const unsigned char* data, unsigned char seqNo)
{ {
assert(data != NULL); assert(data != NULL);
// Do not send duplicate
if (seqNo == m_netN)
return false;
// Check to see if we have any spaces to fill? // Check to see if we have any spaces to fill?
unsigned char seq = m_netSeqNo + 1U; unsigned char seq = (m_netN + 1U) % 6U;
if (seq == seqNo) { if (seq == seqNo) {
// Just copy the data, nothing else to do here // Just copy the data, nothing else to do here
::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U); ::memcpy(m_lastFrame, data, DMR_FRAME_LENGTH_BYTES + 2U);
@ -2000,17 +2003,7 @@ bool CDMRSlot::insertSilence(const unsigned char* data, unsigned char seqNo)
return true; return true;
} }
unsigned int oldSeqNo = m_netSeqNo + 1U; unsigned int count = (seqNo - seq + 6U) % 6U;
unsigned int newSeqNo = seqNo;
unsigned int count;
if (newSeqNo > oldSeqNo)
count = newSeqNo - oldSeqNo;
else
count = (256U + newSeqNo) - oldSeqNo;
if (count >= 10U)
return false;
insertSilence(count); insertSilence(count);
@ -2036,13 +2029,11 @@ void CDMRSlot::insertSilence(unsigned int count)
} }
unsigned char n = (m_netN + 1U) % 6U; unsigned char n = (m_netN + 1U) % 6U;
unsigned char seqNo = m_netSeqNo + 1U;
unsigned char fid = m_netLC->getFID(); unsigned char fid = m_netLC->getFID();
CDMREMB emb; CDMREMB emb;
emb.setColorCode(m_colorCode); emb.setColorCode(m_colorCode);
emb.setLCSS(0U);
for (unsigned int i = 0U; i < count; i++) { for (unsigned int i = 0U; i < count; i++) {
// Only use our silence frame if its AMBE audio data // Only use our silence frame if its AMBE audio data
@ -2056,19 +2047,18 @@ void CDMRSlot::insertSilence(unsigned int count)
if (n == 0U) { if (n == 0U) {
CSync::addDMRAudioSync(data + 2U, m_duplex); CSync::addDMRAudioSync(data + 2U, m_duplex);
} else { } else {
m_netEmbeddedLC.getData(data + 2U, 0U); unsigned char lcss = m_netEmbeddedLC.getData(data + 2U, n);
emb.setLCSS(lcss);
emb.getData(data + 2U); emb.getData(data + 2U);
} }
writeQueueNet(data); writeQueueNet(data);
m_netSeqNo = seqNo;
m_netN = n; m_netN = n;
m_netFrames++; m_netFrames++;
m_netLost++; m_netLost++;
seqNo++;
n = (n + 1U) % 6U; n = (n + 1U) % 6U;
} }
} }

1
DMRSlot.h
View file

@ -78,7 +78,6 @@ private:
CDMRLC* m_rfLC; CDMRLC* m_rfLC;
CDMRLC* m_netLC; CDMRLC* m_netLC;
unsigned char m_rfSeqNo; unsigned char m_rfSeqNo;
unsigned char m_netSeqNo;
unsigned char m_rfN; unsigned char m_rfN;
unsigned char m_netN; unsigned char m_netN;
CTimer m_networkWatchdog; CTimer m_networkWatchdog;

2
MMDVM.ini
View file

@ -131,7 +131,7 @@ Debug=0
Enable=1 Enable=1
Address=44.131.4.1 Address=44.131.4.1
Port=62031 Port=62031
Jitter=300 Jitter=360
# Local=62032 # Local=62032
Password=PASSWORD Password=PASSWORD
# Options= # Options=