From b4c0daa83c0c5e7505703af65de95fb22d6cbe72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Date: Sat, 9 Apr 2016 16:20:13 +0200 Subject: [PATCH] cdxl: Convert to the new bitstream reader Signed-off-by: Anton Khirnov --- libavcodec/cdxl.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index 99e96eb502..4c0410dd21 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -21,8 +21,9 @@ #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" + #include "avcodec.h" -#include "get_bits.h" +#include "bitstream.h" #include "internal.h" #define BIT_PLANAR 0x00 @@ -69,30 +70,30 @@ static void import_palette(CDXLVideoContext *c, uint32_t *new_palette) static void bitplanar2chunky(CDXLVideoContext *c, int linesize, uint8_t *out) { - GetBitContext gb; + BitstreamContext bc; int x, y, plane; - init_get_bits(&gb, c->video, c->video_size * 8); + bitstream_init(&bc, c->video, c->video_size * 8); for (plane = 0; plane < c->bpp; plane++) { for (y = 0; y < c->avctx->height; y++) { for (x = 0; x < c->avctx->width; x++) - out[linesize * y + x] |= get_bits1(&gb) << plane; - skip_bits(&gb, c->padded_bits); + out[linesize * y + x] |= bitstream_read_bit(&bc) << plane; + bitstream_skip(&bc, c->padded_bits); } } } static void bitline2chunky(CDXLVideoContext *c, int linesize, uint8_t *out) { - GetBitContext gb; + BitstreamContext bc; int x, y, plane; - init_get_bits(&gb, c->video, c->video_size * 8); + bitstream_init(&bc, c->video, c->video_size * 8); for (y = 0; y < c->avctx->height; y++) { for (plane = 0; plane < c->bpp; plane++) { for (x = 0; x < c->avctx->width; x++) - out[linesize * y + x] |= get_bits1(&gb) << plane; - skip_bits(&gb, c->padded_bits); + out[linesize * y + x] |= bitstream_read_bit(&bc) << plane; + bitstream_skip(&bc, c->padded_bits); } } }