RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 15:23:11 +00:00
Code Issues Projects Releases Wiki Activity

aacsbr: Move the e_a calculation from sbr_mapping() to read_sbr_grid().

Browse Source 
Originally committed as revision 22383 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-03-09 10:26:54 +00:00
parent b9c3e3b6e7
commit 7333f849b1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/aacsbr.c
View File

@ -763,6 +763,13 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr,
} else } else
ch_data->t_q[1] = ch_data->t_env[ch_data->bs_num_env[1]]; ch_data->t_q[1] = ch_data->t_env[ch_data->bs_num_env[1]];
ch_data->e_a[0] = -(ch_data->e_a[1] != ch_data->bs_num_env[0]); // l_APrev
ch_data->e_a[1] = -1;
if ((ch_data->bs_frame_class & 1) && ch_data->bs_pointer) { // FIXVAR or VARVAR and bs_pointer != 0
ch_data->e_a[1] = ch_data->bs_num_env[1] + 1 - ch_data->bs_pointer;
} else if ((ch_data->bs_frame_class == 2) && (ch_data->bs_pointer > 1)) // VARFIX and bs_pointer > 1
ch_data->e_a[1] = ch_data->bs_pointer - 1;
return 0; return 0;
} }
@ -771,6 +778,7 @@ static void copy_sbr_grid(SBRData *dst, const SBRData *src) {
dst->bs_freq_res[0] = dst->bs_freq_res[dst->bs_num_env[1]]; dst->bs_freq_res[0] = dst->bs_freq_res[dst->bs_num_env[1]];
dst->bs_num_env[0] = dst->bs_num_env[1]; dst->bs_num_env[0] = dst->bs_num_env[1];
dst->t_env_num_env_old = dst->t_env[dst->bs_num_env[0]]; dst->t_env_num_env_old = dst->t_env[dst->bs_num_env[0]];
dst->e_a[0] = -(dst->e_a[1] != dst->bs_num_env[0]);
//These variables are read from the bitstream and therefore copied //These variables are read from the bitstream and therefore copied
memcpy(dst->bs_freq_res+1, src->bs_freq_res+1, sizeof(dst->bs_freq_res)-sizeof(*dst->bs_freq_res)); memcpy(dst->bs_freq_res+1, src->bs_freq_res+1, sizeof(dst->bs_freq_res)-sizeof(*dst->bs_freq_res));
@ -784,6 +792,7 @@ static void copy_sbr_grid(SBRData *dst, const SBRData *src) {
dst->bs_num_noise = src->bs_num_noise; dst->bs_num_noise = src->bs_num_noise;
dst->bs_pointer = src->bs_pointer; dst->bs_pointer = src->bs_pointer;
dst->bs_frame_class = src->bs_frame_class; dst->bs_frame_class = src->bs_frame_class;
dst->e_a[1] = src->e_a[1];
} }
/// Read how the envelope and noise floor data is delta coded /// Read how the envelope and noise floor data is delta coded
@ -1464,13 +1473,6 @@ static void sbr_mapping(AACContext *ac, SpectralBandReplication *sbr,
{ {
int e, i, m; int e, i, m;
e_a[0] = -(e_a[1] != ch_data->bs_num_env[0]); // l_APrev
e_a[1] = -1;
if ((ch_data->bs_frame_class & 1) && ch_data->bs_pointer) { // FIXVAR or VARVAR and bs_pointer != 0
e_a[1] = ch_data->bs_num_env[1] + 1 - ch_data->bs_pointer;
} else if ((ch_data->bs_frame_class == 2) && (ch_data->bs_pointer > 1)) // VARFIX and bs_pointer > 1
e_a[1] = ch_data->bs_pointer - 1;
memset(ch_data->s_indexmapped[1], 0, 7*sizeof(ch_data->s_indexmapped[1])); memset(ch_data->s_indexmapped[1], 0, 7*sizeof(ch_data->s_indexmapped[1]));
for (e = 0; e < ch_data->bs_num_env[1]; e++) { for (e = 0; e < ch_data->bs_num_env[1]; e++) {
const unsigned int ilim = sbr->n[ch_data->bs_freq_res[e + 1]]; const unsigned int ilim = sbr->n[ch_data->bs_freq_res[e + 1]];