diff options
Diffstat (limited to 'libavcodec/sbrdsp.c')
| -rw-r--r-- | libavcodec/sbrdsp.c | 85 |
1 files changed, 9 insertions, 76 deletions
diff --git a/libavcodec/sbrdsp.c b/libavcodec/sbrdsp.c index b7917dc9af..cc432b6534 100644 --- a/libavcodec/sbrdsp.c +++ b/libavcodec/sbrdsp.c @@ -3,37 +3,31 @@ * Copyright (c) 2008-2009 Robert Swain ( rob opendot cl ) * Copyright (c) 2009-2010 Alex Converse <alex.converse@gmail.com> * - * 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 */ +#define USE_FIXED 0 + +#include "aac.h" #include "config.h" #include "libavutil/attributes.h" #include "libavutil/intfloat.h" #include "sbrdsp.h" -static void sbr_sum64x5_c(float *z) -{ - int k; - for (k = 0; k < 64; k++) { - float f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256]; - z[k] = f; - } -} - static float sbr_sum_square_c(float (*x)[2], int n) { float sum0 = 0.0f, sum1 = 0.0f; @@ -72,6 +66,7 @@ static void sbr_qmf_pre_shuffle_c(float *z) zi[64 + 2 * k + 2].i = zi[63 - k].i ^ (1U << 31); zi[64 + 2 * k + 3].i = zi[ k + 2].i; } + zi[64 + 2 * 31 + 0].i = zi[64 - 31].i ^ (1U << 31); zi[64 + 2 * 31 + 1].i = zi[31 + 1].i; } @@ -100,16 +95,6 @@ static void sbr_qmf_deint_neg_c(float *v, const float *src) } } -static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1) -{ - int i; - for (i = 0; i < 64; i++) { - v[ i] = src0[i] - src1[63 - i]; - v[127 - i] = src0[i] + src1[63 - i]; - } -} - - #if 0 /* This code is slower because it multiplies memory accesses. * It is left for educational purposes and because it may offer @@ -237,56 +222,4 @@ static av_always_inline void sbr_hf_apply_noise(float (*Y)[2], } } -static void sbr_hf_apply_noise_0(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, - int kx, int m_max) -{ - sbr_hf_apply_noise(Y, s_m, q_filt, noise, 1.0, 0.0, m_max); -} - -static void sbr_hf_apply_noise_1(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, - int kx, int m_max) -{ - float phi_sign = 1 - 2 * (kx & 1); - sbr_hf_apply_noise(Y, s_m, q_filt, noise, 0.0, phi_sign, m_max); -} - -static void sbr_hf_apply_noise_2(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, - int kx, int m_max) -{ - sbr_hf_apply_noise(Y, s_m, q_filt, noise, -1.0, 0.0, m_max); -} - -static void sbr_hf_apply_noise_3(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, - int kx, int m_max) -{ - float phi_sign = 1 - 2 * (kx & 1); - sbr_hf_apply_noise(Y, s_m, q_filt, noise, 0.0, -phi_sign, m_max); -} - -av_cold void ff_sbrdsp_init(SBRDSPContext *s) -{ - s->sum64x5 = sbr_sum64x5_c; - s->sum_square = sbr_sum_square_c; - s->neg_odd_64 = sbr_neg_odd_64_c; - s->qmf_pre_shuffle = sbr_qmf_pre_shuffle_c; - s->qmf_post_shuffle = sbr_qmf_post_shuffle_c; - s->qmf_deint_neg = sbr_qmf_deint_neg_c; - s->qmf_deint_bfly = sbr_qmf_deint_bfly_c; - s->autocorrelate = sbr_autocorrelate_c; - s->hf_gen = sbr_hf_gen_c; - s->hf_g_filt = sbr_hf_g_filt_c; - - s->hf_apply_noise[0] = sbr_hf_apply_noise_0; - s->hf_apply_noise[1] = sbr_hf_apply_noise_1; - s->hf_apply_noise[2] = sbr_hf_apply_noise_2; - s->hf_apply_noise[3] = sbr_hf_apply_noise_3; - - if (ARCH_ARM) - ff_sbrdsp_init_arm(s); - if (ARCH_X86) - ff_sbrdsp_init_x86(s); -} +#include "sbrdsp_template.c" |