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

[alexc]

Author: alexc
Date: Wed Nov 18 13:08:18 2009
New Revision: 5447

Log:
Move ilb/ulb calculations to where their dependencies are present

Modified:
   aac-sbr/aacsbr.c

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Mon Nov 16 09:15:48 2009	(r5446)
+++ aac-sbr/aacsbr.c	Wed Nov 18 13:08:18 2009	(r5447)
@@ -1259,12 +1259,12 @@ static void sbr_env_estimate(float **e_c
                              int ch)
 {
     int i, l, m;
-    int ilb = sbr->t_env[ch][l]     * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
-    int iub = sbr->t_env[ch][l + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
 
     if (sbr->bs_interpol_freq) {
         for (l = 0; l < ch_data->bs_num_env[1]; l++) {
             const int env_size = (sbr->t_env[ch][l + 1] - sbr->t_env[ch][l]) << 1;
+            int ilb = sbr->t_env[ch][l]     * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
+            int iub = sbr->t_env[ch][l + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
 
             for (m = 0; m < sbr->m; m++) {
                 float sum = 0.0f;
@@ -1281,6 +1281,8 @@ static void sbr_env_estimate(float **e_c
 
         for (l = 0; l < ch_data->bs_num_env[1]; l++) {
             const int env_size = (sbr->t_env[ch][l + 1] - sbr->t_env[ch][l]) << 1;
+            int ilb = sbr->t_env[ch][l]     * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
+            int iub = sbr->t_env[ch][l + 1] * 2 + ENVELOPE_ADJUSTMENT_OFFSET;
             const uint16_t *table = ch_data->bs_freq_res[l + 1] ? sbr->f_tablehigh : sbr->f_tablelow;
 
             for (p = 0; p < sbr->n[ch_data->bs_freq_res[l + 1]]; p++) {