No need to use a Custom layout when the non diegetic channels can be
described as a standard mask.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/opus.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/libavcodec/opus.c b/libavcodec/opus.c
index 7eccc17e80..3540206347 100644
--- a/libavcodec/opus.c
+++ b/libavcodec/opus.c
@@ -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;
--
2.35.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
