From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avcodec/opus: always use ambisonic layout for mapping family 2
Date: Thu, 17 Mar 2022 22:43:15 -0300
Message-ID: <20220318014315.12480-1-jamrial@gmail.com> (raw)
No need to use a Custom layout when the non diegetic channels can be
described as a standard mask.
Signed-off-by: James Almer <jamrial@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-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2022-03-18 1:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 1:43 James Almer [this message]
2022-03-20 22:09 ` Michael Niedermayer
2022-03-20 22:24 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220318014315.12480-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git