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

avutil/channel_layout: do not copy alloc new map for extra channel layout

Browse Source 
Also use av_channel_layout_bprint directly for describing channel layout for
extra channels.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2022-03-15 20:55:53 +01:00
parent 92f27c6728
commit ab7a929684
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavutil/channel_layout.c
View File

@@ -705,29 +705,20 @@ static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_l
nb_ambi_channels = (order + 1) * (order + 1); nb_ambi_channels = (order + 1) * (order + 1);
if (nb_ambi_channels < channel_layout->nb_channels) { if (nb_ambi_channels < channel_layout->nb_channels) {
AVChannelLayout extra = { 0 }; AVChannelLayout extra = { 0 };
char buf[128];
if (channel_layout->order == AV_CHANNEL_ORDER_AMBISONIC) { if (channel_layout->order == AV_CHANNEL_ORDER_AMBISONIC) {
extra.order = AV_CHANNEL_ORDER_NATIVE; extra.order = AV_CHANNEL_ORDER_NATIVE;
extra.nb_channels = av_popcount64(channel_layout->u.mask); extra.nb_channels = av_popcount64(channel_layout->u.mask);
extra.u.mask = channel_layout->u.mask; extra.u.mask = channel_layout->u.mask;
} else { } else {
const AVChannelCustom *map = channel_layout->u.map;
extra.order = AV_CHANNEL_ORDER_CUSTOM; extra.order = AV_CHANNEL_ORDER_CUSTOM;
extra.nb_channels = channel_layout->nb_channels - nb_ambi_channels; extra.nb_channels = channel_layout->nb_channels - nb_ambi_channels;
extra.u.map = av_calloc(extra.nb_channels, sizeof(*extra.u.map)); extra.u.map = channel_layout->u.map + nb_ambi_channels;
if (!extra.u.map)
return AVERROR(ENOMEM);
memcpy(extra.u.map, &map[nb_ambi_channels],
sizeof(*extra.u.map) * extra.nb_channels);
} }
av_channel_layout_describe(&extra, buf, sizeof(buf)); av_bprint_chars(bp, '+', 1);
av_channel_layout_uninit(&extra); av_channel_layout_describe_bprint(&extra, bp);
/* Not calling uninit here on extra because we don't own the u.map pointer */
av_bprintf(bp, "+%s", buf);
} }
return 0; return 0;