Re: [libav-devel] [PATCH 07/14] ralf: Convert to the new bitstream reader

[Vittorio Giovara]

On Thu, Jan 26, 2017 at 11:10 AM, Diego Biurrun  wrote:
> From: Alexandra Hájková 
>
> ---
>  libavcodec/ralf.c | 68 
> ---
>  1 file changed, 35 insertions(+), 33 deletions(-)

ok i think
-- 
Vittorio
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 07/14] ralf: Convert to the new bitstream reader

[Diego Biurrun]

From: Alexandra Hájková 

---
 libavcodec/ralf.c | 68 ---
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index 6bc0f3f..1003b10 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -28,11 +28,13 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/channel_layout.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
-#include "golomb_legacy.h"
+#include "bitstream.h"
+#include "golomb.h"
 #include "internal.h"
-#include "unary_legacy.h"
+#include "unary.h"
+#include "vlc.h"
 #include "ralfdata.h"
 
 #define FILTER_NONE 0
@@ -210,21 +212,21 @@ static av_cold int decode_init(AVCodecContext *avctx)
 return 0;
 }
 
-static inline int extend_code(GetBitContext *gb, int val, int range, int bits)
+static inline int extend_code(BitstreamContext *bc, int val, int range, int 
bits)
 {
 if (val == 0) {
-val = -range - get_ue_golomb(gb);
+val = -range - get_ue_golomb(bc);
 } else if (val == range * 2) {
-val =  range + get_ue_golomb(gb);
+val =  range + get_ue_golomb(bc);
 } else {
 val -= range;
 }
 if (bits)
-val = (val << bits) | get_bits(gb, bits);
+val = (val << bits) | bitstream_read(bc, bits);
 return val;
 }
 
-static int decode_channel(RALFContext *ctx, GetBitContext *gb, int ch,
+static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
   int length, int mode, int bits)
 {
 int i, t;
@@ -233,19 +235,19 @@ static int decode_channel(RALFContext *ctx, GetBitContext 
*gb, int ch,
 VLC *code_vlc; int range, range2, add_bits;
 int *dst = ctx->channel_data[ch];
 
-ctx->filter_params = get_vlc2(gb, set->filter_params.table, 9, 2);
+ctx->filter_params = bitstream_read_vlc(bc, set->filter_params.table, 9, 
2);
 ctx->filter_bits   = (ctx->filter_params - 2) >> 6;
 ctx->filter_length = ctx->filter_params - (ctx->filter_bits << 6) - 1;
 
 if (ctx->filter_params == FILTER_RAW) {
 for (i = 0; i < length; i++)
-dst[i] = get_bits(gb, bits);
+dst[i] = bitstream_read(bc, bits);
 ctx->bias[ch] = 0;
 return 0;
 }
 
-ctx->bias[ch] = get_vlc2(gb, set->bias.table, 9, 2);
-ctx->bias[ch] = extend_code(gb, ctx->bias[ch], 127, 4);
+ctx->bias[ch] = bitstream_read_vlc(bc, set->bias.table, 9, 2);
+ctx->bias[ch] = extend_code(bc, ctx->bias[ch], 127, 4);
 
 if (ctx->filter_params == FILTER_NONE) {
 memset(dst, 0, sizeof(*dst) * length);
@@ -259,8 +261,8 @@ static int decode_channel(RALFContext *ctx, GetBitContext 
*gb, int ch,
 add_bits = ctx->filter_bits;
 
 for (i = 0; i < ctx->filter_length; i++) {
-t = get_vlc2(gb, vlc[cmode].table, vlc[cmode].bits, 2);
-t = extend_code(gb, t, 21, add_bits);
+t = bitstream_read_vlc(bc, vlc[cmode].table, vlc[cmode].bits, 2);
+t = extend_code(bc, t, 21, add_bits);
 if (!cmode)
 coeff -= 12 << add_bits;
 coeff = t - coeff;
@@ -279,7 +281,7 @@ static int decode_channel(RALFContext *ctx, GetBitContext 
*gb, int ch,
 }
 }
 
-code_params = get_vlc2(gb, set->coding_mode.table, set->coding_mode.bits, 
2);
+code_params = bitstream_read_vlc(bc, set->coding_mode.table, 
set->coding_mode.bits, 2);
 if (code_params >= 15) {
 add_bits = av_clip((code_params / 5 - 3) / 2, 0, 10);
 if (add_bits > 9 && (code_params % 5) != 2)
@@ -297,14 +299,14 @@ static int decode_channel(RALFContext *ctx, GetBitContext 
*gb, int ch,
 for (i = 0; i < length; i += 2) {
 int code1, code2;
 
-t = get_vlc2(gb, code_vlc->table, code_vlc->bits, 2);
+t = bitstream_read_vlc(bc, code_vlc->table, code_vlc->bits, 2);
 code1 = t / range2;
 code2 = t % range2;
-dst[i] = extend_code(gb, code1, range, 0) << add_bits;
-dst[i + 1] = extend_code(gb, code2, range, 0) << add_bits;
+dst[i] = extend_code(bc, code1, range, 0) << add_bits;
+dst[i + 1] = extend_code(bc, code2, range, 0) << add_bits;
 if (add_bits) {
-dst[i] |= get_bits(gb, add_bits);
-dst[i + 1] |= get_bits(gb, add_bits);
+dst[i] |= bitstream_read(bc, add_bits);
+dst[i + 1] |= bitstream_read(bc, add_bits);
 }
 }
 
@@ -335,7 +337,7 @@ static void apply_lpc(RALFContext *ctx, int ch, int length, 
int bits)
 }
 }
 
-static int decode_block(AVCodecContext *avctx, GetBitContext *gb,
+static int decode_block(AVCodecContext *avctx, BitstreamContext *bc,
 int16_t *dst0, int16_t *dst1)
 {
 RALFContext *ctx = avctx->priv_data;
@@ -344,7 +346,7 @@ static int decode_block(AVCodecContext *avctx, 
GetBitContext *gb,
 int *ch0, *ch1;
 int i, t, t2;
 
-len = 12 - get_unary(gb, 0, 6);
+len = 12 -