[FFmpeg-soc] [soc]: r5503 - aac-sbr/aacsbr.c

[alexc]

Author: alexc
Date: Mon Dec  7 02:27:31 2009
New Revision: 5503

Log:
Index the SBR Y matrix consistently.

Index Y[old/new][k][l][re/im] like all the other major SBR matrices.
This can be revisited for optimization purposes once the decoder works
properly.

Modified:
   aac-sbr/aacsbr.c

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Sun Dec  6 23:48:44 2009	(r5502)
+++ aac-sbr/aacsbr.c	Mon Dec  7 02:27:31 2009	(r5503)
@@ -1596,9 +1596,9 @@ static void sbr_hf_assemble(float y[2][6
         for (i = sbr->t_env[ch][l] << 1; i < sbr->t_env[ch][l + 1] << 1; i++) {
             sbr->f_indexsine[i][0] = (((sbr->f_indexsine[i][1] + 1) & 3) + i - (sbr->t_env[ch][0] << 1)) & 3;
             for (m = 0; m < sbr->m; m++) {
-                y[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][0] =
+                y[0][m + sbr->k[3]][i + ENVELOPE_ADJUSTMENT_OFFSET][0] =
                     w_temp[i][m][0] + sbr->s_m_boost[l][m] * phi[0][sbr->f_indexsine[i][0]];
-                y[0][i + ENVELOPE_ADJUSTMENT_OFFSET][m + sbr->k[3]][1] =
+                y[0][m + sbr->k[3]][i + ENVELOPE_ADJUSTMENT_OFFSET][1] =
                     w_temp[i][m][1] + sbr->s_m_boost[l][m] * phi[1][sbr->f_indexsine[i][0]] * (1 - 2*((m + sbr->k[3]) & 1));
             }
         }