KB8PMY
/
urfd
mirror of https://github.com/nostar/urfd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup of voice packets

Browse Source
unstable
Tom Early 4 years ago
parent 707486f47e
commit aa33b4ebf1
6 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File

31
reflector/DVFramePacket.cpp
Unescape View File

@ -20,9 +20,7 @@
#include <string.h>
#include "DVFramePacket.h"
////////////////////////////////////////////////////////////////////////////////////////
// constructor
// default constructor
CDvFramePacket::CDvFramePacket()
{
memset(m_TCPack.dstar, 0, 9);
@ -35,7 +33,6 @@ CDvFramePacket::CDvFramePacket()
};
// dstar constructor
CDvFramePacket::CDvFramePacket(const SDStarFrame *dvframe, uint16_t sid, uint8_t pid)
: CPacket(sid, pid)
{
@ -49,7 +46,6 @@ CDvFramePacket::CDvFramePacket(const SDStarFrame *dvframe, uint16_t sid, uint8_t
}
// dmr constructor
CDvFramePacket::CDvFramePacket(const uint8_t *ambe, const uint8_t *sync, uint16_t sid, uint8_t pid, uint8_t spid, bool islast)
: CPacket(sid, pid, spid, islast)
{
@ -63,7 +59,6 @@ CDvFramePacket::CDvFramePacket(const uint8_t *ambe, const uint8_t *sync, uint16_
}
// ysf constructor
CDvFramePacket::CDvFramePacket(const uint8_t *ambe, uint16_t sid, uint8_t pid, uint8_t spid, uint8_t fid, bool islast)
: CPacket(sid, pid, spid, fid, islast)
{
@ -76,12 +71,9 @@ CDvFramePacket::CDvFramePacket(const uint8_t *ambe, uint16_t sid, uint8_t pid, u
m_TCPack.codec_in = ECodecType::dmr;
}
// xlx constructor
// bm constructor
CDvFramePacket::CDvFramePacket
(uint16_t sid,
uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata,
uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, bool islast)
(uint16_t sid, uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata, uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, bool islast)
: CPacket(sid, dstarpid, dmrpid, dprspid, 0xFF, 0xFF, 0xFF, codecInType, islast)
{
::memcpy(m_TCPack.dstar, dstarambe, 9);
@ -91,22 +83,7 @@ CDvFramePacket::CDvFramePacket
m_TCPack.codec_in = codecInType;
}
// urf constructor
CDvFramePacket::CDvFramePacket
(uint16_t sid,
uint8_t dstarpid, const uint8_t *dstarambe, const uint8_t *dstardvdata,
uint8_t dmrpid, uint8_t dprspid, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType codecInType, const uint8_t *codec2, const uint8_t * nonce, bool islast)
: CPacket(sid, dstarpid, dmrpid, dprspid, 0xFF, 0xFF, 0xFF, codecInType, islast)
{
memcpy(m_TCPack.dstar, dstarambe, 9);
memcpy(m_uiDvData, dstardvdata, 3);
memcpy(m_TCPack.dmr, dmrambe, 9);
memcpy(m_uiDvSync, dmrsync, 7);
memcpy(m_TCPack.m17, codec2, 16);
memcpy(m_Nonce, nonce, 14);
m_TCPack.codec_in = codecInType;
}
// m17 constructor
CDvFramePacket::CDvFramePacket(const CM17Packet &m17) : CPacket(m17)
{

3
reflector/DVFramePacket.h
Unescape View File

@ -48,8 +48,7 @@ public:
CDvFramePacket(const uint8_t *ambe, uint16_t streamid, uint8_t counter1, uint8_t counter2, uint8_t counter3, bool islast);
// XLX Frame
CDvFramePacket(uint16_t streamid, uint8_t counter, const uint8_t *ambe, const uint8_t *dvdata, uint8_t counter1, uint8_t counter2, const uint8_t *ambe2, const uint8_t *dmrsync, ECodecType type, bool islast);
// URF Frame
CDvFramePacket(uint16_t streamid, uint8_t dstarcounter, const uint8_t *dstarambe, const uint8_t *dvdata, uint8_t dmrcounter1, uint8_t dmrcounter2, const uint8_t *dmrambe, const uint8_t *dmrsync, ECodecType type, const uint8_t *m17codec, const uint8_t *nonce, bool islast);
// M17 Frame
CDvFramePacket(const CM17Packet &m17);
// virtual duplication

13
reflector/Packet.cpp
Unescape View File

@ -19,11 +19,7 @@
#include "Main.h"
#include "Packet.h"
////////////////////////////////////////////////////////////////////////////////////////
// constructor
// default constructor
CPacket::CPacket()
{
m_uiStreamId = 0;
@ -41,7 +37,6 @@ CPacket::CPacket()
};
// dstar contrsuctor
CPacket::CPacket(uint16_t sid, uint8_t dstarpid)
{
m_uiStreamId = sid;
@ -59,7 +54,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dstarpid)
};
// dmr constructor
CPacket::CPacket(uint16_t sid, uint8_t dmrpid, uint8_t dmrspid, bool lastpacket)
{
m_uiStreamId = sid;
@ -77,7 +71,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dmrpid, uint8_t dmrspid, bool lastpacket)
};
// ysf constructor
CPacket::CPacket(uint16_t sid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffrid, bool lastpacket)
{
m_uiStreamId = sid;
@ -94,8 +87,7 @@ CPacket::CPacket(uint16_t sid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffri
m_bLastPacket = lastpacket;
}
// xlx constructor
// bm constructor
CPacket::CPacket(uint16_t sid, uint8_t dstarpid, uint8_t dmrpid, uint8_t dmrsubpid, uint8_t ysfpid, uint8_t ysfsubpid, uint8_t ysffrid, ECodecType codecIn, bool lastpacket)
{
m_uiStreamId = sid;
@ -113,7 +105,6 @@ CPacket::CPacket(uint16_t sid, uint8_t dstarpid, uint8_t dmrpid, uint8_t dmrsubp
}
// m17 constructor
CPacket::CPacket(const CM17Packet &m17) : CPacket()
{
m_uiStreamId = m17.GetStreamId();

2
reflector/Packet.h
Unescape View File

@ -20,7 +20,7 @@
// Origin Id
#include "Defines.h"
#include "TCPacketDef.h"
#include "M17Packet.h"
enum class EOrigin { local, peer };

4
reflector/Defines.h → reflector/TCPacketDef.h
Unescape View File

@ -18,12 +18,10 @@
#include <cstdint>
enum class ECodecType { none, dstar, dmr, c2_1600, c2_3200 };
enum class ECodecType : std::uint8_t { none = 0, dstar = 1, dmr = 2, c2_1600 = 3, c2_3200 = 4 };
using STCPacket = struct tcpacket_tag {
char module;
bool is_last_packet;
uint16_t streamid;
ECodecType codec_in;
uint8_t dstar[9];
uint8_t dmr[9];

2
reflector/UnixDgramSocket.h
Unescape View File

@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sys/un.h>
#include "Defines.h"
#include "TCPacketDef.h"
class CUnixDgramReader
{

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.