Skip to content

GitLab

Commit d1dd66b3 authored by Josh Coalson's avatar Josh Coalson
Browse files

minor asserts

parent 67e5d6d4
Show whitespace changes
Inline Side-by-side
src/libFLAC/bitreader.c
View file @ d1dd66b3
...@@ -374,10 +374,6 @@ FLAC__uint16 FLAC__bitreader_get_read_crc16(FLAC__BitReader *br) ...@@ -374,10 +374,6 @@ FLAC__uint16 FLAC__bitreader_get_read_crc16(FLAC__BitReader *br)
/* CRC any tail bytes in a partially-consumed word */ /* CRC any tail bytes in a partially-consumed word */
if(br->consumed_bits) { if(br->consumed_bits) {
const brword tail = br->buffer[br->consumed_words]; const brword tail = br->buffer[br->consumed_words];
#ifdef DEBUG
if(br->crc16_align)fprintf(stderr,"@@@@@@ FLAC__bitreader_get_read_crc16() got nonzero crc align = %u\n",br->crc16_align);
#endif
/* non-zero crc align here can probably never happen with FLAC but check for consistency */
for( ; br->crc16_align < br->consumed_bits; br->crc16_align += 8) for( ; br->crc16_align < br->consumed_bits; br->crc16_align += 8)
br->read_crc16 = FLAC__CRC16_UPDATE((unsigned)((tail >> (FLAC__BITS_PER_WORD-8-br->crc16_align)) & 0xff), br->read_crc16); br->read_crc16 = FLAC__CRC16_UPDATE((unsigned)((tail >> (FLAC__BITS_PER_WORD-8-br->crc16_align)) & 0xff), br->read_crc16);
} }
......
src/libFLAC/bitwriter.c
View file @ d1dd66b3
...@@ -347,9 +347,6 @@ FLaC__INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32(FLAC__BitWriter *bw, FL ...@@ -347,9 +347,6 @@ FLaC__INLINE FLAC__bool FLAC__bitwriter_write_raw_uint32(FLAC__BitWriter *bw, FL
bw->bits += bits; bw->bits += bits;
} }
else if(bw->bits) { /* WATCHOUT: if bw->bits == 0, left==FLAC__BITS_PER_WORD and bw->accum<<=left is a NOP instead of setting to 0 */ else if(bw->bits) { /* WATCHOUT: if bw->bits == 0, left==FLAC__BITS_PER_WORD and bw->accum<<=left is a NOP instead of setting to 0 */
#ifdef DEBUG
if(left>=FLAC__BITS_PER_WORD)fprintf(stderr,"@@@@@@ bitwriter shift error @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
#endif
bw->accum <<= left; bw->accum <<= left;
bw->accum |= val >> (bw->bits = bits - left); bw->accum |= val >> (bw->bits = bits - left);
bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum); bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum);
...@@ -357,7 +354,7 @@ if(left>=FLAC__BITS_PER_WORD)fprintf(stderr,"@@@@@@ bitwriter shift error @@@@@@ ...@@ -357,7 +354,7 @@ if(left>=FLAC__BITS_PER_WORD)fprintf(stderr,"@@@@@@ bitwriter shift error @@@@@@
} }
else { else {
#ifdef DEBUG #ifdef DEBUG
if(bits!=left)fprintf(stderr,"@@@@@@ bitwriter shift error2 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); if(bits!=left)fprintf(stderr,"@@@@@@ bitwriter error2 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
#endif #endif
bw->accum = val; bw->accum = val;
bw->bits = 0; bw->bits = 0;
...@@ -596,9 +593,7 @@ break1: ...@@ -596,9 +593,7 @@ break1:
* triggered the (lsbits<left) case above. * triggered the (lsbits<left) case above.
*/ */
FLAC__ASSERT(bw->bits); FLAC__ASSERT(bw->bits);
#ifdef DEBUG FLAC__ASSERT(left < FLAC__BITS_PER_WORD);
if(left>=FLAC__BITS_PER_WORD)fprintf(stderr,"@@@@@@ bitwriter shift error @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
#endif
bw->accum <<= left; bw->accum <<= left;
bw->accum |= uval >> (bw->bits = lsbits - left); bw->accum |= uval >> (bw->bits = lsbits - left);
bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum); bw->buffer[bw->words++] = SWAP_BE_WORD_TO_HOST(bw->accum);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment