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/flacenc.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/flacenc.c')
| -rw-r--r-- | libavcodec/flacenc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 272d446b29..d6f0f87376 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -23,7 +23,6 @@ #include "libavutil/md5.h" #include "avcodec.h" #include "get_bits.h" -#include "dsputil.h" #include "golomb.h" #include "lpc.h" #include "flac.h" @@ -95,7 +94,7 @@ typedef struct FlacEncodeContext { FlacFrame frame; CompressionOptions options; AVCodecContext *avctx; - DSPContext dsp; + LPCContext lpc_ctx; struct AVMD5 *md5ctx; } FlacEncodeContext; @@ -217,7 +216,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) s->avctx = avctx; - dsputil_init(&s->dsp, avctx); + ff_lpc_init(&s->lpc_ctx); if (avctx->sample_fmt != AV_SAMPLE_FMT_S16) return -1; @@ -902,7 +901,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch) /* LPC */ sub->type = FLAC_SUBFRAME_LPC; - opt_order = ff_lpc_calc_coefs(&s->dsp, smp, n, min_order, max_order, + opt_order = ff_lpc_calc_coefs(&s->lpc_ctx, smp, n, min_order, max_order, s->options.lpc_coeff_precision, coefs, shift, s->options.lpc_type, s->options.lpc_passes, omethod, MAX_LPC_SHIFT, 0); |