[asterisk-commits] russell: branch 1.6.1 r194724 - in /branches/1.6.1: ./ codecs/g722/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri May 15 13:05:14 2009
New Revision: 194724

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194724
Log:
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)

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/codecs/g722/g722_decode.c
    branches/1.6.1/codecs/g722/g722_encode.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/codecs/g722/g722_decode.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/codecs/g722/g722_decode.c?view=diff&rev=194724&r1=194723&r2=194724
==============================================================================
--- branches/1.6.1/codecs/g722/g722_decode.c (original)
+++ branches/1.6.1/codecs/g722/g722_decode.c Fri May 15 13:05:14 2009
@@ -370,7 +370,7 @@
         {
             if (s->eight_k)
             {
-                amp[outlen++] = (int16_t) rlow;
+                amp[outlen++] = (int16_t) (rlow << 1);
             }
             else
             {
@@ -387,8 +387,8 @@
                     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);
             }
         }
     }

Modified: branches/1.6.1/codecs/g722/g722_encode.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/codecs/g722/g722_encode.c?view=diff&rev=194724&r1=194723&r2=194724
==============================================================================
--- branches/1.6.1/codecs/g722/g722_encode.c (original)
+++ branches/1.6.1/codecs/g722/g722_encode.c Fri May 15 13:05:14 2009
@@ -279,7 +279,7 @@
         {
             if (s->eight_k)
             {
-                xlow = amp[j++];
+                xlow = amp[j++] >> 1;
             }
             else
             {
@@ -298,8 +298,8 @@
                     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 */