mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-03 01:39:58 +02:00
opus: export mapping family 2 (Ambisonic) as Ambisonic layout
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
886847afa0
commit
e6358ec1ac
@ -398,8 +398,22 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx,
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto fail;
|
||||
}
|
||||
layout.order = AV_CHANNEL_ORDER_UNSPEC;
|
||||
|
||||
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;
|
||||
}
|
||||
} else {
|
||||
layout.order = AV_CHANNEL_ORDER_UNSPEC;
|
||||
layout.nb_channels = channels;
|
||||
@ -450,8 +464,10 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx,
|
||||
}
|
||||
}
|
||||
|
||||
av_channel_layout_uninit(&avctx->ch_layout);
|
||||
avctx->ch_layout = layout;
|
||||
ret = av_channel_layout_copy(&avctx->ch_layout, &layout);
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
|
||||
s->nb_streams = streams;
|
||||
s->nb_stereo_streams = stereo_streams;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user