From aa55bc29f0d95767f2f89eb2496bb643d3f77f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= <nils@rockbox.org>
Date: Tue, 16 Oct 2012 21:03:22 +0200
Subject: [PATCH] opus: don't rely on stride being 1<<shift

Change-Id: I2d64fb20b2526d912eb665df0df4e87459676a92
---
 lib/rbcodec/codecs/libopus/celt/mdct.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/rbcodec/codecs/libopus/celt/mdct.c b/lib/rbcodec/codecs/libopus/celt/mdct.c
index 877366361d..0df77fd5ec 100644
--- a/lib/rbcodec/codecs/libopus/celt/mdct.c
+++ b/lib/rbcodec/codecs/libopus/celt/mdct.c
@@ -215,6 +215,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
 {
    int i;
    int N, N2, N4;
+   int tstride = 1<<shift;
    kiss_twiddle_scalar sine;
    VARDECL(kiss_fft_scalar, f);
    VARDECL(kiss_fft_scalar, f2);
@@ -261,8 +262,8 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
          *yp++ = yi + S_MUL(yr,sine);
          xp1+=2*stride;
          xp2-=2*stride;
-         t0 += stride;
-         t1 -= stride;
+         t0 += tstride;
+         t1 -= tstride;
       }
    }
 
@@ -285,8 +286,8 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
          /* works because the cos is nearly one */
          *fp++ = yr - S_MUL(yi,sine);
          *fp++ = yi + S_MUL(yr,sine);
-         t0 += stride;
-         t1 -= stride;
+         t0 += tstride;
+         t1 -= tstride;
       }
    }
    /* De-shuffle the components for the middle of the window only */