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

[alexc]

Author: alexc
Date: Sat Dec  5 15:58:00 2009
New Revision: 5494

Log:
In envelope decoding i(k) is the replacement for k of the previous envelope (it does not replace l). Ref 4.6.18.3.4 "SBR envelope and noise floor decoding".

Modified:
   aac-sbr/aacsbr.c

Modified: aac-sbr/aacsbr.c
==============================================================================
--- aac-sbr/aacsbr.c	Sat Dec  5 15:57:58 2009	(r5493)
+++ aac-sbr/aacsbr.c	Sat Dec  5 15:58:00 2009	(r5494)
@@ -951,7 +951,7 @@ static void sbr_env_noise_floors(Spectra
                         if (sbr->f_tablelow[i]     <= sbr->f_tablehigh[k] &&
                             sbr->f_tablelow[i + 1] >  sbr->f_tablehigh[k])
                             break;
-                    sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][i][k] + delta * ch_data->bs_data_env[l][k];
+                    sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][l][i] + delta * ch_data->bs_data_env[l][k];
                 }
             } else {
                 i = 0; // optimisation : f_* are ascending freq bands so start at last i for each search
@@ -960,7 +960,7 @@ static void sbr_env_noise_floors(Spectra
                     for (; i < sbr->n[1]; i++)
                         if (sbr->f_tablehigh[i] == sbr->f_tablelow[k])
                             break;
-                    sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][i][k] + delta * ch_data->bs_data_env[l][k];
+                    sbr->env_facs[ch][l + 1][k] = sbr->env_facs[ch][l][i] + delta * ch_data->bs_data_env[l][k];
                 }
             }
         } else {