X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fra144.c;h=0398b13cedd09f27d8c1c0657a4e45b80d4d2728;hb=54347c2f51a9aae0f45a55069513ffb340014e10;hp=44c90167d60180898836600ac4d79480094a199c;hpb=0a03b6f049cdddbf819f34c33f065a5721dcd525;p=ffmpeg diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 44c90167d60..0398b13cedd 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -1,6 +1,9 @@ /* * Real Audio 1.0 (14.4K) - * Copyright (c) 2003 the ffmpeg project + * + * Copyright (c) 2008 Vitor Sessak + * Copyright (c) 2003 Nick Kurshev + * Based on public domain decoder at http://www.honeypot.net/audio * * This file is part of FFmpeg. * @@ -22,6 +25,7 @@ #include "avcodec.h" #include "bitstream.h" #include "ra144.h" +#include "acelp_filters.h" #define NBLOCKS 4 ///< number of subblocks within a block #define BLOCKSIZE 40 ///< subblock size in 16-bit words @@ -32,10 +36,12 @@ typedef struct { unsigned int old_energy; ///< previous frame energy unsigned int lpc_tables[2][10]; - unsigned int *lpc_coef; ///< LPC coefficients - unsigned int *lpc_coef_old; ///< previous frame LPC coefficients - unsigned int lpc_refl_rms; - unsigned int lpc_refl_rms_old; + + /** LPC coefficients: lpc_coef[0] is the coefficients of the current frame + * and lpc_coef[1] of the previous one */ + unsigned int *lpc_coef[2]; + + unsigned int lpc_refl_rms[2]; /** the current subblock padded by the last 10 values of the previous one*/ int16_t curr_sblock[50]; @@ -49,8 +55,8 @@ static int ra144_decode_init(AVCodecContext * avctx) { RA144Context *ractx = avctx->priv_data; - ractx->lpc_coef = ractx->lpc_tables[0]; - ractx->lpc_coef_old = ractx->lpc_tables[1]; + ractx->lpc_coef[0] = ractx->lpc_tables[0]; + ractx->lpc_coef[1] = ractx->lpc_tables[1]; return 0; } @@ -74,7 +80,7 @@ static int t_sqrt(unsigned int x) * Evaluate the LPC filter coefficients from the reflection coefficients. * Does the inverse of the eval_refl() function. */ -static void eval_coefs(const int *refl, int *coefs) +static void eval_coefs(int *coefs, const int *refl) { int buffer[10]; int *b1 = buffer; @@ -98,7 +104,7 @@ static void eval_coefs(const int *refl, int *coefs) * Copy the last offset values of *source to *target. If those values are not * enough to fill the target buffer, fill it with another copy of those values. */ -static void copy_and_dup(const int16_t *source, int16_t *target, int offset) +static void copy_and_dup(int16_t *target, const int16_t *source, int offset) { source += BUFFERSIZE - offset; @@ -124,8 +130,8 @@ static int irms(const int16_t *data) return 0x20000000 / (t_sqrt(sum) >> 8); } -static void add_wav(int n, int skip_first, int *m, const int16_t *s1, - const int8_t *s2, const int8_t *s3, int16_t *dest) +static void add_wav(int16_t *dest, int n, int skip_first, int *m, + const int16_t *s1, const int8_t *s2, const int8_t *s3) { int i; int v[3]; @@ -138,39 +144,6 @@ static void add_wav(int n, int skip_first, int *m, const int16_t *s1, dest[i] = (s1[i]*v[0] + s2[i]*v[1] + s3[i]*v[2]) >> 12; } -/** - * LPC Filter. Each output value is predicted from the 10 previous computed - * ones. It overwrites the input with the output. - * - * @param in the input of the filter. It should be an array of size len + 10. - * The 10 first input values are used to evaluate the first filtered one. - */ -static void lpc_filter(const int16_t *lpc_coefs, uint16_t *in, int len) -{ - int x, i; - int16_t *ptr = in; - - for (i=0; i>= 12; - - new_val = ptr[10] - sum; - - if (new_val < -32768 || new_val > 32767) { - memset(in, 0, 50*sizeof(*in)); - return; - } - - ptr[10] = new_val; - ptr++; - } -} - static unsigned int rescale_rms(unsigned int rms, unsigned int energy) { return (rms * energy) >> 10; @@ -200,9 +173,8 @@ static unsigned int rms(const int *data) return res; } -static void do_output_subblock(RA144Context *ractx, - const uint16_t *lpc_coefs, int gval, - GetBitContext *gb) +static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs, + int gval, GetBitContext *gb) { uint16_t buffer_a[40]; uint16_t *block; @@ -214,29 +186,34 @@ static void do_output_subblock(RA144Context *ractx, if (cba_idx) { cba_idx += BLOCKSIZE/2 - 1; - copy_and_dup(ractx->adapt_cb, buffer_a, cba_idx); + copy_and_dup(buffer_a, ractx->adapt_cb, cba_idx); m[0] = (irms(buffer_a) * gval) >> 12; } else { m[0] = 0; } - m[1] = ((cb1_base[cb1_idx] >> 4) * gval) >> 8; - m[2] = ((cb2_base[cb2_idx] >> 4) * gval) >> 8; + m[1] = (cb1_base[cb1_idx] * gval) >> 8; + m[2] = (cb2_base[cb2_idx] * gval) >> 8; memmove(ractx->adapt_cb, ractx->adapt_cb + BLOCKSIZE, (BUFFERSIZE - BLOCKSIZE) * sizeof(*ractx->adapt_cb)); block = ractx->adapt_cb + BUFFERSIZE - BLOCKSIZE; - add_wav(gain, cba_idx, m, buffer_a, cb1_vects[cb1_idx], cb2_vects[cb2_idx], - block); + add_wav(block, gain, cba_idx, m, buffer_a, + cb1_vects[cb1_idx], cb2_vects[cb2_idx]); memcpy(ractx->curr_sblock, ractx->curr_sblock + 40, 10*sizeof(*ractx->curr_sblock)); memcpy(ractx->curr_sblock + 10, block, BLOCKSIZE*sizeof(*ractx->curr_sblock)); - lpc_filter(lpc_coefs, ractx->curr_sblock, BLOCKSIZE); + if (ff_acelp_lp_synthesis_filter( + ractx->curr_sblock + 10, lpc_coefs, + ractx->curr_sblock + 10, BLOCKSIZE, + 10, 1, 0xfff) + ) + memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock)); } static void int_to_int16(int16_t *out, const int *inp) @@ -254,7 +231,7 @@ static void int_to_int16(int16_t *out, const int *inp) * @return 1 if one of the reflection coefficients is of magnitude greater than * 4095, 0 if not. */ -static int eval_refl(const int16_t *coefs, int *refl, RA144Context *ractx) +static int eval_refl(int *refl, const int16_t *coefs, RA144Context *ractx) { int retval = 0; int b, c, i; @@ -300,7 +277,7 @@ static int eval_refl(const int16_t *coefs, int *refl, RA144Context *ractx) } static int interp(RA144Context *ractx, int16_t *out, int block_num, - int copynew, int energy) + int copyold, int energy) { int work[10]; int a = block_num + 1; @@ -310,27 +287,21 @@ static int interp(RA144Context *ractx, int16_t *out, int block_num, // Interpolate block coefficients from the this frame forth block and // last frame forth block for (x=0; x<30; x++) - out[x] = (a * ractx->lpc_coef[x] + b * ractx->lpc_coef_old[x])>> 2; + out[x] = (a * ractx->lpc_coef[0][x] + b * ractx->lpc_coef[1][x])>> 2; - if (eval_refl(out, work, ractx)) { + if (eval_refl(work, out, ractx)) { // The interpolated coefficients are unstable, copy either new or old // coefficients - if (copynew) { - int_to_int16(out, ractx->lpc_coef); - return rescale_rms(ractx->lpc_refl_rms, energy); - } else { - int_to_int16(out, ractx->lpc_coef_old); - return rescale_rms(ractx->lpc_refl_rms_old, energy); - } + int_to_int16(out, ractx->lpc_coef[copyold]); + return rescale_rms(ractx->lpc_refl_rms[copyold], energy); } else { return rescale_rms(rms(work), energy); } } -/* Uncompress one block (20 bytes -> 160*2 bytes) */ -static int ra144_decode_frame(AVCodecContext * avctx, - void *vdata, int *data_size, - const uint8_t * buf, int buf_size) +/** Uncompress one block (20 bytes -> 160*2 bytes) */ +static int ra144_decode_frame(AVCodecContext * avctx, void *vdata, + int *data_size, const uint8_t *buf, int buf_size) { static const uint8_t sizes[10] = {6, 5, 5, 4, 4, 3, 3, 3, 3, 2}; unsigned int refl_rms[4]; // RMS of the reflection coefficients @@ -352,21 +323,20 @@ static int ra144_decode_frame(AVCodecContext * avctx, init_get_bits(&gb, buf, 20 * 8); for (i=0; i<10; i++) - // "<< 1"? Doesn't this make one value out of two of the table useless? - lpc_refl[i] = lpc_refl_cb[i][get_bits(&gb, sizes[i]) << 1]; + lpc_refl[i] = lpc_refl_cb[i][get_bits(&gb, sizes[i])]; - eval_coefs(lpc_refl, ractx->lpc_coef); - ractx->lpc_refl_rms = rms(lpc_refl); + eval_coefs(ractx->lpc_coef[0], lpc_refl); + ractx->lpc_refl_rms[0] = rms(lpc_refl); - energy = energy_tab[get_bits(&gb, 5) << 1]; // Useless table entries? + energy = energy_tab[get_bits(&gb, 5)]; - refl_rms[0] = interp(ractx, block_coefs[0], 0, 0, ractx->old_energy); - refl_rms[1] = interp(ractx, block_coefs[1], 1, energy > ractx->old_energy, + refl_rms[0] = interp(ractx, block_coefs[0], 0, 1, ractx->old_energy); + refl_rms[1] = interp(ractx, block_coefs[1], 1, energy <= ractx->old_energy, t_sqrt(energy*ractx->old_energy) >> 12); - refl_rms[2] = interp(ractx, block_coefs[2], 2, 1, energy); - refl_rms[3] = rescale_rms(ractx->lpc_refl_rms, energy); + refl_rms[2] = interp(ractx, block_coefs[2], 2, 0, energy); + refl_rms[3] = rescale_rms(ractx->lpc_refl_rms[0], energy); - int_to_int16(block_coefs[3], ractx->lpc_coef); + int_to_int16(block_coefs[3], ractx->lpc_coef[0]); for (c=0; c<4; c++) { do_output_subblock(ractx, block_coefs[c], refl_rms[c], &gb); @@ -376,9 +346,9 @@ static int ra144_decode_frame(AVCodecContext * avctx, } ractx->old_energy = energy; - ractx->lpc_refl_rms_old = ractx->lpc_refl_rms; + ractx->lpc_refl_rms[1] = ractx->lpc_refl_rms[0]; - FFSWAP(unsigned int *, ractx->lpc_coef_old, ractx->lpc_coef); + FFSWAP(unsigned int *, ractx->lpc_coef[0], ractx->lpc_coef[1]); *data_size = 2*160; return 20;