public
/
rtphone
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- some g729 related symbols conflicted with opencore amr libraries

This commit is contained in:
Dmytro Bogovych 2019-03-21 15:00:21 +02:00
parent 2492e5dfc4
commit 3fa88ff9d4
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/libg729/g729_lpc_729.cpp
View File

@ -98,7 +98,7 @@ Lag_window (Word16 m, /* (i) : LPC order */
Word32 x; Word32 x;
for (i = 1; i <= m; i++) { for (i = 1; i <= m; i++) {
x = Mpy_32 (r_h[i], r_l[i], lag_h[i - 1], lag_l[i - 1]); x = Mpy_32 (r_h[i], r_l[i], g729_lag_h[i - 1], g729_lag_l[i - 1]);
L_Extract (x, &r_h[i], &r_l[i]); L_Extract (x, &r_h[i], &r_l[i]);
} }
return; return;
@ -415,7 +415,7 @@ Az_lsp (Word16 a[], /* (i) Q12 : predictor coefficients */
coef = f1; coef = f1;
xlow = grid[0]; xlow = g729_grid[0];
ylow = (*pChebps) (xlow, coef, NC); ylow = (*pChebps) (xlow, coef, NC);
j = 0; j = 0;
@ -423,7 +423,7 @@ Az_lsp (Word16 a[], /* (i) Q12 : predictor coefficients */
j = add (j, 1); j = add (j, 1);
xhigh = xlow; xhigh = xlow;
yhigh = ylow; yhigh = ylow;
xlow = grid[j]; xlow = g729_grid[j];
ylow = (*pChebps) (xlow, coef, NC); ylow = (*pChebps) (xlow, coef, NC);
L_temp = L_mult (ylow, yhigh); L_temp = L_mult (ylow, yhigh);

2
src/libs/libg729/g729_lpcfunc.cpp
View File

@ -154,7 +154,7 @@ Lsp_lsf (Word16 lsp[], /* (i) Q15 : lsp[m] (range: -1<=val<1) */
/* acos(lsp[i])= ind*256 + ( ( lsp[i]-table[ind] ) * slope[ind] )/4096 */ /* acos(lsp[i])= ind*256 + ( ( lsp[i]-table[ind] ) * slope[ind] )/4096 */
L_tmp = L_mult (sub (lsp[i], table[ind]), slope[ind]); L_tmp = L_mult (sub (lsp[i], table[ind]), g729_slope[ind]);
tmp = wround (L_shl (L_tmp, 3)); /*(lsp[i]-table[ind])*slope[ind])>>12 */ tmp = wround (L_shl (L_tmp, 3)); /*(lsp[i]-table[ind])*slope[ind])>>12 */
lsf[i] = add (tmp, shl (ind, 8)); lsf[i] = add (tmp, shl (ind, 8));
} }

10
src/libs/libg729/g729_tab_ld8a.cpp
View File

@ -65,7 +65,7 @@ Word16 hamwindow[L_WINDOW] = {
| lag_wind[10]= 0.89481968 | | lag_wind[10]= 0.89481968 |
-----------------------------------------------------*/ -----------------------------------------------------*/
Word16 lag_h[M10] = { Word16 g729_lag_h[M10] = {
32728, 32728,
32619, 32619,
32438, 32438,
@ -78,7 +78,7 @@ Word16 lag_h[M10] = {
29321 29321
}; };
Word16 lag_l[M10] = { Word16 g729_lag_l[M10] = {
11904, 11904,
17280, 17280,
30720, 30720,
@ -98,7 +98,7 @@ Word16 lag_l[M10] = {
/* table of cos(x) in Q15 */ /* table of cos(x) in Q15 */
Word16 table[65] = { Word16 g729_table[65] = {
32767, 32729, 32610, 32413, 32138, 31786, 31357, 30853, 32767, 32729, 32610, 32413, 32138, 31786, 31357, 30853,
30274, 29622, 28899, 28106, 27246, 26320, 25330, 24279, 30274, 29622, 28899, 28106, 27246, 26320, 25330, 24279,
23170, 22006, 20788, 19520, 18205, 16846, 15447, 14010, 23170, 22006, 20788, 19520, 18205, 16846, 15447, 14010,
@ -112,7 +112,7 @@ Word16 table[65] = {
/* slope in Q12 used to compute y = acos(x) */ /* slope in Q12 used to compute y = acos(x) */
Word16 slope[64] = { Word16 g729_slope[64] = {
-26887, -8812, -5323, -3813, -2979, -2444, -2081, -1811, -26887, -8812, -5323, -3813, -2979, -2444, -2081, -1811,
-1608, -1450, -1322, -1219, -1132, -1059, -998, -946, -1608, -1450, -1322, -1219, -1132, -1059, -998, -946,
-901, -861, -827, -797, -772, -750, -730, -713, -901, -861, -827, -797, -772, -750, -730, -713,
@ -538,7 +538,7 @@ Word16 fg_sum_inv[2][M10] = { /* Q12 */
*-------------------------------------------------------------*/ *-------------------------------------------------------------*/
/* Version 51 points */ /* Version 51 points */
Word16 grid[GRID_POINTS + 1] = { Word16 g729_grid[GRID_POINTS + 1] = {
32760, 32703, 32509, 32187, 31738, 31164, 32760, 32703, 32509, 32187, 31738, 31164,
30466, 29649, 28714, 27666, 26509, 25248, 30466, 29649, 28714, 27666, 26509, 25248,
23886, 22431, 20887, 19260, 17557, 15786, 23886, 22431, 20887, 19260, 17557, 15786,

8
src/libs/libg729/g729_tab_ld8a.h
View File

@ -8,10 +8,10 @@
*/ */
extern Word16 hamwindow[L_WINDOW]; extern Word16 hamwindow[L_WINDOW];
extern Word16 lag_h[M10]; extern Word16 g729_lag_h[M10];
extern Word16 lag_l[M10]; extern Word16 g729_lag_l[M10];
extern Word16 table[65]; extern Word16 table[65];
extern Word16 slope[64]; extern Word16 g729_slope[64];
extern Word16 table2[64]; extern Word16 table2[64];
extern Word16 slope_cos[64]; extern Word16 slope_cos[64];
extern Word16 slope_acos[64]; extern Word16 slope_acos[64];
@ -20,7 +20,7 @@ extern Word16 lspcb2[NC1][M10];
extern Word16 fg[2][MA_NP][M10]; extern Word16 fg[2][MA_NP][M10];
extern Word16 fg_sum[2][M10]; extern Word16 fg_sum[2][M10];
extern Word16 fg_sum_inv[2][M10]; extern Word16 fg_sum_inv[2][M10];
extern Word16 grid[GRID_POINTS + 1]; extern Word16 g729_grid[GRID_POINTS + 1];
extern Word16 inter_3l[FIR_SIZE_SYN]; extern Word16 inter_3l[FIR_SIZE_SYN];
extern Word16 g729_pred[4]; extern Word16 g729_pred[4];
extern Word16 gbk1[NCODE1][2]; extern Word16 gbk1[NCODE1][2];