diff options
Diffstat (limited to 'libavcodec/ra144.c')
| -rw-r--r-- | libavcodec/ra144.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index 355baddf33..fe9a5bcb3c 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -2,20 +2,20 @@ * Real Audio 1.0 (14.4K) * Copyright (c) 2003 the ffmpeg project * - * 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 */ @@ -1566,8 +1566,15 @@ int ff_eval_refl(int *refl, const int16_t *coefs, AVCodecContext *avctx) if (!b) b = -2; - for (j=0; j <= i; j++) - bp1[j] = ((bp2[j] - ((refl[i+1] * bp2[i-j]) >> 12)) * (0x1000000 / b)) >> 12; + b = 0x1000000 / b; + for (j=0; j <= i; j++) { +#if CONFIG_FTRAPV + int a = bp2[j] - ((refl[i+1] * bp2[i-j]) >> 12); + if((int)(a*(unsigned)b) != a*(int64_t)b) + return 1; +#endif + bp1[j] = ((bp2[j] - ((refl[i+1] * bp2[i-j]) >> 12)) * b) >> 12; + } if ((unsigned) bp1[i] + 0x1000 > 0x1fff) return 1; @@ -1687,12 +1694,12 @@ int ff_irms(const int16_t *data) return 0x20000000 / (ff_t_sqrt(sum) >> 8); } -void ff_subblock_synthesis(RA144Context *ractx, const uint16_t *lpc_coefs, +void ff_subblock_synthesis(RA144Context *ractx, const int16_t *lpc_coefs, int cba_idx, int cb1_idx, int cb2_idx, int gval, int gain) { - uint16_t buffer_a[BLOCKSIZE]; - uint16_t *block; + int16_t buffer_a[BLOCKSIZE]; + int16_t *block; int m[3]; if (cba_idx) { |