From e26d1318458e598bbea796508b812917d983cef6 Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Mon, 9 Nov 2009 12:06:19 +0000 Subject: Do not hardcode filter order in ff_acelp_lspd2lpc() Originally committed as revision 20485 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/lsp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'libavcodec/lsp.c') diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 09c9259..4209216 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -155,20 +155,19 @@ static void lsp2polyf(const double *lsp, double *f, int lp_half_order) } } -void ff_acelp_lspd2lpc(const double *lsp, float *lpc) +void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order) { - double pa[6], qa[6]; - int i; + double pa[lp_half_order+1], qa[lp_half_order+1]; + float *lpc2 = lpc + (lp_half_order << 1) - 1; - lsp2polyf(lsp, pa, 5); - lsp2polyf(lsp + 1, qa, 5); + lsp2polyf(lsp, pa, lp_half_order); + lsp2polyf(lsp + 1, qa, lp_half_order); - for (i=4; i>=0; i--) - { - double paf = pa[i+1] + pa[i]; - double qaf = qa[i+1] - qa[i]; + while (lp_half_order--) { + double paf = pa[lp_half_order+1] + pa[lp_half_order]; + double qaf = qa[lp_half_order+1] - qa[lp_half_order]; - lpc[i ] = 0.5*(paf+qaf); - lpc[9-i] = 0.5*(paf-qaf); + lpc [ lp_half_order] = 0.5*(paf+qaf); + lpc2[-lp_half_order] = 0.5*(paf-qaf); } } -- cgit v1.1