shithub: opus

Download patch

ref: 6578ea0e2681ca45dda114e7f9c2256c293dc918
parent: 4fb956870990f7e121e54cec531382cdcb836346
author: Jean-Marc Valin <[email protected]>
date: Tue Apr 20 19:52:31 EDT 2010 

Re-enabled special stereo code for N=2


--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -610,10 +610,10 @@
          iside = bitexact_cos(16384-itheta);
          delta = (N-1)*(log2_frac(iside,BITRES+2)-log2_frac(imid,BITRES+2))>>2;
       }
-#if 0
+#if 1
       if (N==2)
       {
-         int c2;
+         int c, c2;
          int sign=1;
          celt_norm v[2], w[2];
          celt_norm *x2, *y2;
@@ -653,7 +653,7 @@
          if (q1 > 0)
          {
             int spread = fold ? B : 0;
-            alg_quant(v, N, q1, spread, enc);
+            alg_quant(v, N, q1, spread, resynth, enc);
          } else {
             v[0] = QCONST16(1.f, 14);
             v[1] = 0;
@@ -838,10 +838,10 @@
       }
       n = celt_sqrt(SHL32(EXTEND32(eBands[i+1]-eBands[i]),22));
 
-#if 0
+#if 1
       if (N==2)
       {
-         int c2;
+         int c, c2;
          int sign=1;
          celt_norm v[2], w[2];
          celt_norm *x2, *y2;