xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-23 19:49:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08'

Browse Source 
* commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08':
  aac: Validate the sbr sample rate before using the value

See cf5f4c5169

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-27 23:48:40 -03:00
commit e9a3880613
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/aacsbr_template.c
View File

@ -261,13 +261,6 @@ static int sbr_make_f_master(AACContext *ac, SpectralBandReplication *sbr,
const int8_t *sbr_offset_ptr;
int16_t stop_dk[13];
if (sbr->sample_rate < 32000) {
temp = 3000;
} else if (sbr->sample_rate < 64000) {
temp = 4000;
} else
temp = 5000;
switch (sbr->sample_rate) {
case 16000:
sbr_offset_ptr = sbr_offset[0];
@ -293,6 +286,13 @@ static int sbr_make_f_master(AACContext *ac, SpectralBandReplication *sbr,
return -1;
}
if (sbr->sample_rate < 32000) {
temp = 3000;
} else if (sbr->sample_rate < 64000) {
temp = 4000;
} else
temp = 5000;
start_min = ((temp << 7) + (sbr->sample_rate >> 1)) / sbr->sample_rate;
stop_min = ((temp << 8) + (sbr->sample_rate >> 1)) / sbr->sample_rate;