g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-06 06:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix of the DMRTA decoding for blocks comes in with random order

Browse source
This commit is contained in:
Shawn Chain 2018-12-09 17:24:11 +08:00
parent afdb36f7b6
commit 334307cd4a
3 changed files with 33 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

31
DMRTA.cpp
View file

@ -20,8 +20,7 @@
CDMRTA::CDMRTA() :
m_TA(),
m_buf(),
m_bufOffset(0)
m_buf()
{
}
@ -29,18 +28,37 @@ CDMRTA::~CDMRTA()
{
}
bool CDMRTA::add(const unsigned char* data, unsigned int len)
bool CDMRTA::add(unsigned int blockId, const unsigned char* data, unsigned int len)
{
assert(data != NULL);
if (m_bufOffset + len >= sizeof(m_buf)) {
unsigned int offset;
switch(blockId) {
case 0:
offset = 0;
break;
case 1:
offset = 6;
break;
case 2:
offset = 13;
break;
case 3:
offset = 20;
break;
default:
// invalid block id
reset();
return false;
}
if (offset + len >= sizeof(m_buf)) {
// buffer overflow
reset();
return false;
}
::memcpy(m_buf + m_bufOffset, data, len);
m_bufOffset += len;
::memcpy(m_buf + offset, data, len);
decodeTA();
return true;
@ -55,7 +73,6 @@ void CDMRTA::reset()
{
::memset(m_TA, 0, sizeof(m_TA));
::memset(m_buf, 0, sizeof(m_buf));
m_bufOffset = 0;
}
void CDMRTA::decodeTA()