From 27522fb64c43e06486261ca9359a1de929b7d2f3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 16 Nov 2019 06:24:29 +0100 Subject: [PATCH] avcodec/put_bits: Relax requirements to rebase PutBitContext The earlier requirement was for the new buffer to be bigger than the old one. This has been relaxed to only demand that the new buffer can hold all the data written so far. This is in preparation for further commits. Signed-off-by: Andreas Rheinhardt Signed-off-by: Michael Niedermayer --- libavcodec/put_bits.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 1ceb1cc766..7d11a3576a 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -61,24 +61,6 @@ static inline void init_put_bits(PutBitContext *s, uint8_t *buffer, s->bit_buf = 0; } -/** - * Rebase the bit writer onto a reallocated buffer. - * - * @param buffer the buffer where to put bits - * @param buffer_size the size in bytes of buffer, - * must be larger than the previous size - */ -static inline void rebase_put_bits(PutBitContext *s, uint8_t *buffer, - int buffer_size) -{ - av_assert0(8*buffer_size > s->size_in_bits); - - s->buf_end = buffer + buffer_size; - s->buf_ptr = buffer + (s->buf_ptr - s->buf); - s->buf = buffer; - s->size_in_bits = 8 * buffer_size; -} - /** * @return the total number of bits written to the bitstream. */ @@ -87,6 +69,24 @@ static inline int put_bits_count(PutBitContext *s) return (s->buf_ptr - s->buf) * 8 + 32 - s->bit_left; } +/** + * Rebase the bit writer onto a reallocated buffer. + * + * @param buffer the buffer where to put bits + * @param buffer_size the size in bytes of buffer, + * must be large enough to hold everything written so far + */ +static inline void rebase_put_bits(PutBitContext *s, uint8_t *buffer, + int buffer_size) +{ + av_assert0(8*buffer_size >= put_bits_count(s)); + + s->buf_end = buffer + buffer_size; + s->buf_ptr = buffer + (s->buf_ptr - s->buf); + s->buf = buffer; + s->size_in_bits = 8 * buffer_size; +} + /** * @return the number of bits available in the bitstream. */