diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-10-17 21:00:39 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-10-17 21:00:39 +0000 |
| commit | fde82ca7e4e72226da99d86a9fa9689136461d14 (patch) | |
| tree | 5060829d8c5971a2edae793e05d28895a06dbdcf /libavcodec/x86 | |
| parent | a4cb675124a906126ba4ab307f0c17716f6d9adb (diff) | |
| download | ffmpeg-fde82ca7e4e72226da99d86a9fa9689136461d14.tar.gz | |
Move autocorrelation function from flacenc.c to lpc.c. Also rename the
corresponding dsputil functions and remove their dependency on the FLAC
encoder.
Fixes Issue1486.
Originally committed as revision 20266 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 6 | ||||
| -rw-r--r-- | libavcodec/x86/lpc_mmx.c (renamed from libavcodec/x86/flacdsp_mmx.c) | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 6059436252..2bf0fe1328 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -1348,8 +1348,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si #endif //HAVE_SSSE3 -/* FLAC specific */ -void ff_flac_compute_autocorr_sse2(const int32_t *data, int len, int lag, +void ff_lpc_compute_autocorr_sse2(const int32_t *data, int len, int lag, double *autoc); @@ -1414,8 +1413,7 @@ void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) c->sum_abs_dctelem= sum_abs_dctelem_sse2; c->hadamard8_diff[0]= hadamard8_diff16_sse2; c->hadamard8_diff[1]= hadamard8_diff_sse2; - if (CONFIG_FLAC_ENCODER) - c->flac_compute_autocorr = ff_flac_compute_autocorr_sse2; + c->lpc_compute_autocorr = ff_lpc_compute_autocorr_sse2; } #if HAVE_SSSE3 diff --git a/libavcodec/x86/flacdsp_mmx.c b/libavcodec/x86/lpc_mmx.c index 01c0d7ae8a..40fc678b7c 100644 --- a/libavcodec/x86/flacdsp_mmx.c +++ b/libavcodec/x86/lpc_mmx.c @@ -1,5 +1,5 @@ /* - * MMX optimized FLAC DSP utils + * MMX optimized LPC DSP utils * Copyright (c) 2007 Loren Merritt * * This file is part of FFmpeg. @@ -65,7 +65,7 @@ static void apply_welch_window_sse2(const int32_t *data, int len, double *w_data #undef WELCH } -void ff_flac_compute_autocorr_sse2(const int32_t *data, int len, int lag, +void ff_lpc_compute_autocorr_sse2(const int32_t *data, int len, int lag, double *autoc) { double tmp[len + lag + 2]; |