changeset 11448:9fd8da0f1a50 libavcodec

aacsbr: Factor out the common end border case from t_q setup.
author alexc
date Tue, 09 Mar 2010 21:35:55 +0000
parents 826c8ee54ae9
children e62f45fd47d4
files aacsbr.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/aacsbr.c	Tue Mar 09 21:29:43 2010 +0000
+++ b/aacsbr.c	Tue Mar 09 21:35:55 2010 +0000
@@ -721,6 +721,7 @@
     ch_data->bs_num_noise = (ch_data->bs_num_env > 1) + 1;
 
     ch_data->t_q[0] = ch_data->t_env[0];
+    ch_data->t_q[ch_data->bs_num_noise] = ch_data->t_env[ch_data->bs_num_env];
     if (ch_data->bs_num_noise > 1) {
         unsigned int idx;
         if (ch_data->bs_frame_class == FIXFIX) {
@@ -736,9 +737,7 @@
                 idx = bs_pointer - 1;
         }
         ch_data->t_q[1] = ch_data->t_env[idx];
-        ch_data->t_q[2] = ch_data->t_env[ch_data->bs_num_env];
-    } else
-        ch_data->t_q[1] = ch_data->t_env[ch_data->bs_num_env];
+    }
 
     ch_data->e_a[0] = -(ch_data->e_a[1] != bs_num_env_old); // l_APrev
     ch_data->e_a[1] = -1;