fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Martin Storsjo 2018-08-31 14:07:00 +03:00
parent b69a012832
commit d058692675
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libAACdec/src/usacdec_acelp.cpp
View File

@ -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; gcode0_e = gcode0_e + SF_MEAN_ENER_LG10 - (ener_code_e >> 1) + 1;
i = index << 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 */ /* 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); *gain_code = scaleValue(Ltmp, gcode0_e - SF_GAIN_C + SF_QUA_GAIN7B);
/* update bad frame handler */ /* update bad frame handler */

2
libAACdec/src/usacdec_rom.cpp
View File

@ -1249,7 +1249,7 @@ const FIXP_LPC fdk_dec_dico_lsf_abs_8b[] = {
adaptive codebook gain g_p (left column). Scaled by 2.0f. adaptive codebook gain g_p (left column). Scaled by 2.0f.
innovative codebook gain g_c (right column). Scaled by 16.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, 204, 441, 464, 1977, 869, 1077, 1072, 3062, 1281, 4759, 1647,
1539, 1845, 7020, 1853, 634, 1995, 2336, 2351, 15400, 2661, 1165, 1539, 1845, 7020, 1853, 634, 1995, 2336, 2351, 15400, 2661, 1165,
2702, 3900, 2710, 10133, 3195, 1752, 3498, 2624, 3663, 849, 3984, 2702, 3900, 2710, 10133, 3195, 1752, 3498, 2624, 3663, 849, 3984,

2
libAACdec/src/usacdec_rom.h
View File

@ -132,7 +132,7 @@ extern const FIXP_LPC fdk_dec_dico_lsf_abs_8b[16 * 256];
/* ACELP tables */ /* ACELP tables */
#define SF_QUA_GAIN7B 4 #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]; extern const FIXP_SGL lsp_interpol_factor[2][NB_SUBFR];
/* For bass post filter */ /* For bass post filter */