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

Do the correct AMBE regeneration for YSF V/D mode 1.

Browse Source
This commit is contained in:
Jonathan Naylor
2016-07-21 19:46:32 +01:00
parent 299f53b551
commit 6a755e9889
3 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
AMBEFEC.cpp
View File

@@ -596,6 +596,48 @@ unsigned int CAMBEFEC::regenerateDStar(unsigned char* bytes) const
return errors; return errors;
} }
unsigned int CAMBEFEC::regenerateYSF1(unsigned char* bytes) const
{
assert(bytes != NULL);
unsigned int a = 0U;
unsigned int b = 0U;
unsigned int c = 0U;
unsigned int MASK = 0x800000U;
for (unsigned int i = 0U; i < 24U; i++) {
unsigned int aPos = DMR_A_TABLE[i];
unsigned int bPos = DMR_B_TABLE[i];
unsigned int cPos = DMR_C_TABLE[i];
if (READ_BIT(bytes, aPos))
a |= MASK;
if (READ_BIT(bytes, bPos))
b |= MASK;
if (READ_BIT(bytes, cPos))
c |= MASK;
MASK >>= 1;
}
unsigned int errors = regenerate(a, b, c, true);
MASK = 0x800000U;
for (unsigned int i = 0U; i < 24U; i++) {
unsigned int aPos = DMR_A_TABLE[i];
unsigned int bPos = DMR_B_TABLE[i];
unsigned int cPos = DMR_C_TABLE[i];
WRITE_BIT(bytes, aPos, a & MASK);
WRITE_BIT(bytes, bPos, b & MASK);
WRITE_BIT(bytes, cPos, c & MASK);
MASK >>= 1;
}
return errors;
}
unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
{ {
assert(bytes != NULL); assert(bytes != NULL);

2
AMBEFEC.h
View File

@@ -28,6 +28,8 @@ public:
unsigned int regenerateDStar(unsigned char* bytes) const; unsigned int regenerateDStar(unsigned char* bytes) const;
unsigned int regenerateYSF1(unsigned char* bytes) const;
unsigned int regenerateYSF3(unsigned char* bytes) const; unsigned int regenerateYSF3(unsigned char* bytes) const;
private: private:

10
YSFPayload.cpp
View File

@@ -257,11 +257,11 @@ unsigned int CYSFPayload::processVDMode1Audio(unsigned char* data)
// Regenerate the AMBE FEC // Regenerate the AMBE FEC
unsigned int errors = 0U; unsigned int errors = 0U;
errors += m_fec.regenerateDMR(data + 9U); errors += m_fec.regenerateYSF1(data + 9U);
errors += m_fec.regenerateDMR(data + 27U); errors += m_fec.regenerateYSF1(data + 27U);
errors += m_fec.regenerateDMR(data + 45U); errors += m_fec.regenerateYSF1(data + 45U);
errors += m_fec.regenerateDMR(data + 63U); errors += m_fec.regenerateYSF1(data + 63U);
errors += m_fec.regenerateDMR(data + 81U); errors += m_fec.regenerateYSF1(data + 81U);
return errors; return errors;
} }