diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-01-21 00:11:44 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-23 19:32:06 +0100 |
| commit | 0d8837bdda4cad7e6c280d2648cef8077e54947b (patch) | |
| tree | dc589b85ee75d3debf012d8a95f18258dc5ba25f /libavcodec/ra144enc.c | |
| parent | d3058be6eefefe552f3b03820cc949bfa4e4f487 (diff) | |
| download | ffmpeg-0d8837bdda4cad7e6c280d2648cef8077e54947b.tar.gz | |
Move lpc_compute_autocorr() from DSPContext to a new struct LPCContext.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 56f8952b252f85281317ecd3e0b04c4cae93fd72)
Diffstat (limited to 'libavcodec/ra144enc.c')
| -rw-r--r-- | libavcodec/ra144enc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 9865dc9c04..3f8694eb8f 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -29,7 +29,6 @@ #include "avcodec.h" #include "put_bits.h" -#include "lpc.h" #include "celp_filters.h" #include "ra144.h" @@ -53,7 +52,7 @@ static av_cold int ra144_encode_init(AVCodecContext * avctx) ractx->lpc_coef[0] = ractx->lpc_tables[0]; ractx->lpc_coef[1] = ractx->lpc_tables[1]; ractx->avctx = avctx; - dsputil_init(&ractx->dsp, avctx); + ff_lpc_init(&ractx->lpc_ctx); return 0; } @@ -451,7 +450,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, uint8_t *frame, energy = ff_energy_tab[quantize(ff_t_sqrt(energy >> 5) >> 10, ff_energy_tab, 32)]; - ff_lpc_calc_coefs(&ractx->dsp, lpc_data, NBLOCKS * BLOCKSIZE, LPC_ORDER, + ff_lpc_calc_coefs(&ractx->lpc_ctx, lpc_data, NBLOCKS * BLOCKSIZE, LPC_ORDER, LPC_ORDER, 16, lpc_coefs, shift, AV_LPC_TYPE_LEVINSON, 0, ORDER_METHOD_EST, 12, 0); for (i = 0; i < LPC_ORDER; i++) |