}
b->grad_boundary = get_bits(gb, 4);
- if (grad_range[0] >= grad_range[1] || grad_range[1] > 47)
+ if (grad_range[0] >= grad_range[1] || grad_range[1] > 31)
return AVERROR_INVALIDDATA;
if (b->grad_boundary > b->q_unit_cnt)
for (int i = 0; i < b->q_unit_cnt; i++) {
c->precision_fine[i] = 0;
if (c->precision_coarse[i] > 15) {
- c->precision_fine[i] = c->precision_coarse[i] - 15;
+ c->precision_fine[i] = FFMIN(c->precision_coarse[i], 30) - 15;
c->precision_coarse[i] = 15;
}
}
int ext_band = 0;
if (b->has_band_ext) {
- if (b->q_unit_cnt < 13)
+ if (b->q_unit_cnt < 13 || b->q_unit_cnt > 20)
return AVERROR_INVALIDDATA;
ext_band = at9_tab_band_ext_group[b->q_unit_cnt - 13][2];
if (stereo) {
b->channel[0].band_ext = get_bits(gb, 2);
b->channel[0].band_ext = ext_band > 2 ? b->channel[0].band_ext : 4;
- if (!get_bits(gb, 5))
+ if (!get_bits(gb, 5)) {
+ for (int i = 0; i <= stereo; i++) {
+ ATRAC9ChannelData *c = &b->channel[i];
+ const int count = at9_tab_band_ext_cnt[c->band_ext][ext_band];
+ for (int j = 0; j < count; j++) {
+ int len = at9_tab_band_ext_lengths[c->band_ext][ext_band][j];
+ c->band_ext_data[j] = av_clip_uintp2_c(c->band_ext_data[j], len);
+ }
+ }
+
return 0;
+ }
for (int i = 0; i <= stereo; i++) {
ATRAC9ChannelData *c = &b->channel[i];
av_lfg_init(&s->lfg, 0xFBADF00D);
+ if (avctx->block_align <= 0) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid block align\n");
+ return AVERROR_INVALIDDATA;
+ }
+
if (avctx->extradata_size != 12) {
av_log(avctx, AV_LOG_ERROR, "Invalid extradata length!\n");
return AVERROR_INVALIDDATA;
s->block_config = &at9_block_layout[block_config_idx];
avctx->channel_layout = s->block_config->channel_layout;
+ avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout);
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
if (get_bits1(&gb)) {