Revert "Off by one bug in the YSF VW mode FEC regeneration."

This reverts commit ec7017147f.
This commit is contained in:
Jonathan Naylor
2016-05-12 17:37:01 +01:00
parent fe4abef34f
commit 2701506c44

View File

@@ -645,7 +645,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c0data = CGolay24128::decode23127(g1); unsigned int c0data = CGolay24128::decode23127(g1);
unsigned int g2 = CGolay24128::encode23127(c0data); unsigned int g2 = CGolay24128::encode23127(c0data);
for (int i = 22; i >= 0; i--) { for (int i = 23; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -670,7 +670,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c1data = CGolay24128::decode23127(g1); unsigned int c1data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c1data); g2 = CGolay24128::encode23127(c1data);
for (int i = 22; i >= 0; i--) { for (int i = 23; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -682,7 +682,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c2data = CGolay24128::decode23127(g1); unsigned int c2data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c2data); g2 = CGolay24128::encode23127(c2data);
for (int i = 22; i >= 0; i--) { for (int i = 23; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }
@@ -694,7 +694,7 @@ unsigned int CAMBEFEC::regenerateYSF3(unsigned char* bytes) const
g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U); g1 = (g1 << 1) | (bit[i] ? 0x01U : 0x00U);
unsigned int c3data = CGolay24128::decode23127(g1); unsigned int c3data = CGolay24128::decode23127(g1);
g2 = CGolay24128::encode23127(c3data); g2 = CGolay24128::encode23127(c3data);
for (int i = 22; i >= 0; i--) { for (int i = 23; i >= 0; i--) {
bit[i] = (g2 & 0x01U) == 0x01U; bit[i] = (g2 & 0x01U) == 0x01U;
g2 >>= 1; g2 >>= 1;
} }