More rollback to original jitter buffer processing.

Add the DMR jitter buffer back in.
2019-11-04 13:48:13 +00:00 · 2019-11-03 22:17:51 +00:00
21 changed files with 467 additions and 130 deletions
--- a/DMRControl.cpp
+++ b/DMRControl.cpp
@ -21,7 +21,7 @@
 #include <cassert>
 #include <algorithm>

-CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, bool ovcm) :
+CDMRControl::CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, bool ovcm) :
 m_colorCode(colorCode),
 m_modem(modem),
 m_network(network),
@ -38,7 +38,7 @@ m_lookup(lookup)
 	// Load black and white lists to DMRAccessControl
 	CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id);

-	CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, jitter, ovcm);
+	CDMRSlot::init(colorCode, embeddedLCOnly, dumpTAData, callHang, modem, network, display, duplex, m_lookup, rssi, ovcm);
 }

 CDMRControl::~CDMRControl()
--- a/DMRControl.h
+++ b/DMRControl.h
@ -31,7 +31,7 @@

 class CDMRControl {
 public:
-	CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, unsigned int jitter, bool ovcm);
+	CDMRControl(unsigned int id, unsigned int colorCode, unsigned int callHang, bool selfOnly, bool embeddedLCOnly, bool dumpTAData, const std::vector<unsigned int>& prefixes, const std::vector<unsigned int>& blacklist, const std::vector<unsigned int>& whitelist, const std::vector<unsigned int>& slot1TGWhitelist, const std::vector<unsigned int>& slot2TGWhitelist, unsigned int timeout, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssi, bool ovcm);
 	~CDMRControl();

 	bool processWakeup(const unsigned char* data);
--- a/DMRData.cpp
+++ b/DMRData.cpp
@ -29,6 +29,7 @@ m_dstId(data.m_dstId),
 m_flco(data.m_flco),
 m_dataType(data.m_dataType),
 m_seqNo(data.m_seqNo),
+m_missing(data.m_missing),
 m_n(data.m_n),
 m_ber(data.m_ber),
 m_rssi(data.m_rssi)
@ -45,6 +46,7 @@ m_dstId(0U),
 m_flco(FLCO_GROUP),
 m_dataType(0U),
 m_seqNo(0U),
+m_missing(false),
 m_n(0U),
 m_ber(0U),
 m_rssi(0U)
@ -68,6 +70,7 @@ CDMRData& CDMRData::operator=(const CDMRData& data)
 		m_flco     = data.m_flco;
 		m_dataType = data.m_dataType;
 		m_seqNo    = data.m_seqNo;
+		m_missing  = data.m_missing;
 		m_n        = data.m_n;
 		m_ber      = data.m_ber;
 		m_rssi     = data.m_rssi;
@ -138,6 +141,16 @@ void CDMRData::setSeqNo(unsigned char seqNo)
 	m_seqNo = seqNo;
 }

+bool CDMRData::isMissing() const
+{
+	return m_missing;
+}
+
+void CDMRData::setMissing(bool missing)
+{
+	m_missing = missing;
+}
+
 unsigned char CDMRData::getN() const
 {
 	return m_n;
--- a/DMRData.h
+++ b/DMRData.h
@ -45,6 +45,9 @@ public:
 	unsigned char getDataType() const;
 	void setDataType(unsigned char dataType);

+	bool isMissing() const;
+	void setMissing(bool missing);
+
 	unsigned char getBER() const;
 	void setBER(unsigned char ber);

@ -62,6 +65,7 @@ private:
 	FLCO           m_flco;
 	unsigned char  m_dataType;
 	unsigned char  m_seqNo;
+	bool           m_missing;
 	unsigned char  m_n;
 	unsigned char  m_ber;
 	unsigned char  m_rssi;
--- a/DMRNetwork.cpp
+++ b/DMRNetwork.cpp
@ -33,7 +33,7 @@ const unsigned int BUFFER_LENGTH = 500U;
 const unsigned int HOMEBREW_DATA_PACKET_LENGTH = 55U;


-CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType) :
+CDMRNetwork::CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType, unsigned int jitter) :
 m_addressStr(address),
 m_address(),
 m_port(port),
@ -46,6 +46,7 @@ m_socket(local),
 m_enabled(false),
 m_slot1(slot1),
 m_slot2(slot2),
+m_jitterBuffers(NULL),
 m_hwType(hwType),
 m_status(WAITING_CONNECT),
 m_retryTimer(1000U, 10U),
@ -53,7 +54,6 @@ m_timeoutTimer(1000U, 60U),
 m_buffer(NULL),
 m_salt(NULL),
 m_streamId(NULL),
-m_rxData(1000U, "DMR Network"),
 m_options(),
 m_callsign(),
 m_rxFrequency(0U),
@ -72,13 +72,19 @@ m_beacon(false)
 	assert(port > 0U);
 	assert(id > 1000U);
 	assert(!password.empty());
+	assert(jitter > 0U);

 	m_address = CUDPSocket::lookup(address);

-	m_buffer   = new unsigned char[BUFFER_LENGTH];
-	m_salt     = new unsigned char[sizeof(uint32_t)];
-	m_id       = new uint8_t[4U];
-	m_streamId = new uint32_t[2U];
+	m_buffer        = new unsigned char[BUFFER_LENGTH];
+	m_salt          = new unsigned char[sizeof(uint32_t)];
+	m_id            = new uint8_t[4U];
+	m_streamId      = new uint32_t[2U];
+
+	m_jitterBuffers = new CJitterBuffer*[3U];
+
+	m_jitterBuffers[1U] = new CJitterBuffer("DMR Slot 1", 60U, DMR_SLOT_TIME, jitter, 256U, debug);
+	m_jitterBuffers[2U] = new CJitterBuffer("DMR Slot 2", 60U, DMR_SLOT_TIME, jitter, 256U, debug);

 	m_id[0U] = id >> 24;
 	m_id[1U] = id >> 16;
@ -94,10 +100,15 @@ m_beacon(false)

 CDMRNetwork::~CDMRNetwork()
 {
+	delete m_jitterBuffers[1U];
+	delete m_jitterBuffers[2U];
+
 	delete[] m_buffer;
 	delete[] m_salt;
 	delete[] m_streamId;
 	delete[] m_id;
+
+	delete[] m_jitterBuffers;
 }

 void CDMRNetwork::setOptions(const std::string& options)
@ -136,9 +147,6 @@ bool CDMRNetwork::open()

 void CDMRNetwork::enable(bool enabled)
 {
-	if (!enabled && m_enabled)
-		m_rxData.clear();
-
 	m_enabled = enabled;
 }

@ -147,63 +155,52 @@ bool CDMRNetwork::read(CDMRData& data)
 	if (m_status != RUNNING)
 		return false;

-	if (m_rxData.isEmpty())
-		return false;
+	for (unsigned int slotNo = 1U; slotNo <= 2U; slotNo++) {
+		unsigned int length = 0U;
+		B_STATUS status = BS_NO_DATA;

-	unsigned char length = 0U;
-	m_rxData.getData(&length, 1U);
-	m_rxData.getData(m_buffer, length);
+		status = m_jitterBuffers[slotNo]->getData(m_buffer, length);

-	// Is this a data packet?
-	if (::memcmp(m_buffer, "DMRD", 4U) != 0)
-		return false;
+		if (status != BS_NO_DATA) {
+			unsigned char seqNo = m_buffer[4U];

-	unsigned char seqNo = m_buffer[4U];
+			unsigned int srcId = (m_buffer[5U] << 16) | (m_buffer[6U] << 8) | (m_buffer[7U] << 0);

-	unsigned int srcId = (m_buffer[5U] << 16) | (m_buffer[6U] << 8) | (m_buffer[7U] << 0);
+			unsigned int dstId = (m_buffer[8U] << 16) | (m_buffer[9U] << 8) | (m_buffer[10U] << 0);

-	unsigned int dstId = (m_buffer[8U] << 16) | (m_buffer[9U] << 8) | (m_buffer[10U] << 0);
+			FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO_USER_USER : FLCO_GROUP;

-	unsigned int slotNo = (m_buffer[15U] & 0x80U) == 0x80U ? 2U : 1U;
+			data.setSeqNo(seqNo);
+			data.setSlotNo(slotNo);
+			data.setSrcId(srcId);
+			data.setDstId(dstId);
+			data.setFLCO(flco);
+			data.setMissing(status == BS_MISSING);

-	// DMO mode slot disabling
-	if (slotNo == 1U && !m_duplex)
-		return false;
+			bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U;
+			bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U;

-	// Individual slot disabling
-	if (slotNo == 1U && !m_slot1)
-		return false;
-	if (slotNo == 2U && !m_slot2)
-		return false;
+			if (dataSync) {
+				unsigned char dataType = m_buffer[15U] & 0x0FU;
+				data.setData(m_buffer + 20U);
+				data.setDataType(dataType);
+				data.setN(0U);
+			} else if (voiceSync) {
+				data.setData(m_buffer + 20U);
+				data.setDataType(DT_VOICE_SYNC);
+				data.setN(0U);
+			} else {
+				unsigned char n = m_buffer[15U] & 0x0FU;
+				data.setData(m_buffer + 20U);
+				data.setDataType(DT_VOICE);
+				data.setN(n);
+			}

-	FLCO flco = (m_buffer[15U] & 0x40U) == 0x40U ? FLCO_USER_USER : FLCO_GROUP;
-
-	data.setSeqNo(seqNo);
-	data.setSlotNo(slotNo);
-	data.setSrcId(srcId);
-	data.setDstId(dstId);
-	data.setFLCO(flco);
-
-	bool dataSync = (m_buffer[15U] & 0x20U) == 0x20U;
-	bool voiceSync = (m_buffer[15U] & 0x10U) == 0x10U;
-
-	if (dataSync) {
-		unsigned char dataType = m_buffer[15U] & 0x0FU;
-		data.setData(m_buffer + 20U);
-		data.setDataType(dataType);
-		data.setN(0U);
-	} else if (voiceSync) {
-		data.setData(m_buffer + 20U);
-		data.setDataType(DT_VOICE_SYNC);
-		data.setN(0U);
-	} else {
-		unsigned char n = m_buffer[15U] & 0x0FU;
-		data.setData(m_buffer + 20U);
-		data.setDataType(DT_VOICE);
-		data.setN(n);
+			return true;
+		}
 	}

-	return true;
+	return false;
 }

 bool CDMRNetwork::write(const CDMRData& data)
@ -254,15 +251,8 @@ bool CDMRNetwork::write(const CDMRData& data)
 	} else if (dataType == DT_VOICE) {
 		buffer[15U] |= data.getN();
 	} else {
-		if (dataType == DT_VOICE_LC_HEADER) {
-			m_streamId[slotIndex] = ::rand() + 1U;
+		if (dataType == DT_VOICE_LC_HEADER)
 			count = 2U;
-		}
-
-		if (dataType == DT_CSBK || dataType == DT_DATA_HEADER) {
-			m_streamId[slotIndex] = ::rand() + 1U;
-			count = 1U;
-		}

 		buffer[15U] |= (0x20U | dataType);
 	}
@ -365,6 +355,9 @@ void CDMRNetwork::close()

 void CDMRNetwork::clock(unsigned int ms)
 {
+	m_jitterBuffers[1U]->clock(ms);
+	m_jitterBuffers[2U]->clock(ms);
+
 	if (m_status == WAITING_CONNECT) {
 		m_retryTimer.clock(ms);
 		if (m_retryTimer.isRunning() && m_retryTimer.hasExpired()) {
@ -402,10 +395,7 @@ void CDMRNetwork::clock(unsigned int ms)
 			if (m_enabled) {
 				if (m_debug)
 					CUtils::dump(1U, "Network Received", m_buffer, length);
-
-				unsigned char len = length;
-				m_rxData.addData(&len, 1U);
-				m_rxData.addData(m_buffer, len);
+				receiveData(m_buffer, length);
 			}
 		} else if (::memcmp(m_buffer, "MSTNAK",  6U) == 0) {
 			if (m_status == RUNNING) {
@ -506,6 +496,51 @@ void CDMRNetwork::clock(unsigned int ms)
 	}
 }

+void CDMRNetwork::reset(unsigned int slotNo)
+{
+	assert(slotNo == 1U || slotNo == 2U);
+
+	if (slotNo == 1U) {
+		m_jitterBuffers[1U]->reset();
+		m_streamId[0U] = ::rand() + 1U;
+	} else {
+		m_jitterBuffers[2U]->reset();
+		m_streamId[1U] = ::rand() + 1U;
+	}
+}
+
+void CDMRNetwork::receiveData(const unsigned char* data, unsigned int length)
+{
+	assert(data != NULL);
+	assert(length > 0U);
+
+	unsigned int slotNo = (data[15U] & 0x80U) == 0x80U ? 2U : 1U;
+
+	// DMO mode slot disabling
+	if (slotNo == 1U && !m_duplex)
+		return;
+
+	// Individual slot disabling
+	if (slotNo == 1U && !m_slot1)
+		return;
+	if (slotNo == 2U && !m_slot2)
+		return;
+
+	unsigned char dataType = data[15U] & 0x3FU;
+	if (dataType == (0x20U | DT_CSBK) ||
+		dataType == (0x20U | DT_DATA_HEADER) ||
+		dataType == (0x20U | DT_RATE_1_DATA) ||
+		dataType == (0x20U | DT_RATE_34_DATA) ||
+		dataType == (0x20U | DT_RATE_12_DATA)) {
+		// Data & CSBK frames
+		m_jitterBuffers[slotNo]->appendData(data, length);
+	} else {
+		// Voice frames
+		unsigned char seqNo = data[4U];
+		m_jitterBuffers[slotNo]->addData(data, length, seqNo);
+	}
+}
+
 bool CDMRNetwork::writeLogin()
 {
 	unsigned char buffer[8U];
--- a/DMRNetwork.h
+++ b/DMRNetwork.h
@ -19,9 +19,9 @@
 #if !defined(DMRNetwork_H)
 #define	DMRNetwork_H

+#include "JitterBuffer.h"
 #include "UDPSocket.h"
 #include "Timer.h"
-#include "RingBuffer.h"
 #include "DMRData.h"
 #include "Defines.h"

@ -31,7 +31,7 @@
 class CDMRNetwork
 {
 public:
-	CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType);
+	CDMRNetwork(const std::string& address, unsigned int port, unsigned int local, unsigned int id, const std::string& password, bool duplex, const char* version, bool debug, bool slot1, bool slot2, HW_TYPE hwType, unsigned int jitter);
 	~CDMRNetwork();

 	void setOptions(const std::string& options);
@ -56,9 +56,11 @@ public:

 	void clock(unsigned int ms);

+	void reset(unsigned int slotNo);
+
 	void close();

-private: 
+private:
 	std::string     m_addressStr;
 	in_addr         m_address;
 	unsigned int    m_port;
@ -71,6 +73,7 @@ private:
 	bool            m_enabled;
 	bool            m_slot1;
 	bool            m_slot2;
+	CJitterBuffer** m_jitterBuffers;
 	HW_TYPE         m_hwType;

 	enum STATUS {
@ -89,8 +92,6 @@ private:
 	unsigned char* m_salt;
 	uint32_t*      m_streamId;

-	CRingBuffer<unsigned char> m_rxData;
-
 	std::string    m_options;

 	std::string    m_callsign;
@ -114,6 +115,8 @@ private:
 	bool writePing();

 	bool write(const unsigned char* data, unsigned int length);
+
+	void receiveData(const unsigned char* data, unsigned int length);
 };

 #endif
--- a/DMRSlot.cpp
+++ b/DMRSlot.cpp
@ -47,9 +47,6 @@ bool           CDMRSlot::m_ovcm = true;

 CRSSIInterpolator* CDMRSlot::m_rssiMapper = NULL;

-unsigned int   CDMRSlot::m_jitterTime  = 360U;
-unsigned int   CDMRSlot::m_jitterSlots = 6U;
-
 unsigned char* CDMRSlot::m_idle = NULL;

 FLCO           CDMRSlot::m_flco1;
@ -96,7 +93,6 @@ m_netN(0U),
 m_networkWatchdog(1000U, 0U, 1500U),
 m_rfTimeoutTimer(1000U, timeout),
 m_netTimeoutTimer(1000U, timeout),
-m_packetTimer(1000U, 0U, 50U),
 m_interval(),
 m_elapsed(),
 m_rfFrames(0U),
@ -936,6 +932,9 @@ void CDMRSlot::writeEndRF(bool writeEnd)
 		}
 	}

+	if (m_network != NULL)
+		m_network->reset(m_slotNo);
+
 	m_rfTimeoutTimer.stop();
 	m_rfTimeout = false;

@ -986,9 +985,11 @@ void CDMRSlot::writeEndNet(bool writeEnd)
 		}
 	}

+	if (m_network != NULL)
+		m_network->reset(m_slotNo);
+
 	m_networkWatchdog.stop();
 	m_netTimeoutTimer.stop();
-	m_packetTimer.stop();
 	m_netTimeout = false;

 	m_netFrames = 0U;
@ -1084,9 +1085,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 			m_modem->writeDMRAbort(m_slotNo);
 		}

-		for (unsigned int i = 0U; i < m_jitterSlots; i++)
-			writeQueueNet(m_idle);
-
 		if (m_duplex) {
 			for (unsigned int i = 0U; i < NO_HEADERS_DUPLEX; i++)
 				writeQueueNet(data);
@ -1129,9 +1127,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 				m_modem->writeDMRAbort(m_slotNo);
 			}

-			for (unsigned int i = 0U; i < m_jitterSlots; i++)
-				writeQueueNet(m_idle);
-
 			// Create a dummy start frame
 			unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];

@ -1320,9 +1315,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 				m_modem->writeDMRAbort(m_slotNo);
 			}

-			for (unsigned int i = 0U; i < m_jitterSlots; i++)
-				writeQueueNet(m_idle);
-
 			// Create a dummy start frame
 			unsigned char start[DMR_FRAME_LENGTH_BYTES + 2U];

@ -1401,7 +1393,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)

 			m_netEmbeddedData[m_netEmbeddedWriteN].reset();

-			m_packetTimer.start();
 			m_elapsed.start();

 			m_netFrames++;
@ -1548,7 +1539,6 @@ void CDMRSlot::writeNetwork(const CDMRData& dmrData)
 				writeQueueNet(data);
 		}

-		m_packetTimer.start();
 		m_elapsed.start();

 		m_netFrames++;
@ -1787,21 +1777,6 @@ void CDMRSlot::clock()
 			}
 		}
 	}
-
-	if (m_netState == RS_NET_AUDIO) {
-		m_packetTimer.clock(ms);
-
-		if (m_packetTimer.isRunning() && m_packetTimer.hasExpired()) {
-			unsigned int elapsed = m_elapsed.elapsed();
-			if (elapsed >= m_jitterTime) {
-				LogDebug("DMR Slot %u, lost audio for %ums filling in", m_slotNo, elapsed);
-				insertSilence(m_jitterSlots);
-				m_elapsed.start();
-			}
-
-			m_packetTimer.start();
-		}
-	}
 }

 void CDMRSlot::writeQueueRF(const unsigned char *data)
@ -1875,7 +1850,7 @@ void CDMRSlot::writeQueueNet(const unsigned char *data)
 	m_queue.addData(data, len);
 }

-void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, bool ovcm)
+void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, bool ovcm)
 {
 	assert(modem != NULL);
 	assert(display != NULL);
@ -1895,11 +1870,6 @@ void CDMRSlot::init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData

 	m_rssiMapper     = rssiMapper;

-	m_jitterTime     = jitter;
-	
-	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];
 	::memcpy(m_idle, DMR_IDLE_DATA, DMR_FRAME_LENGTH_BYTES + 2U);

@ -2155,7 +2125,6 @@ void CDMRSlot::enable(bool enabled)

 		m_networkWatchdog.stop();
 		m_netTimeoutTimer.stop();
-		m_packetTimer.stop();
 		m_netTimeout = false;

 		m_netFrames = 0U;
--- a/DMRSlot.h
+++ b/DMRSlot.h
@ -62,7 +62,7 @@ public:

 	void enable(bool enabled);

-	static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, unsigned int jitter, bool ovcm);
+	static void init(unsigned int colorCode, bool embeddedLCOnly, bool dumpTAData, unsigned int callHang, CModem* modem, CDMRNetwork* network, CDisplay* display, bool duplex, CDMRLookup* lookup, CRSSIInterpolator* rssiMapper, bool ovcm);

 private:
 	unsigned int               m_slotNo;
@ -89,7 +89,6 @@ private:
 	CTimer                     m_networkWatchdog;
 	CTimer                     m_rfTimeoutTimer;
 	CTimer                     m_netTimeoutTimer;
-	CTimer                     m_packetTimer;
 	CStopWatch                 m_interval;
 	CStopWatch                 m_elapsed;
 	unsigned int               m_rfFrames;
@ -127,9 +126,6 @@ private:

 	static CRSSIInterpolator*  m_rssiMapper;

-	static unsigned int        m_jitterTime;
-	static unsigned int        m_jitterSlots;
-
 	static unsigned char*      m_idle;

    static FLCO                m_flco1;
--- a/Defines.h
+++ b/Defines.h
@ -64,4 +64,10 @@ enum RPT_NET_STATE {
 	RS_NET_DATA
 };

+enum B_STATUS {
+	BS_NO_DATA,
+	BS_DATA,
+	BS_MISSING
+};
+
 #endif
--- a/JitterBuffer.cpp
+++ b/JitterBuffer.cpp
@ -0,0 +1,236 @@
+/*
+*   Copyright (C) 2017,2018 by Jonathan Naylor G4KLX
+*
+*   This program is free software; you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation; either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software
+*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "JitterBuffer.h"
+
+#include "Log.h"
+
+#include <cstdio>
+#include <cassert>
+#include <cstring>
+
+CJitterBuffer::CJitterBuffer(const std::string& name, unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber, bool debug) :
+m_name(name),
+m_blockSize(blockSize),
+m_blockTime(blockTime),
+m_topSequenceNumber(topSequenceNumber),
+m_debug(debug),
+m_blockCount(0U),
+m_timer(1000U, 0U, jitterTime),
+m_stopWatch(),
+m_running(false),
+m_buffer(NULL),
+m_headSequenceNumber(0U),
+m_appendSequenceNumber(0U),
+m_lastData(NULL),
+m_lastDataLength(0U)
+{
+	assert(blockSize > 0U);
+	assert(blockTime > 0U);
+	assert(jitterTime > 0U);
+	assert(topSequenceNumber > 0U);
+
+	m_blockCount = topSequenceNumber / 2U;
+	
+	m_buffer = new JitterEntry[m_blockCount];
+
+	for (unsigned int i = 0U; i < m_blockCount; i++)
+		m_buffer[i].m_data = new unsigned char[m_blockSize];
+
+	m_lastData = new unsigned char[m_blockSize];
+
+	reset();
+}
+
+CJitterBuffer::~CJitterBuffer()
+{
+	for (unsigned int i = 0U; i < m_blockCount; i++)
+		delete[] m_buffer[i].m_data;
+
+	delete[] m_buffer;
+	delete[] m_lastData;
+}
+
+bool CJitterBuffer::addData(const unsigned char* data, unsigned int length, unsigned int sequenceNumber)
+{
+	assert(data != NULL);
+	assert(length > 0U);
+	assert(length <= m_blockSize);
+
+	unsigned int headSequenceNumber =  m_headSequenceNumber % m_topSequenceNumber;
+	unsigned int tailSequenceNumber = (m_headSequenceNumber + m_blockCount) % m_topSequenceNumber;
+
+	// Is the data out of sequence?
+	if (headSequenceNumber < tailSequenceNumber) {
+		if (sequenceNumber < headSequenceNumber || sequenceNumber >= tailSequenceNumber) {
+			LogDebug("%s, JitterBuffer: rejecting frame with seqNo=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+			return false;
+		}
+	} else {
+		if (sequenceNumber >= tailSequenceNumber && sequenceNumber < headSequenceNumber) {
+			LogDebug("%s, JitterBuffer: rejecting frame with seqNo=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), sequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+			return false;
+		}
+	}
+
+	unsigned int number;
+	if (sequenceNumber >= headSequenceNumber)
+		number = sequenceNumber - headSequenceNumber;
+	else
+		number = (sequenceNumber + m_blockCount) - headSequenceNumber;;
+
+	unsigned int index = (m_headSequenceNumber + number) % m_blockCount;
+
+	// Do we already have the data?
+	if (m_buffer[index].m_length > 0U) {
+		LogDebug("%s, JitterBuffer: rejecting duplicate frame with seqNo=%u, pos=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), sequenceNumber, index, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+		return false;
+	}
+
+	if (m_debug)
+		LogDebug("%s, JitterBuffer: adding frame with seqNo=%u, pos=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), sequenceNumber, index, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+
+	::memcpy(m_buffer[index].m_data, data, length);
+	m_buffer[index].m_length = length;
+
+	if (!m_timer.isRunning()) {
+		LogDebug("%s, JitterBuffer: starting the timer", m_name.c_str());
+		m_timer.start();
+	}
+	
+	return true;
+}
+
+bool CJitterBuffer::appendData(const unsigned char* data, unsigned int length)
+{
+	assert(data != NULL);
+	assert(length > 0U);
+	assert(length <= m_blockSize);
+
+	unsigned int headSequenceNumber = m_headSequenceNumber % m_topSequenceNumber;
+	unsigned int tailSequenceNumber = (m_headSequenceNumber + m_blockCount) % m_topSequenceNumber;
+
+	// Is the data out of sequence?
+	if (headSequenceNumber < tailSequenceNumber) {
+		if (m_appendSequenceNumber < headSequenceNumber || m_appendSequenceNumber >= tailSequenceNumber) {
+			LogDebug("%s, JitterBuffer: rejecting append frame with seqNo=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), m_appendSequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+			return false;
+		}
+	} else {
+		if (m_appendSequenceNumber >= tailSequenceNumber && m_appendSequenceNumber < headSequenceNumber) {
+			LogDebug("%s, JitterBuffer: rejecting append frame with seqNo=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), m_appendSequenceNumber, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+			return false;
+		}
+	}
+
+	unsigned int number;
+	if (m_appendSequenceNumber >= headSequenceNumber)
+		number = m_appendSequenceNumber - headSequenceNumber;
+	else
+		number = (m_appendSequenceNumber + m_blockCount) - headSequenceNumber;;
+
+	unsigned int index = (m_headSequenceNumber + number) % m_blockCount;
+
+	if (m_debug)
+		LogDebug("%s, JitterBuffer: appending frame with seqNo=%u, pos=%u, raw=%u, head=%u, tail=%u", m_name.c_str(), m_appendSequenceNumber, index, m_headSequenceNumber, headSequenceNumber, tailSequenceNumber);
+
+	::memcpy(m_buffer[index].m_data, data, length);
+	m_buffer[index].m_length = length;
+
+	if (!m_timer.isRunning()) {
+		LogDebug("%s, JitterBuffer: starting the timer from append", m_name.c_str());
+		m_timer.start();
+	}
+
+	m_appendSequenceNumber++;
+
+	return true;
+}
+
+B_STATUS CJitterBuffer::getData(unsigned char* data, unsigned int& length)
+{
+	assert(data != NULL);
+
+	if (!m_running)
+		return BS_NO_DATA;
+
+	unsigned int sequenceNumber = m_stopWatch.elapsed() / m_blockTime + 2U;
+	if (m_headSequenceNumber > sequenceNumber)
+		return BS_NO_DATA;
+	
+	unsigned int head = m_headSequenceNumber % m_blockCount;
+
+	m_headSequenceNumber++;
+
+	if (m_buffer[head].m_length > 0U) {
+		if (m_debug)
+			LogDebug("%s, JitterBuffer: returning data, elapsed=%ums, raw=%u, head=%u", m_name.c_str(), m_stopWatch.elapsed(), m_headSequenceNumber - 1U, head);
+
+		::memcpy(data, m_buffer[head].m_data, m_buffer[head].m_length);
+		length = m_buffer[head].m_length;
+
+		// Save this data in case no more data is available next time
+		::memcpy(m_lastData, m_buffer[head].m_data, m_buffer[head].m_length);
+		m_lastDataLength = m_buffer[head].m_length;
+
+		m_buffer[head].m_length = 0U;
+
+		return BS_DATA;
+	}
+
+	m_buffer[head].m_length = 0U;
+
+	LogDebug("%s, JitterBuffer: no data available, elapsed=%ums, raw=%u, head=%u", m_name.c_str(), m_stopWatch.elapsed(), m_headSequenceNumber - 1U, head);
+
+	// Return the last data frame if we have it
+	if (m_lastDataLength > 0U) {
+		LogDebug("%s, JitterBuffer: returning the last received frame", m_name.c_str());
+		::memcpy(data, m_lastData, m_lastDataLength);
+		length = m_lastDataLength;
+
+		return BS_MISSING;
+	}
+
+	return BS_NO_DATA;
+}
+
+void CJitterBuffer::reset()
+{
+	for (unsigned int i = 0U; i < m_blockCount; i++)
+		m_buffer[i].m_length = 0U;
+
+	m_headSequenceNumber = 0U;
+	m_appendSequenceNumber = 0U;
+
+	m_lastDataLength = 0U;
+	
+	m_timer.stop();
+
+	m_running = false;
+}
+
+void CJitterBuffer::clock(unsigned int ms)
+{
+	m_timer.clock(ms);
+	if (m_timer.isRunning() && m_timer.hasExpired()) {
+		if (!m_running) {
+			m_stopWatch.start();
+			m_running = true;
+		}
+	}
+}
--- a/JitterBuffer.h
+++ b/JitterBuffer.h
@ -0,0 +1,68 @@
+/*
+*   Copyright (C) 2017,2018 by Jonathan Naylor G4KLX
+*
+*   This program is free software; you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation; either version 2 of the License, or
+*   (at your option) any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software
+*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#if !defined(JITTERBUFFER_H)
+#define	JITTERBUFFER_H
+
+#include "StopWatch.h"
+#include "Defines.h"
+#include "Timer.h"
+
+#include <string>
+
+class CJitterBuffer {
+public:
+	CJitterBuffer(const std::string& name, unsigned int blockSize, unsigned int blockTime, unsigned int jitterTime, unsigned int topSequenceNumber, bool debug);
+	~CJitterBuffer();
+
+	bool addData(const unsigned char* data, unsigned int length, unsigned int sequenceNumber);
+	bool appendData(const unsigned char* data, unsigned int length);
+
+	B_STATUS getData(unsigned char* data, unsigned int& length);
+	
+	void reset();
+	
+	void clock(unsigned int ms);
+	
+private:
+	std::string  m_name;
+	unsigned int m_blockSize;
+	unsigned int m_blockTime;
+	unsigned int m_topSequenceNumber;
+	bool         m_debug;
+	unsigned int m_blockCount;
+	CTimer       m_timer;
+	CStopWatch   m_stopWatch;
+	bool         m_running;
+
+	struct JitterEntry
+	{
+		unsigned char* m_data;
+		unsigned int   m_length;
+	};
+
+	JitterEntry* m_buffer;
+	unsigned int m_headSequenceNumber;
+
+	unsigned int m_appendSequenceNumber;
+
+	unsigned char* m_lastData;
+	unsigned int   m_lastDataLength;
+};
+
+#endif
--- a/MMDVMHost.cpp
+++ b/MMDVMHost.cpp
@ -441,7 +441,6 @@ int CMMDVMHost::run()
 		std::vector<unsigned int> slot2TGWhiteList = m_conf.getDMRSlot2TGWhiteList();
 		unsigned int callHang       = m_conf.getDMRCallHang();
 		unsigned int txHang         = m_conf.getDMRTXHang();
-		unsigned int jitter         = m_conf.getDMRNetworkJitter();
 		m_dmrRFModeHang             = m_conf.getDMRModeHang();
 		bool dmrBeacons             = m_conf.getDMRBeacons();
 		bool ovcm                   = m_conf.getDMROVCM();
@ -492,7 +491,7 @@ int CMMDVMHost::run()
 			dmrBeaconIntervalTimer.start();
 		}

-		m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, jitter, ovcm);
+		m_dmr = new CDMRControl(id, colorCode, callHang, selfOnly, embeddedLCOnly, dumpTAData, prefixes, blackList, whiteList, slot1TGWhiteList, slot2TGWhiteList, m_timeout, m_modem, m_dmrNetwork, m_display, m_duplex, m_dmrLookup, rssi, ovcm);

 		m_dmrTXTimer.setTimeout(txHang);
 	}
@ -1218,7 +1217,7 @@ bool CMMDVMHost::createDMRNetwork()
 	LogInfo("    Slot 2: %s", slot2 ? "enabled" : "disabled");
 	LogInfo("    Mode Hang: %us", m_dmrNetModeHang);

-	m_dmrNetwork = new CDMRNetwork(address, port, local, id, password, m_duplex, VERSION, debug, slot1, slot2, hwType);
+	m_dmrNetwork = new CDMRNetwork(address, port, local, id, password, m_duplex, VERSION, debug, slot1, slot2, hwType, jitter);

 	std::string options = m_conf.getDMRNetworkOptions();
 	if (!options.empty()) {
--- a/MMDVMHost.vcxproj
+++ b/MMDVMHost.vcxproj
@ -186,6 +186,7 @@
    <ClInclude Include="Hamming.h" />
    <ClInclude Include="DMRLookup.h" />
    <ClInclude Include="I2CController.h" />
+    <ClInclude Include="JitterBuffer.h" />
    <ClInclude Include="LCDproc.h" />
    <ClInclude Include="Log.h" />
    <ClInclude Include="MMDVMHost.h" />
@ -278,6 +279,7 @@
    <ClCompile Include="Golay24128.cpp" />
    <ClCompile Include="Hamming.cpp" />
    <ClCompile Include="I2CController.cpp" />
+    <ClCompile Include="JitterBuffer.cpp" />
    <ClCompile Include="LCDproc.cpp" />
    <ClCompile Include="Log.cpp" />
    <ClCompile Include="MMDVMHost.cpp" />
@ -335,4 +337,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/MMDVMHost.vcxproj.filters
+++ b/MMDVMHost.vcxproj.filters
@ -50,6 +50,9 @@
    <ClInclude Include="Hamming.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="JitterBuffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
    <ClInclude Include="Log.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@ -322,6 +325,9 @@
    <ClCompile Include="Hamming.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="JitterBuffer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="Log.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@ -545,4 +551,4 @@
      <Filter>Source Files</Filter>
    </ClCompile>
  </ItemGroup>
-</Project>
+</Project>
--- a/2
+++ b/2
@ -9,7 +9,7 @@ LDFLAGS = -g
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o \
 		NXDNLookup.o NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o \
 		POCSAGControl.o POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o \
--- a/Makefile.Pi
+++ b/Makefile.Pi
@ -9,7 +9,7 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \
 		NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \
 		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o \
--- a/Makefile.Pi.Adafruit
+++ b/Makefile.Pi.Adafruit
@ -10,7 +10,7 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \
 		NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \
 		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
--- a/Makefile.Pi.HD44780
+++ b/Makefile.Pi.HD44780
@ -9,7 +9,7 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \
 		NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \
 		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
--- a/Makefile.Pi.OLED
+++ b/Makefile.Pi.OLED
@ -9,7 +9,7 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o I2CController.o JitterBuffer.o OLED.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \
 		NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \
 		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
--- a/Makefile.Pi.PCF8574
+++ b/Makefile.Pi.PCF8574
@ -10,7 +10,7 @@ LDFLAGS = -g -L/usr/local/lib
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o HD44780.o I2CController.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o \
 		NetworkInfo.o Nextion.o NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o \
 		NXDNNetwork.o NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o \
 		POCSAGNetwork.o QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o \
--- a/Makefile.Solaris
+++ b/Makefile.Solaris
@ -9,7 +9,7 @@ LDFLAGS = -g
 OBJECTS = \
 		AMBEFEC.o BCH.o BPTC19696.o CASTInfo.o Conf.o CRC.o Display.o DMRControl.o DMRCSBK.o DMRData.o DMRDataHeader.o DMREMB.o DMREmbeddedData.o DMRFullLC.o \
 		DMRLookup.o DMRLC.o DMRNetwork.o DMRShortLC.o DMRSlot.o DMRSlotType.o DMRAccessControl.o DMRTA.o DMRTrellis.o DStarControl.o DStarHeader.o DStarNetwork.o \
-		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o \
+		DStarSlowData.o Golay2087.o Golay24128.o Hamming.o JitterBuffer.o LCDproc.o Log.o MMDVMHost.o MobileGPS.o Modem.o ModemSerialPort.o Mutex.o NetworkInfo.o Nextion.o \
 		NullDisplay.o NullModem.o NXDNAudio.o NXDNControl.o NXDNConvolution.o NXDNCRC.o NXDNFACCH1.o NXDNLayer3.o NXDNLICH.o NXDNLookup.o NXDNNetwork.o \
 		NXDNSACCH.o NXDNUDCH.o P25Audio.o P25Control.o P25Data.o P25LowSpeedData.o P25Network.o P25NID.o P25Trellis.o P25Utils.o POCSAGControl.o POCSAGNetwork.o \
 		QR1676.o RemoteControl.o RS129.o RS241213.o RSSIInterpolator.o SerialController.o SerialPort.o SHA256.o StopWatch.o Sync.o TFTSerial.o Thread.o Timer.o UDPSocket.o \
Author	SHA1	Message	Date
Jonathan Naylor	d0c3d1ecfb	More rollback to original jitter buffer processing.	2019-11-04 13:48:13 +00:00
Jonathan Naylor	1e7f99127f	Add the DMR jitter buffer back in.	2019-11-03 22:17:51 +00:00