From 6ea6c8ebcfae8413311f087ecbcd07f0063c2529 Mon Sep 17 00:00:00 2001 From: Francesco Lavra Date: Fri, 11 Jun 2010 08:03:43 +0000 Subject: Add ff_ prefix to non-static functions Patch by Francesco Lavra (firstnamelastname@interfree.it) Originally committed as revision 23574 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ra144dec.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'libavcodec/ra144dec.c') diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index b47201ad17..b6888f5dc2 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -55,22 +55,22 @@ static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs, if (cba_idx) { cba_idx += BLOCKSIZE/2 - 1; - copy_and_dup(buffer_a, ractx->adapt_cb, cba_idx); - m[0] = (irms(buffer_a) * gval) >> 12; + ff_copy_and_dup(buffer_a, ractx->adapt_cb, cba_idx); + m[0] = (ff_irms(buffer_a) * gval) >> 12; } else { m[0] = 0; } - m[1] = (cb1_base[cb1_idx] * gval) >> 8; - m[2] = (cb2_base[cb2_idx] * gval) >> 8; + m[1] = (ff_cb1_base[cb1_idx] * gval) >> 8; + m[2] = (ff_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(block, gain, cba_idx, m, cba_idx? buffer_a: NULL, - cb1_vects[cb1_idx], cb2_vects[cb2_idx]); + ff_add_wav(block, gain, cba_idx, m, cba_idx? buffer_a: NULL, + ff_cb1_vects[cb1_idx], ff_cb2_vects[cb2_idx]); memcpy(ractx->curr_sblock, ractx->curr_sblock + 40, 10*sizeof(*ractx->curr_sblock)); @@ -109,20 +109,21 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *vdata, init_get_bits(&gb, buf, 20 * 8); for (i=0; i<10; i++) - lpc_refl[i] = lpc_refl_cb[i][get_bits(&gb, sizes[i])]; + lpc_refl[i] = ff_lpc_refl_cb[i][get_bits(&gb, sizes[i])]; - eval_coefs(ractx->lpc_coef[0], lpc_refl); - ractx->lpc_refl_rms[0] = rms(lpc_refl); + ff_eval_coefs(ractx->lpc_coef[0], lpc_refl); + ractx->lpc_refl_rms[0] = ff_rms(lpc_refl); - energy = energy_tab[get_bits(&gb, 5)]; + energy = ff_energy_tab[get_bits(&gb, 5)]; - refl_rms[0] = interp(ractx, block_coefs[0], 1, 1, ractx->old_energy); - refl_rms[1] = interp(ractx, block_coefs[1], 2, energy <= ractx->old_energy, - t_sqrt(energy*ractx->old_energy) >> 12); - refl_rms[2] = interp(ractx, block_coefs[2], 3, 0, energy); - refl_rms[3] = rescale_rms(ractx->lpc_refl_rms[0], energy); + refl_rms[0] = ff_interp(ractx, block_coefs[0], 1, 1, ractx->old_energy); + refl_rms[1] = ff_interp(ractx, block_coefs[1], 2, + energy <= ractx->old_energy, + ff_t_sqrt(energy*ractx->old_energy) >> 12); + refl_rms[2] = ff_interp(ractx, block_coefs[2], 3, 0, energy); + refl_rms[3] = ff_rescale_rms(ractx->lpc_refl_rms[0], energy); - int_to_int16(block_coefs[3], ractx->lpc_coef[0]); + ff_int_to_int16(block_coefs[3], ractx->lpc_coef[0]); for (i=0; i < 4; i++) { do_output_subblock(ractx, block_coefs[i], refl_rms[i], &gb); -- cgit v1.2.3