From f85bc147fb87de048ccc5767e186ac59ec0284ef Mon Sep 17 00:00:00 2001 From: Djordje Pesut Date: Mon, 20 Jul 2015 13:36:17 +0200 Subject: avcodec: Implementation of AAC_fixed_decoder (SBR-module) Add fixed poind code. Signed-off-by: Nedeljko Babic Signed-off-by: Michael Niedermayer --- libavcodec/sbrdsp_template.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'libavcodec/sbrdsp_template.c') diff --git a/libavcodec/sbrdsp_template.c b/libavcodec/sbrdsp_template.c index 410671e143..b649dfd7ee 100644 --- a/libavcodec/sbrdsp_template.c +++ b/libavcodec/sbrdsp_template.c @@ -20,55 +20,55 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -static void sbr_sum64x5_c(float *z) +static void sbr_sum64x5_c(INTFLOAT *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]; + INTFLOAT f = z[k] + z[k + 64] + z[k + 128] + z[k + 192] + z[k + 256]; z[k] = f; } } -static void sbr_qmf_deint_bfly_c(float *v, const float *src0, const float *src1) +static void sbr_qmf_deint_bfly_c(INTFLOAT *v, const INTFLOAT *src0, const INTFLOAT *src1) { int i; for (i = 0; i < 64; i++) { - v[ i] = src0[i] - src1[63 - i]; - v[127 - i] = src0[i] + src1[63 - i]; + v[ i] = AAC_SRA_R((src0[i] - src1[63 - i]), 5); + v[127 - i] = AAC_SRA_R((src0[i] + src1[63 - i]), 5); } } -static void sbr_hf_apply_noise_0(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, +static void sbr_hf_apply_noise_0(INTFLOAT (*Y)[2], const AAC_FLOAT *s_m, + const AAC_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); + sbr_hf_apply_noise(Y, s_m, q_filt, noise, (INTFLOAT)1.0, (INTFLOAT)0.0, m_max); } -static void sbr_hf_apply_noise_1(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, +static void sbr_hf_apply_noise_1(INTFLOAT (*Y)[2], const AAC_FLOAT *s_m, + const AAC_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); + INTFLOAT phi_sign = 1 - 2 * (kx & 1); + sbr_hf_apply_noise(Y, s_m, q_filt, noise, (INTFLOAT)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, +static void sbr_hf_apply_noise_2(INTFLOAT (*Y)[2], const AAC_FLOAT *s_m, + const AAC_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); + sbr_hf_apply_noise(Y, s_m, q_filt, noise, (INTFLOAT)-1.0, (INTFLOAT)0.0, m_max); } -static void sbr_hf_apply_noise_3(float (*Y)[2], const float *s_m, - const float *q_filt, int noise, +static void sbr_hf_apply_noise_3(INTFLOAT (*Y)[2], const AAC_FLOAT *s_m, + const AAC_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); + INTFLOAT phi_sign = 1 - 2 * (kx & 1); + sbr_hf_apply_noise(Y, s_m, q_filt, noise, (INTFLOAT)0.0, -phi_sign, m_max); } -av_cold void ff_sbrdsp_init(SBRDSPContext *s) +av_cold void AAC_RENAME(ff_sbrdsp_init)(SBRDSPContext *s) { s->sum64x5 = sbr_sum64x5_c; s->sum_square = sbr_sum_square_c; @@ -86,10 +86,12 @@ av_cold void ff_sbrdsp_init(SBRDSPContext *s) s->hf_apply_noise[2] = sbr_hf_apply_noise_2; s->hf_apply_noise[3] = sbr_hf_apply_noise_3; +#if !USE_FIXED if (ARCH_ARM) ff_sbrdsp_init_arm(s); if (ARCH_X86) ff_sbrdsp_init_x86(s); if (ARCH_MIPS) ff_sbrdsp_init_mips(s); +#endif /* !USE_FIXED */ } -- cgit v1.2.3