Reindent

[ffmpeg] / libavcodec / ra144dec.c

diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c
index b47201ad174edafce4072a97879b35ccb97b2644..5b391d4675058984383a80c9910c82fcd4448bbd 100644 (file)
--- a/libavcodec/ra144dec.c
+++ b/libavcodec/ra144dec.c
@@ -26,7 +26,6 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "ra144.h"
-#include "celp_filters.h"
 
 
 static av_cold int ra144_decode_init(AVCodecContext * avctx)
@@ -45,39 +44,13 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
 static void do_output_subblock(RA144Context *ractx, const uint16_t  *lpc_coefs,
                                int gval, GetBitContext *gb)
 {
-    uint16_t buffer_a[40];
-    uint16_t *block;
     int cba_idx = get_bits(gb, 7); // index of the adaptive CB, 0 if none
     int gain    = get_bits(gb, 8);
     int cb1_idx = get_bits(gb, 7);
     int cb2_idx = get_bits(gb, 7);
-    int m[3];
-
-    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;
-    } else {
-        m[0] = 0;
-    }
-
-    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(block, gain, cba_idx, m, cba_idx? buffer_a: NULL,
-            cb1_vects[cb1_idx], cb2_vects[cb2_idx]);
-
-    memcpy(ractx->curr_sblock, ractx->curr_sblock + 40,
-           10*sizeof(*ractx->curr_sblock));
 
-    if (ff_celp_lp_synthesis_filter(ractx->curr_sblock + 10, lpc_coefs,
-                                    block, BLOCKSIZE, 10, 1, 0xfff))
-        memset(ractx->curr_sblock, 0, 50*sizeof(*ractx->curr_sblock));
+    ff_subblock_synthesis(ractx, lpc_coefs, cba_idx, cb1_idx, cb2_idx, gval,
+                          gain);
 }
 
 /** Uncompress one block (20 bytes -> 160*2 bytes). */
@@ -109,20 +82,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);