diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 18:05:14 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-15 18:05:14 +0000 |
| commit | c12ba0a64463607537f8e5da51273781102eb5ca (patch) | |
| tree | d1af0067cf8c7de4a82295b6a564ed7fea1f3c4f /codecs | |
| parent | f6a32f018d030f13b433cb5fe473bac02fd018ce (diff) | |
Merged revisions 194722 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r194722 | russell | 2009-05-15 12:59:08 -0500 (Fri, 15 May 2009) | 4 lines
Shuttle some bits around to address some gain issues with G.722.
(closes AST-209)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@194724 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/g722/g722_decode.c | 6 | ||||
| -rw-r--r-- | codecs/g722/g722_encode.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/codecs/g722/g722_decode.c b/codecs/g722/g722_decode.c index 1625acc86..3e8f7d0c6 100644 --- a/codecs/g722/g722_decode.c +++ b/codecs/g722/g722_decode.c @@ -370,7 +370,7 @@ int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[] { if (s->eight_k) { - amp[outlen++] = (int16_t) rlow; + amp[outlen++] = (int16_t) (rlow << 1); } 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]; xout1 += s->x[2*i + 1]*qmf_coeffs[11 - i]; } - amp[outlen++] = (int16_t) (xout1 >> 12); - amp[outlen++] = (int16_t) (xout2 >> 12); + amp[outlen++] = (int16_t) (xout1 >> 11); + amp[outlen++] = (int16_t) (xout2 >> 11); } } } diff --git a/codecs/g722/g722_encode.c b/codecs/g722/g722_encode.c index ad7e6b522..5890fbf24 100644 --- a/codecs/g722/g722_encode.c +++ b/codecs/g722/g722_encode.c @@ -279,7 +279,7 @@ int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[] { if (s->eight_k) { - xlow = amp[j++]; + xlow = amp[j++] >> 1; } 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]; sumeven += s->x[2*i + 1]*qmf_coeffs[11 - i]; } - xlow = (sumeven + sumodd) >> 13; - xhigh = (sumeven - sumodd) >> 13; + xlow = (sumeven + sumodd) >> 14; + xhigh = (sumeven - sumodd) >> 14; } } /* Block 1L, SUBTRA */ |