Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bug in old version of decode

Browse source
This commit is contained in:
ZappoMan 2015-07-08 15:14:24 -07:00
parent afdd4c862c
commit 6a9344a3f6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libraries/shared/src/ByteCountCoding.h
View file

@ -21,6 +21,8 @@
#include <climits> #include <climits>
#include <limits> #include <limits>
#include <QDebug>
#include <QBitArray> #include <QBitArray>
#include <QByteArray> #include <QByteArray>
@ -111,12 +113,12 @@ template<typename T> inline QByteArray ByteCountCoded<T>::encode() const {
} }
template<typename T> inline void ByteCountCoded<T>::decode(const QByteArray& fromEncodedBytes) { template<typename T> inline void ByteCountCoded<T>::decode(const QByteArray& fromEncodedBytes) {
// first convert the ByteArray into a BitArray... // first convert the ByteArray into a BitArray...
QBitArray encodedBits; QBitArray encodedBits;
int bitCount = BITS_IN_BYTE * fromEncodedBytes.count(); int bitCount = BITS_IN_BYTE * fromEncodedBytes.count();
encodedBits.resize(bitCount); encodedBits.resize(bitCount);
// copies the QByteArray into a QBitArray
for(int byte = 0; byte < fromEncodedBytes.count(); byte++) { for(int byte = 0; byte < fromEncodedBytes.count(); byte++) {
char originalByte = fromEncodedBytes.at(byte); char originalByte = fromEncodedBytes.at(byte);
for(int bit = 0; bit < BITS_IN_BYTE; bit++) { for(int bit = 0; bit < BITS_IN_BYTE; bit++) {
@ -128,8 +130,8 @@ template<typename T> inline void ByteCountCoded<T>::decode(const QByteArray& fro
} }
// next, read the leading bits to determine the correct number of bytes to decode (may not match the QByteArray) // next, read the leading bits to determine the correct number of bytes to decode (may not match the QByteArray)
int encodedByteCount = 0; int encodedByteCount = 1; // there is at least 1 byte (after the leadBits)
int leadBits = 1; int leadBits = 1; // there is always at least 1 lead bit
int bitAt; int bitAt;
for (bitAt = 0; bitAt < bitCount; bitAt++) { for (bitAt = 0; bitAt < bitCount; bitAt++) {
if (encodedBits.at(bitAt)) { if (encodedBits.at(bitAt)) {
@ -139,16 +141,15 @@ template<typename T> inline void ByteCountCoded<T>::decode(const QByteArray& fro
break; break;
} }
} }
encodedByteCount++; // always at least one byte int expectedBitCount = (encodedByteCount * BITS_IN_BYTE) - leadBits;
int expectedBitCount = encodedByteCount * BITS_IN_BYTE;
T value = 0; T value = 0;
if (expectedBitCount <= (encodedBits.size() - leadBits)) { if (expectedBitCount <= (encodedBits.size() - leadBits)) {
// Now, keep reading... // Now, keep reading...
int valueStartsAt = bitAt + 1; int valueStartsAt = bitAt + 1;
T bitValue = 1; T bitValue = 1;
for (bitAt = valueStartsAt; bitAt < expectedBitCount; bitAt++) { for (bitAt = valueStartsAt; bitAt < (expectedBitCount + leadBits); bitAt++) {
if(encodedBits.at(bitAt)) { if(encodedBits.at(bitAt)) {
value += bitValue; value += bitValue;
} }