|
|
@ -750,10 +750,10 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) |
|
|
|
|
|
|
|
|
|
|
|
s->chan_map = aac_chan_configs[s->channels-1]; |
|
|
|
s->chan_map = aac_chan_configs[s->channels-1]; |
|
|
|
|
|
|
|
|
|
|
|
if (ret = dsp_init(avctx, s)) |
|
|
|
if ((ret = dsp_init(avctx, s)) < 0) |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
|
|
|
|
|
|
|
|
if (ret = alloc_buffers(avctx, s)) |
|
|
|
if ((ret = alloc_buffers(avctx, s)) < 0) |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
|
|
|
|
|
|
|
|
avctx->extradata_size = 5; |
|
|
|
avctx->extradata_size = 5; |
|
|
@ -765,7 +765,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) |
|
|
|
lengths[1] = ff_aac_num_swb_128[i]; |
|
|
|
lengths[1] = ff_aac_num_swb_128[i]; |
|
|
|
for (i = 0; i < s->chan_map[0]; i++) |
|
|
|
for (i = 0; i < s->chan_map[0]; i++) |
|
|
|
grouping[i] = s->chan_map[i + 1] == TYPE_CPE; |
|
|
|
grouping[i] = s->chan_map[i + 1] == TYPE_CPE; |
|
|
|
if (ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths, s->chan_map[0], grouping)) |
|
|
|
if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths, |
|
|
|
|
|
|
|
s->chan_map[0], grouping)) < 0) |
|
|
|
goto fail; |
|
|
|
goto fail; |
|
|
|
s->psypp = ff_psy_preprocess_init(avctx); |
|
|
|
s->psypp = ff_psy_preprocess_init(avctx); |
|
|
|
s->coder = &ff_aac_coders[2]; |
|
|
|
s->coder = &ff_aac_coders[2]; |
|
|
|