mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'
* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0':
aacsbr: Fix type for index variable
See: a15adabdd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
45f62c74dd
|
@ -635,7 +635,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr,
|
||||||
GetBitContext *gb, SBRData *ch_data)
|
GetBitContext *gb, SBRData *ch_data)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
unsigned bs_pointer = 0;
|
int bs_pointer = 0;
|
||||||
// frameLengthFlag ? 15 : 16; 960 sample length frames unsupported; this value is numTimeSlots
|
// frameLengthFlag ? 15 : 16; 960 sample length frames unsupported; this value is numTimeSlots
|
||||||
int abs_bord_trail = 16;
|
int abs_bord_trail = 16;
|
||||||
int num_rel_lead, num_rel_trail;
|
int num_rel_lead, num_rel_trail;
|
||||||
|
@ -728,7 +728,7 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bs_pointer > ch_data->bs_num_env + 1) {
|
if (bs_pointer < 0 || bs_pointer > ch_data->bs_num_env + 1) {
|
||||||
av_log(ac->avctx, AV_LOG_ERROR,
|
av_log(ac->avctx, AV_LOG_ERROR,
|
||||||
"Invalid bitstream, bs_pointer points to a middle noise border outside the time borders table: %d\n",
|
"Invalid bitstream, bs_pointer points to a middle noise border outside the time borders table: %d\n",
|
||||||
bs_pointer);
|
bs_pointer);
|
||||||
|
@ -747,11 +747,11 @@ static int read_sbr_grid(AACContext *ac, SpectralBandReplication *sbr,
|
||||||
ch_data->t_q[0] = ch_data->t_env[0];
|
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];
|
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) {
|
if (ch_data->bs_num_noise > 1) {
|
||||||
unsigned int idx;
|
int idx;
|
||||||
if (ch_data->bs_frame_class == FIXFIX) {
|
if (ch_data->bs_frame_class == FIXFIX) {
|
||||||
idx = ch_data->bs_num_env >> 1;
|
idx = ch_data->bs_num_env >> 1;
|
||||||
} else if (ch_data->bs_frame_class & 1) { // FIXVAR or VARVAR
|
} else if (ch_data->bs_frame_class & 1) { // FIXVAR or VARVAR
|
||||||
idx = ch_data->bs_num_env - FFMAX((int)bs_pointer - 1, 1);
|
idx = ch_data->bs_num_env - FFMAX(bs_pointer - 1, 1);
|
||||||
} else { // VARFIX
|
} else { // VARFIX
|
||||||
if (!bs_pointer)
|
if (!bs_pointer)
|
||||||
idx = 1;
|
idx = 1;
|
||||||
|
|
Loading…
Reference in New Issue