mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808'
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808': aac: Forward errors properly in aac_decode_frame_int Conflicts: libavcodec/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d6c36fba0b
|
@ -2506,7 +2506,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
|
|||
int size;
|
||||
AACADTSHeaderInfo hdr_info;
|
||||
uint8_t layout_map[MAX_ELEM_ID*4][3];
|
||||
int layout_map_tags;
|
||||
int layout_map_tags, ret;
|
||||
|
||||
size = avpriv_aac_parse_header(gb, &hdr_info);
|
||||
if (size > 0) {
|
||||
|
@ -2520,12 +2520,15 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
|
|||
push_output_configuration(ac);
|
||||
if (hdr_info.chan_config) {
|
||||
ac->oc[1].m4ac.chan_config = hdr_info.chan_config;
|
||||
if (set_default_channel_config(ac->avctx, layout_map,
|
||||
&layout_map_tags, hdr_info.chan_config))
|
||||
return -7;
|
||||
if (output_configure(ac, layout_map, layout_map_tags,
|
||||
FFMAX(ac->oc[1].status, OC_TRIAL_FRAME), 0))
|
||||
return -7;
|
||||
if ((ret = set_default_channel_config(ac->avctx,
|
||||
layout_map,
|
||||
&layout_map_tags,
|
||||
hdr_info.chan_config)) < 0)
|
||||
return ret;
|
||||
if ((ret = output_configure(ac, layout_map, layout_map_tags,
|
||||
FFMAX(ac->oc[1].status,
|
||||
OC_TRIAL_FRAME), 0)) < 0)
|
||||
return ret;
|
||||
} else {
|
||||
ac->oc[1].m4ac.chan_config = 0;
|
||||
/**
|
||||
|
@ -2572,22 +2575,19 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
|
|||
ac->frame = data;
|
||||
|
||||
if (show_bits(gb, 12) == 0xfff) {
|
||||
if (parse_adts_frame_header(ac, gb) < 0) {
|
||||
if ((err = parse_adts_frame_header(ac, gb)) < 0) {
|
||||
av_log(avctx, AV_LOG_ERROR, "Error decoding AAC frame header.\n");
|
||||
err = -1;
|
||||
goto fail;
|
||||
}
|
||||
if (ac->oc[1].m4ac.sampling_index > 12) {
|
||||
av_log(ac->avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", ac->oc[1].m4ac.sampling_index);
|
||||
err = -1;
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
if (frame_configure_elements(avctx) < 0) {
|
||||
err = -1;
|
||||
if ((err = frame_configure_elements(avctx)) < 0)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
ac->tags_mapped = 0;
|
||||
// parse
|
||||
|
@ -2598,7 +2598,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
|
|||
if (!(che=get_che(ac, elem_type, elem_id))) {
|
||||
av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n",
|
||||
elem_type, elem_id);
|
||||
err = -1;
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
samples = 1024;
|
||||
|
@ -2656,7 +2656,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
|
|||
elem_id += get_bits(gb, 8) - 1;
|
||||
if (get_bits_left(gb) < 8 * elem_id) {
|
||||
av_log(avctx, AV_LOG_ERROR, "TYPE_FIL: "overread_err);
|
||||
err = -1;
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
while (elem_id > 0)
|
||||
|
@ -2665,7 +2665,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
|
|||
break;
|
||||
|
||||
default:
|
||||
err = -1; /* should not happen, but keeps compiler happy */
|
||||
err = AVERROR_BUG; /* should not happen, but keeps compiler happy */
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -2677,7 +2677,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
|
|||
|
||||
if (get_bits_left(gb) < 3) {
|
||||
av_log(avctx, AV_LOG_ERROR, overread_err);
|
||||
err = -1;
|
||||
err = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue