X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flpc.c;h=2093e7e8027fa6433dba5cb7c1cb9b65d775b2bb;hb=ade402804a0e811cd00862c90559121a793054a6;hp=6d7671c81fb8f0db07ac2ed11a8ccc1b9ba3ad9d;hpb=1c189fc5334d4a687b15861d81d22c8ba2c9cd5e;p=ffmpeg diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 6d7671c81fb..2093e7e8027 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -1,24 +1,25 @@ -/** +/* * LPC utility code * Copyright (c) 2006 Justin Ruggles * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/common.h" #include "libavutil/lls.h" #define LPC_USE_DOUBLE @@ -35,8 +36,9 @@ static void lpc_apply_welch_window_c(const int32_t *data, int len, double w; double c; - assert(!(len&1)); //the optimization in r11881 does not support odd len - //if someone wants odd len extend the change in r11881 + /* The optimization in commit fa4ed8c does not support odd len. + * If someone wants odd len extend that change. */ + assert(!(len & 1)); n2 = (len >> 1); c = 2.0 / (len - 1.0); @@ -146,19 +148,29 @@ static int estimate_best_order(double *ref, int min_order, int max_order) return est; } +int ff_lpc_calc_ref_coefs(LPCContext *s, + const int32_t *samples, int order, double *ref) +{ + double autoc[MAX_LPC_ORDER + 1]; + + s->lpc_apply_welch_window(samples, s->blocksize, s->windowed_samples); + s->lpc_compute_autocorr(s->windowed_samples, s->blocksize, order, autoc); + compute_ref_coefs(autoc, order, ref, NULL); + + return order; +} + /** * Calculate LPC coefficients for multiple orders * - * @param use_lpc LPC method for determining coefficients - * 0 = LPC with fixed pre-defined coeffs - * 1 = LPC with coeffs determined by Levinson-Durbin recursion - * 2+ = LPC with coeffs determined by Cholesky factorization using (use_lpc-1) passes. + * @param lpc_type LPC method for determining coefficients, + * see #FFLPCType for details */ int ff_lpc_calc_coefs(LPCContext *s, const int32_t *samples, int blocksize, int min_order, int max_order, int precision, int32_t coefs[][MAX_LPC_ORDER], int *shift, - enum AVLPCType lpc_type, int lpc_passes, + enum FFLPCType lpc_type, int lpc_passes, int omethod, int max_shift, int zero_shift) { double autoc[MAX_LPC_ORDER+1]; @@ -168,7 +180,7 @@ int ff_lpc_calc_coefs(LPCContext *s, int opt_order; assert(max_order >= MIN_LPC_ORDER && max_order <= MAX_LPC_ORDER && - lpc_type > AV_LPC_TYPE_FIXED); + lpc_type > FF_LPC_TYPE_FIXED); /* reinit LPC context if parameters have changed */ if (blocksize != s->blocksize || max_order != s->max_order || @@ -177,18 +189,16 @@ int ff_lpc_calc_coefs(LPCContext *s, ff_lpc_init(s, blocksize, max_order, lpc_type); } - if (lpc_type == AV_LPC_TYPE_LEVINSON) { - double *windowed_samples = s->windowed_samples + max_order; - - s->lpc_apply_welch_window(samples, blocksize, windowed_samples); + if (lpc_type == FF_LPC_TYPE_LEVINSON) { + s->lpc_apply_welch_window(samples, blocksize, s->windowed_samples); - s->lpc_compute_autocorr(windowed_samples, blocksize, max_order, autoc); + s->lpc_compute_autocorr(s->windowed_samples, blocksize, max_order, autoc); compute_lpc_coefs(autoc, max_order, &lpc[0][0], MAX_LPC_ORDER, 0, 1); for(i=0; iblocksize = blocksize; s->max_order = max_order; s->lpc_type = lpc_type; - if (lpc_type == AV_LPC_TYPE_LEVINSON) { - s->windowed_samples = av_mallocz((blocksize + max_order + 2) * - sizeof(*s->windowed_samples)); - if (!s->windowed_samples) + if (lpc_type == FF_LPC_TYPE_LEVINSON) { + s->windowed_buffer = av_mallocz((blocksize + 2 + FFALIGN(max_order, 4)) * + sizeof(*s->windowed_samples)); + if (!s->windowed_buffer) return AVERROR(ENOMEM); + s->windowed_samples = s->windowed_buffer + FFALIGN(max_order, 4); } else { s->windowed_samples = NULL; } @@ -259,7 +270,7 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order, s->lpc_apply_welch_window = lpc_apply_welch_window_c; s->lpc_compute_autocorr = lpc_compute_autocorr_c; - if (HAVE_MMX) + if (ARCH_X86) ff_lpc_init_x86(s); return 0; @@ -267,5 +278,5 @@ av_cold int ff_lpc_init(LPCContext *s, int blocksize, int max_order, av_cold void ff_lpc_end(LPCContext *s) { - av_freep(&s->windowed_samples); + av_freep(&s->windowed_buffer); }