[FFmpeg-soc] [soc]: r5512 - in aac-sbr: aacsbr.c aacsbr.h

[alexc]

Author: alexc
Date: Tue Dec  8 07:14:49 2009
New Revision: 5512

Log:
Fix f_indexsine in an analogous manner.

Modified:
   aac-sbr/aacsbr.c
   aac-sbr/aacsbr.h

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Tue Dec  8 07:14:47 2009	(r5511)
+++ aac-sbr/aacsbr.c	Tue Dec  8 07:14:49 2009	(r5512)
@@ -1599,12 +1599,12 @@ static void sbr_hf_assemble(float y[2][6
 
     for (l = 0; l < ch_data->bs_num_env[1]; l++) {
         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;
+            sbr->f_indexsine[ch] = (sbr->f_indexsine[ch] + 1) & 3;
             for (m = 0; m < sbr->m; m++) {
                 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]];
+                    w_temp[i][m][0] + sbr->s_m_boost[l][m] * phi[0][sbr->f_indexsine[ch]];
                 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));
+                    w_temp[i][m][1] + sbr->s_m_boost[l][m] * phi[1][sbr->f_indexsine[ch]] * (1 - 2*((m + sbr->k[3]) & 1));
             }
         }
     }

Modified: aac-sbr/aacsbr.h
==============================================================================
--- aac-sbr/aacsbr.h	Tue Dec  8 07:14:47 2009	(r5511)
+++ aac-sbr/aacsbr.h	Tue Dec  8 07:14:49 2009	(r5512)
@@ -169,7 +169,7 @@ typedef struct {
     float              q_m_limboost[7][48];
     float              s_m_boost[7][48];
     uint16_t           f_indexnoise[2];
-    uint8_t            f_indexsine[42][2];
+    uint8_t            f_indexsine[2];
 } SpectralBandReplication;
 
 #endif /* AVCODEC_AACSBR_H */