summaryrefslogtreecommitdiff
path: root/libavcodec/ralf.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/ralf.c')
-rw-r--r--libavcodec/ralf.c76
1 files changed, 36 insertions, 40 deletions
diff --git a/libavcodec/ralf.c b/libavcodec/ralf.c
index 1003b10c11..3f7953c6db 100644
--- a/libavcodec/ralf.c
+++ b/libavcodec/ralf.c
@@ -3,20 +3,20 @@
*
* Copyright (c) 2012 Konstantin Shishkov
*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
*
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@@ -28,13 +28,11 @@
#include "libavutil/attributes.h"
#include "libavutil/channel_layout.h"
-
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
#include "golomb.h"
#include "internal.h"
#include "unary.h"
-#include "vlc.h"
#include "ralfdata.h"
#define FILTER_NONE 0
@@ -212,21 +210,21 @@ static av_cold int decode_init(AVCodecContext *avctx)
return 0;
}
-static inline int extend_code(BitstreamContext *bc, int val, int range, int bits)
+static inline int extend_code(GetBitContext *gb, int val, int range, int bits)
{
if (val == 0) {
- val = -range - get_ue_golomb(bc);
+ val = -range - get_ue_golomb(gb);
} else if (val == range * 2) {
- val = range + get_ue_golomb(bc);
+ val = range + get_ue_golomb(gb);
} else {
val -= range;
}
if (bits)
- val = (val << bits) | bitstream_read(bc, bits);
+ val = (val << bits) | get_bits(gb, bits);
return val;
}
-static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
+static int decode_channel(RALFContext *ctx, GetBitContext *gb, int ch,
int length, int mode, int bits)
{
int i, t;
@@ -235,19 +233,19 @@ static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
VLC *code_vlc; int range, range2, add_bits;
int *dst = ctx->channel_data[ch];
- ctx->filter_params = bitstream_read_vlc(bc, set->filter_params.table, 9, 2);
+ ctx->filter_params = get_vlc2(gb, 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] = bitstream_read(bc, bits);
+ dst[i] = get_bits(gb, bits);
ctx->bias[ch] = 0;
return 0;
}
- ctx->bias[ch] = bitstream_read_vlc(bc, set->bias.table, 9, 2);
- ctx->bias[ch] = extend_code(bc, ctx->bias[ch], 127, 4);
+ ctx->bias[ch] = get_vlc2(gb, set->bias.table, 9, 2);
+ ctx->bias[ch] = extend_code(gb, ctx->bias[ch], 127, 4);
if (ctx->filter_params == FILTER_NONE) {
memset(dst, 0, sizeof(*dst) * length);
@@ -261,8 +259,8 @@ static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
add_bits = ctx->filter_bits;
for (i = 0; i < ctx->filter_length; i++) {
- t = bitstream_read_vlc(bc, vlc[cmode].table, vlc[cmode].bits, 2);
- t = extend_code(bc, t, 21, add_bits);
+ t = get_vlc2(gb, vlc[cmode].table, vlc[cmode].bits, 2);
+ t = extend_code(gb, t, 21, add_bits);
if (!cmode)
coeff -= 12 << add_bits;
coeff = t - coeff;
@@ -281,7 +279,7 @@ static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
}
}
- code_params = bitstream_read_vlc(bc, set->coding_mode.table, set->coding_mode.bits, 2);
+ code_params = get_vlc2(gb, 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)
@@ -299,14 +297,14 @@ static int decode_channel(RALFContext *ctx, BitstreamContext *bc, int ch,
for (i = 0; i < length; i += 2) {
int code1, code2;
- t = bitstream_read_vlc(bc, code_vlc->table, code_vlc->bits, 2);
+ t = get_vlc2(gb, code_vlc->table, code_vlc->bits, 2);
code1 = t / range2;
code2 = t % range2;
- dst[i] = extend_code(bc, code1, range, 0) << add_bits;
- dst[i + 1] = extend_code(bc, code2, range, 0) << add_bits;
+ dst[i] = extend_code(gb, code1, range, 0) << add_bits;
+ dst[i + 1] = extend_code(gb, code2, range, 0) << add_bits;
if (add_bits) {
- dst[i] |= bitstream_read(bc, add_bits);
- dst[i + 1] |= bitstream_read(bc, add_bits);
+ dst[i] |= get_bits(gb, add_bits);
+ dst[i + 1] |= get_bits(gb, add_bits);
}
}
@@ -337,7 +335,7 @@ static void apply_lpc(RALFContext *ctx, int ch, int length, int bits)
}
}
-static int decode_block(AVCodecContext *avctx, BitstreamContext *bc,
+static int decode_block(AVCodecContext *avctx, GetBitContext *gb,
int16_t *dst0, int16_t *dst1)
{
RALFContext *ctx = avctx->priv_data;
@@ -346,7 +344,7 @@ static int decode_block(AVCodecContext *avctx, BitstreamContext *bc,
int *ch0, *ch1;
int i, t, t2;
- len = 12 - get_unary(bc, 0, 6);
+ len = 12 - get_unary(gb, 0, 6);
if (len <= 7) len ^= 1; // codes for length = 6 and 7 are swapped
len = 1 << len;
@@ -358,7 +356,7 @@ static int decode_block(AVCodecContext *avctx, BitstreamContext *bc,
}
if (avctx->channels > 1)
- dmode = bitstream_read(bc, 2) + 1;
+ dmode = get_bits(gb, 2) + 1;
else
dmode = 0;
@@ -368,13 +366,13 @@ static int decode_block(AVCodecContext *avctx, BitstreamContext *bc,
bits[1] = (mode[1] == 2) ? 17 : 16;
for (ch = 0; ch < avctx->channels; ch++) {
- if ((ret = decode_channel(ctx, bc, ch, len, mode[ch], bits[ch])) < 0)
+ if ((ret = decode_channel(ctx, gb, ch, len, mode[ch], bits[ch])) < 0)
return ret;
if (ctx->filter_params > 1 && ctx->filter_params != FILTER_RAW) {
ctx->filter_bits += 3;
apply_lpc(ctx, ch, len, bits[ch]);
}
- if (bitstream_bits_left(bc) < 0)
+ if (get_bits_left(gb) < 0)
return AVERROR_INVALIDDATA;
}
ch0 = ctx->channel_data[0];
@@ -428,7 +426,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
int16_t *samples0;
int16_t *samples1;
int ret;
- BitstreamContext bc;
+ GetBitContext gb;
int table_size, table_bytes, i;
const uint8_t *src, *block_pointer;
int src_size;
@@ -463,10 +461,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
}
frame->nb_samples = ctx->max_frame_size;
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Me fail get_buffer()? That's unpossible!\n");
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
- }
samples0 = (int16_t *)frame->data[0];
samples1 = (int16_t *)frame->data[1];
@@ -480,12 +476,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
av_log(avctx, AV_LOG_ERROR, "short packets are short!\n");
return AVERROR_INVALIDDATA;
}
- bitstream_init(&bc, src + 2, table_size);
+ init_get_bits(&gb, src + 2, table_size);
ctx->num_blocks = 0;
- while (bitstream_bits_left(&bc) > 0) {
- ctx->block_size[ctx->num_blocks] = bitstream_read(&bc, 15);
- if (bitstream_read_bit(&bc)) {
- ctx->block_pts[ctx->num_blocks] = bitstream_read(&bc, 9);
+ while (get_bits_left(&gb) > 0) {
+ ctx->block_size[ctx->num_blocks] = get_bits(&gb, 13 + avctx->channels);
+ if (get_bits1(&gb)) {
+ ctx->block_pts[ctx->num_blocks] = get_bits(&gb, 9);
} else {
ctx->block_pts[ctx->num_blocks] = 0;
}
@@ -500,8 +496,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
av_log(avctx, AV_LOG_ERROR, "I'm pedaling backwards\n");
break;
}
- bitstream_init8(&bc, block_pointer, ctx->block_size[i]);
- if (decode_block(avctx, &bc, samples0 + ctx->sample_offset,
+ init_get_bits(&gb, block_pointer, ctx->block_size[i] * 8);
+ if (decode_block(avctx, &gb, samples0 + ctx->sample_offset,
samples1 + ctx->sample_offset) < 0) {
av_log(avctx, AV_LOG_ERROR, "Sir, I got carsick in your office. Not decoding the rest of packet.\n");
break;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-14 20:50:57 +0000