Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/neutrinolabs/librfxcodec.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2017-04-01 07:41:58 +0300
committerjsorg71 <jay.sorg@gmail.com>2017-04-02 09:16:49 +0300
commit64add735cc430ca47044774c11a419db09f24a9e (patch)
tree8c28f7e58bc1fa95494368006477a49d922d5309
parenta80938d5367a560a1994abf7d664252ee2348a84 (diff)
clear trailing bits in rlgr1/3 old and new
-rw-r--r--src/rfx_bitstream.h2
-rw-r--r--src/rfxencode_diff_rlgr1.c1
-rw-r--r--src/rfxencode_diff_rlgr3.c1
3 files changed, 1 insertions, 3 deletions
diff --git a/src/rfx_bitstream.h b/src/rfx_bitstream.h
index 736a046..b5876d2 100644
--- a/src/rfx_bitstream.h
+++ b/src/rfx_bitstream.h
@@ -68,7 +68,7 @@ typedef struct _RFX_BITSTREAM RFX_BITSTREAM;
b = nbits; \
if (b > bs.bits_left) \
b = bs.bits_left; \
- bs.buffer[bs.byte_pos] &= ~(((1 << b) - 1) << (bs.bits_left - b)); \
+ bs.buffer[bs.byte_pos] &= ~((1 << bs.bits_left) - 1); \
bs.buffer[bs.byte_pos] |= ((bits >> (nbits - b)) & ((1 << b) - 1)) << (bs.bits_left - b); \
bs.bits_left -= b; \
nbits -= b; \
diff --git a/src/rfxencode_diff_rlgr1.c b/src/rfxencode_diff_rlgr1.c
index de107df..cd09f18 100644
--- a/src/rfxencode_diff_rlgr1.c
+++ b/src/rfxencode_diff_rlgr1.c
@@ -240,7 +240,6 @@ rfx_encode_diff_rlgr1(sint16 *coef, uint8 *cdata, int cdata_size)
if (bit_count > 0)
{
bits <<= 8 - bit_count;
- bits |= ((1 << (8 - bit_count)) - 1) & *cdata;
*cdata = bits;
cdata++;
bit_count = 0;
diff --git a/src/rfxencode_diff_rlgr3.c b/src/rfxencode_diff_rlgr3.c
index 1c275dd..0b68db3 100644
--- a/src/rfxencode_diff_rlgr3.c
+++ b/src/rfxencode_diff_rlgr3.c
@@ -277,7 +277,6 @@ rfx_encode_diff_rlgr3(sint16 *coef, uint8 *cdata, int cdata_size)
if (bit_count > 0)
{
bits <<= 8 - bit_count;
- bits |= ((1 << (8 - bit_count)) - 1) & *cdata;
*cdata = bits;
cdata++;
bit_count = 0;