ua1zbe
/
MMDVMHost
mirror of https://github.com/g4klx/MMDVMHost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixes.

This commit is contained in:
Jonathan Naylor 2016-04-19 08:06:36 +01:00
parent 38dc134982
commit 929877f3cf
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
AMBEFEC.cpp
View File

@ -20,6 +20,8 @@
#include "Hamming.h" #include "Hamming.h"
#include "AMBEFEC.h" #include "AMBEFEC.h"
#include "Log.h"
#include <cstdio> #include <cstdio>
#include <cassert> #include <cassert>
@ -630,14 +632,14 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
// //
// 7 voice bits 137 // 7 voice bits 137
// De-Whiten some bits // De-whiten some bits
unsigned int prn = 0x00U; unsigned int prn = 0x00U;
for (int i = 0U; i < 12U; i++) for (unsigned int i = 0U; i < 12U; i++)
prn = (prn << 1) | (temp[i] & 1); prn = (prn << 1) | (temp[i] ? 0x01U : 0x00U);
prn <<= 4; prn <<= 4;
for (unsigned int i = 23U; i < 137U; i++) { for (unsigned int i = 23U; i < 137U; i++) {
prn = (unsigned short)((173 * prn) + 13849); prn = (unsigned short)((173U * prn) + 13849U);
temp[i] ^= (prn >> 15) & 1; temp[i] ^= (prn & 0x80U) == 0x80U;
} }
// Check/Fix FEC // Check/Fix FEC
@ -705,11 +707,11 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
// Whiten some bits // Whiten some bits
prn = 0x00U; prn = 0x00U;
for (unsigned int i = 0U; i < 12U; i++) for (unsigned int i = 0U; i < 12U; i++)
prn = (prn << 1) | (temp[i] & 1); prn = (prn << 1) | (temp[i] ? 0x01U : 0x00U);
prn <<= 4; prn <<= 4;
for (unsigned int i = 23U; i < 137U; i++) { for (unsigned int i = 23U; i < 137U; i++) {
prn = (unsigned short)((173 * prn) + 13849); prn = (unsigned short)((173U * prn) + 13849U);
temp[i] ^= (prn >> 15) & 1; temp[i] ^= (prn & 0x80U) == 0x80U;
} }
// Interleave // Interleave