diff options
Diffstat (limited to 'libavcodec/lsp.c')
| -rw-r--r-- | libavcodec/lsp.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libavcodec/lsp.c b/libavcodec/lsp.c index 8a05aed..17f59ea 100644 --- a/libavcodec/lsp.c +++ b/libavcodec/lsp.c @@ -4,20 +4,20 @@ * Copyright (c) 2007 Reynaldo H. Verdejo Pinochet (QCELP decoder) * Copyright (c) 2008 Vladimir Voroshilov * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg 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. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg 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 Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,6 +27,8 @@ #define FRAC_BITS 14 #include "mathops.h" #include "lsp.h" +#include "libavcodec/mips/lsp_mips.h" +#include "libavutil/avassert.h" void ff_acelp_reorder_lsf(int16_t* lsfq, int lsfq_min_distance, int lsfq_min, int lsfq_max, int lp_order) { @@ -73,7 +75,7 @@ static int16_t ff_cos(uint16_t arg) uint8_t offset= arg; uint8_t ind = arg >> 8; - assert(arg <= 0x3fff); + av_assert2(arg <= 0x3fff); return tab_cos[ind] + (offset * (tab_cos[ind+1] - tab_cos[ind]) >> 8); } @@ -173,7 +175,11 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd /* LSP values for first subframe (3.2.5 of G.729, Equation 24)*/ for(i=0; i<lp_order; i++) +#ifdef G729_BITEXACT + lsp_1st[i] = (lsp_2nd[i] >> 1) + (lsp_prev[i] >> 1); +#else lsp_1st[i] = (lsp_2nd[i] + lsp_prev[i]) >> 1; +#endif ff_acelp_lsp2lpc(lp_1st, lsp_1st, lp_order >> 1); @@ -181,6 +187,7 @@ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd ff_acelp_lsp2lpc(lp_2nd, lsp_2nd, lp_order >> 1); } +#ifndef ff_lsp2polyf void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) { int i, j; @@ -197,13 +204,14 @@ void ff_lsp2polyf(const double *lsp, double *f, int lp_half_order) f[1] += val; } } +#endif /* ff_lsp2polyf */ void ff_acelp_lspd2lpc(const double *lsp, float *lpc, int lp_half_order) { double pa[MAX_LP_HALF_ORDER+1], qa[MAX_LP_HALF_ORDER+1]; float *lpc2 = lpc + (lp_half_order << 1) - 1; - assert(lp_half_order <= MAX_LP_HALF_ORDER); + av_assert2(lp_half_order <= MAX_LP_HALF_ORDER); ff_lsp2polyf(lsp, pa, lp_half_order); ff_lsp2polyf(lsp + 1, qa, lp_half_order); |
