kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shuttle some bits around to address some gain issues with G.722.

Browse Source 
(closes AST-209)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@194722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-05-15 17:59:08 +00:00
parent 66c76daba1
commit 19853c437e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codecs/g722/g722_decode.c
View File

@@ -370,7 +370,7 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[]
{ {
if (s->eight_k) if (s->eight_k)
{ {
amp[outlen++] = (int16_t) rlow; amp[outlen++] = (int16_t) (rlow << 1);
} }
else else
{ {
@@ -387,8 +387,8 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[]
xout2 += s->x[2*i]*qmf_coeffs[i]; xout2 += s->x[2*i]*qmf_coeffs[i];
xout1 += s->x[2*i + 1]*qmf_coeffs[11 - i]; xout1 += s->x[2*i + 1]*qmf_coeffs[11 - i];
} }
amp[outlen++] = (int16_t) (xout1 >> 12); amp[outlen++] = (int16_t) (xout1 >> 11);
amp[outlen++] = (int16_t) (xout2 >> 12); amp[outlen++] = (int16_t) (xout2 >> 11);
} }
} }
} }

6
codecs/g722/g722_encode.c
View File

@@ -279,7 +279,7 @@ int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[]
{ {
if (s->eight_k) if (s->eight_k)
{ {
xlow = amp[j++]; xlow = amp[j++] >> 1;
} }
else else
{ {
@@ -298,8 +298,8 @@ int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[]
sumodd += s->x[2*i]*qmf_coeffs[i]; sumodd += s->x[2*i]*qmf_coeffs[i];
sumeven += s->x[2*i + 1]*qmf_coeffs[11 - i]; sumeven += s->x[2*i + 1]*qmf_coeffs[11 - i];
} }
xlow = (sumeven + sumodd) >> 13; xlow = (sumeven + sumodd) >> 14;
xhigh = (sumeven - sumodd) >> 13; xhigh = (sumeven - sumodd) >> 14;
} }
} }
/* Block 1L, SUBTRA */ /* Block 1L, SUBTRA */