Mercurial > libavcodec.hg
changeset 10344:2b8a327189cd libavcodec
put_bits can only reliably write up to 31 bit bits, above it relies on
undefined shift behaviour.
Document this, fix the assert and add a put_bits32 to handle writing 32
bits and use that where necessary.
| author | reimar |
|---|---|
| date | Thu, 01 Oct 2009 15:40:29 +0000 |
| parents | b1218e0b0f2b |
| children | 294c444866f7 |
| files | alacenc.c put_bits.h vorbis_enc.c |
| diffstat | 3 files changed, 30 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/alacenc.c Thu Oct 01 15:30:27 2009 +0000 +++ b/alacenc.c Thu Oct 01 15:40:29 2009 +0000 @@ -123,7 +123,7 @@ put_bits(&s->pbctx, 1, 1); // Sample count is in the header put_bits(&s->pbctx, 2, 0); // FIXME: Wasted bytes field put_bits(&s->pbctx, 1, is_verbatim); // Audio block is verbatim - put_bits(&s->pbctx, 32, s->avctx->frame_size); // No. of samples in the frame + put_bits32(&s->pbctx, s->avctx->frame_size); // No. of samples in the frame } static void calc_predictor_params(AlacEncodeContext *s, int ch)
--- a/put_bits.h Thu Oct 01 15:30:27 2009 +0000 +++ b/put_bits.h Thu Oct 01 15:40:29 2009 +0000 @@ -136,6 +136,10 @@ */ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length); +/** + * Write up to 31 bits into a bitstream. + * Use put_bits32 to write 32 bits. + */ static inline void put_bits(PutBitContext *s, int n, unsigned int value) #ifndef ALT_BITSTREAM_WRITER { @@ -143,7 +147,7 @@ int bit_left; // printf("put_bits=%d %x\n", n, value); - assert(n == 32 || value < (1U << n)); + assert(n <= 31 && value < (1U << n)); bit_buf = s->bit_buf; bit_left = s->bit_left; @@ -260,6 +264,22 @@ } /** + * Write exactly 32 bits into a bitstream + */ +static void av_unused put_bits32(PutBitContext *s, uint32_t value) +{ + int lo = value & 0xffff; + int hi = value >> 16; +#ifdef ALT_BITSTREAM_WRITER_LE + put_bits(s, 16, lo); + put_bits(s, 16, hi); +#else + put_bits(s, 16, hi); + put_bits(s, 16, lo); +#endif +} + +/** * Returns the pointer to the byte where the bitstream writer will put * the next bit. */
--- a/vorbis_enc.c Thu Oct 01 15:30:27 2009 +0000 +++ b/vorbis_enc.c Thu Oct 01 15:40:29 2009 +0000 @@ -386,7 +386,7 @@ mant = -mant; } res |= mant | (exp << 21); - put_bits(pb, 32, res); + put_bits32(pb, res); } static void put_codebook_header(PutBitContext *pb, vorbis_enc_codebook *cb) @@ -531,12 +531,12 @@ init_put_bits(&pb, p, buffer_len); put_bits(&pb, 8, 1); //magic ff_put_string(&pb, "vorbis", 0); - put_bits(&pb, 32, 0); // version + put_bits32(&pb, 0); // version put_bits(&pb, 8, venc->channels); - put_bits(&pb, 32, venc->sample_rate); - put_bits(&pb, 32, 0); // bitrate - put_bits(&pb, 32, 0); // bitrate - put_bits(&pb, 32, 0); // bitrate + put_bits32(&pb, venc->sample_rate); + put_bits32(&pb, 0); // bitrate + put_bits32(&pb, 0); // bitrate + put_bits32(&pb, 0); // bitrate put_bits(&pb, 4, venc->log2_blocksize[0]); put_bits(&pb, 4, venc->log2_blocksize[1]); put_bits(&pb, 1, 1); // framing @@ -550,8 +550,8 @@ init_put_bits(&pb, p, buffer_len); put_bits(&pb, 8, 3); //magic ff_put_string(&pb, "vorbis", 0); - put_bits(&pb, 32, 0); // vendor length TODO - put_bits(&pb, 32, 0); // amount of comments + put_bits32(&pb, 0); // vendor length TODO + put_bits32(&pb, 0); // amount of comments put_bits(&pb, 1, 1); // framing flush_put_bits(&pb);