diff options
Diffstat (limited to 'libavcodec/ra144dec.c')
| -rw-r--r-- | libavcodec/ra144dec.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index 15162c30b2..0492d1fb08 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -5,20 +5,20 @@ * Copyright (c) 2003 Nick Kurshev * Based on public domain decoder at http://www.honeypot.net/audio * - * 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 */ @@ -45,7 +45,7 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx) return 0; } -static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs, +static void do_output_subblock(RA144Context *ractx, const int16_t *lpc_coefs, int gval, GetBitContext *gb) { int cba_idx = get_bits(gb, 7); // index of the adaptive CB, 0 if none @@ -66,7 +66,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, int buf_size = avpkt->size; static const uint8_t sizes[LPC_ORDER] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; unsigned int refl_rms[NBLOCKS]; // RMS of the reflection coefficients - uint16_t block_coefs[NBLOCKS][LPC_ORDER]; // LPC coefficients of each sub-block + int16_t block_coefs[NBLOCKS][LPC_ORDER]; // LPC coefficients of each sub-block unsigned int lpc_refl[LPC_ORDER]; // LPC reflection coefficients of the frame int i, j; int ret; @@ -76,7 +76,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, RA144Context *ractx = avctx->priv_data; GetBitContext gb; - if (buf_size < FRAMESIZE) { + if (buf_size < FRAME_SIZE) { av_log(avctx, AV_LOG_ERROR, "Frame too small (%d bytes). Truncated file?\n", buf_size); *got_frame_ptr = 0; @@ -85,13 +85,11 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, /* get output buffer */ frame->nb_samples = NBLOCKS * BLOCKSIZE; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } samples = (int16_t *)frame->data[0]; - init_get_bits(&gb, buf, FRAMESIZE * 8); + init_get_bits8(&gb, buf, FRAME_SIZE); for (i = 0; i < LPC_ORDER; i++) lpc_refl[i] = ff_lpc_refl_cb[i][get_bits(&gb, sizes[i])]; @@ -124,7 +122,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data, *got_frame_ptr = 1; - return FRAMESIZE; + return FRAME_SIZE; } AVCodec ff_ra_144_decoder = { |