From d05869267560f740305d44e8f5e8c9e036fd5857 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Fri, 31 Aug 2018 14:07:00 +0300 Subject: [PATCH] Add an fdk_ prefix to t_qua_gain7b This fixes symbol collisions, if libfdk-aac and libopencore-amr are statically linked into the same binary. --- libAACdec/src/usacdec_acelp.cpp | 4 ++-- libAACdec/src/usacdec_rom.cpp | 2 +- libAACdec/src/usacdec_rom.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libAACdec/src/usacdec_acelp.cpp b/libAACdec/src/usacdec_acelp.cpp index af1f488..ed775d2 100644 --- a/libAACdec/src/usacdec_acelp.cpp +++ b/libAACdec/src/usacdec_acelp.cpp @@ -267,9 +267,9 @@ static void D_gain2_plus(int index, FIXP_COD code[], FIXP_SGL *gain_pit, gcode0_e = gcode0_e + SF_MEAN_ENER_LG10 - (ener_code_e >> 1) + 1; i = index << 1; - *gain_pit = t_qua_gain7b[i]; /* adaptive codebook gain */ + *gain_pit = fdk_t_qua_gain7b[i]; /* adaptive codebook gain */ /* t_qua_gain[ind2p1] : fixed codebook gain correction factor */ - Ltmp = fMult(t_qua_gain7b[i + 1], gcode0); + Ltmp = fMult(fdk_t_qua_gain7b[i + 1], gcode0); *gain_code = scaleValue(Ltmp, gcode0_e - SF_GAIN_C + SF_QUA_GAIN7B); /* update bad frame handler */ diff --git a/libAACdec/src/usacdec_rom.cpp b/libAACdec/src/usacdec_rom.cpp index 519e992..ca3009e 100644 --- a/libAACdec/src/usacdec_rom.cpp +++ b/libAACdec/src/usacdec_rom.cpp @@ -1249,7 +1249,7 @@ const FIXP_LPC fdk_dec_dico_lsf_abs_8b[] = { adaptive codebook gain g_p (left column). Scaled by 2.0f. innovative codebook gain g_c (right column). Scaled by 16.0f. */ -const FIXP_SGL t_qua_gain7b[128 * 2] = { +const FIXP_SGL fdk_t_qua_gain7b[128 * 2] = { 204, 441, 464, 1977, 869, 1077, 1072, 3062, 1281, 4759, 1647, 1539, 1845, 7020, 1853, 634, 1995, 2336, 2351, 15400, 2661, 1165, 2702, 3900, 2710, 10133, 3195, 1752, 3498, 2624, 3663, 849, 3984, diff --git a/libAACdec/src/usacdec_rom.h b/libAACdec/src/usacdec_rom.h index 0ad4cb0..f969e90 100644 --- a/libAACdec/src/usacdec_rom.h +++ b/libAACdec/src/usacdec_rom.h @@ -132,7 +132,7 @@ extern const FIXP_LPC fdk_dec_dico_lsf_abs_8b[16 * 256]; /* ACELP tables */ #define SF_QUA_GAIN7B 4 -extern const FIXP_SGL t_qua_gain7b[128 * 2]; +extern const FIXP_SGL fdk_t_qua_gain7b[128 * 2]; extern const FIXP_SGL lsp_interpol_factor[2][NB_SUBFR]; /* For bass post filter */