commit 737db27eee0de08141e1d9000f3bd4e59df90d47
author Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Aug 31 02:15:55 2016 -0400
committer Jean-Marc Valin <jmvalin@jmvalin.ca> Wed Aug 31 02:15:55 2016 -0400
tree f4111fc559942c7f0392b34efb0a269b0ab8c766
parent 37d4a2bb642931f8a177bbe57ea46d48d3cd0767

Only enable new hybrid folding behaviour with ENABLE_UPDATE_DRAFT

celt/bands.c

diff --git a/celt/bands.c b/celt/bands.c
index 80847f8..6f3c2db 100644
--- a/celt/bands.c
+++ b/celt/bands.c
@@ -1477,6 +1477,7 @@
          b = 0;
       }
 
+#ifdef ENABLE_UPDATE_DRAFT
       if (resynth && (M*eBands[i]-N >= M*eBands[start] || i==start+1) && (update_lowband || lowband_offset==0))
             lowband_offset = i;
       if (i == start+1)
@@ -1490,6 +1491,11 @@
          if (C==2)
             OPUS_COPY(&norm2[n1], &norm2[2*n1 - n2], n2-n1);
       }
+#else
+      if (resynth && M*eBands[i]-N >= M*eBands[start] && (update_lowband || lowband_offset==0))
+            lowband_offset = i;
+#endif
+
       tf_change = tf_res[i];
       ctx.tf_change = tf_change;
       if (i>=m->effEBands)
@@ -1514,7 +1520,11 @@
          fold_start = lowband_offset;
          while(M*eBands[--fold_start] > effective_lowband+norm_offset);
          fold_end = lowband_offset-1;
+#ifdef ENABLE_UPDATE_DRAFT
          while(++fold_end < i && M*eBands[fold_end] < effective_lowband+norm_offset+N);
+#else
+         while(M*eBands[++fold_end] < effective_lowband+norm_offset+N);
+#endif
          x_cm = y_cm = 0;
          fold_i = fold_start; do {
            x_cm |= collapse_masks[fold_i*C+0];