virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

avcodec/opus: always use ambisonic layout for mapping family 2

Browse Source 
No need to use a Custom layout when the non diegetic channels can be
described as a standard mask.

This fixes:

45684/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBOPUS_fuzzer-5039410989629440

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-03-17 22:41:12 -03:00
parent a24e6ca8bf
commit efdde028bb
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/opus.c
View File

@ -399,21 +399,10 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx,
goto fail;
}
layout.order = AV_CHANNEL_ORDER_AMBISONIC;
layout.nb_channels = channels;
if (channels == (ambisonic_order + 1) * (ambisonic_order + 1)) {
layout.order = AV_CHANNEL_ORDER_AMBISONIC;
} else {
layout.order = AV_CHANNEL_ORDER_CUSTOM;
layout.u.map = av_calloc(channels, sizeof(*layout.u.map));
if (!layout.u.map) {
ret = AVERROR(ENOMEM);
goto fail;
}
for (i = 0; i < channels - 2; i++)
layout.u.map[i].id = AV_CHAN_AMBISONIC_BASE + i;
layout.u.map[channels - 2].id = AV_CHAN_FRONT_LEFT;
layout.u.map[channels - 1].id = AV_CHAN_FRONT_RIGHT;
}
if (channels != ((ambisonic_order + 1) * (ambisonic_order + 1)))
layout.u.mask = AV_CH_LAYOUT_STEREO;
} else {
layout.order = AV_CHANNEL_ORDER_UNSPEC;
layout.nb_channels = channels;