diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-03-09 21:35:55 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-03-09 21:35:55 +0000 |
| commit | f7e7888b2a87dc5999c8a9d3fb5901c4f88a22f6 (patch) | |
| tree | c5d28cf877e661ed084700b6bc3cf228ea247e0d /libavcodec/aacsbr.c | |
| parent | ac8d655a79e6699bd377ec97ae988587b7d2e9dd (diff) | |
| download | ffmpeg-f7e7888b2a87dc5999c8a9d3fb5901c4f88a22f6.tar.gz | |
aacsbr: Factor out the common end border case from t_q setup.
Originally committed as revision 22411 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aacsbr.c')
| -rw-r--r-- | libavcodec/aacsbr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index 8ca2403cfb..7afb47dae8 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -721,6 +721,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, 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 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr, 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; |