ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avutil/channel_layout: fix av_channel_layout_describe_bprint with custom and ambisonic channels

Browse Source 
bp->len cannot be used to detect if try_describe_ambisonic was successful
because the bprint buffer might contain other data as well.

Also describing an invalid ambisonic layout should not return 0 but
AVERROR(EINVAL) instead, so change try_describe_ambisonic to actually return
error on invalid ambisonics. This also allows us to fix the first issue.

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

8
libavutil/channel_layout.c
View File

@ -690,14 +690,14 @@ static int ambisonic_order(const AVChannelLayout *channel_layout)
/** /**
* If the custom layout is n-th order standard-order ambisonic, with optional * If the custom layout is n-th order standard-order ambisonic, with optional
* extra non-diegetic channels at the end, write its string description in bp. * extra non-diegetic channels at the end, write its string description in bp.
* Return a negative error code on error. * Return a negative error code otherwise.
*/ */
static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_layout) static int try_describe_ambisonic(AVBPrint *bp, const AVChannelLayout *channel_layout)
{ {
int nb_ambi_channels; int nb_ambi_channels;
int order = ambisonic_order(channel_layout); int order = ambisonic_order(channel_layout);
if (order < 0) if (order < 0)
return 0; return order;
av_bprintf(bp, "ambisonic %d", order); av_bprintf(bp, "ambisonic %d", order);
@ -749,8 +749,8 @@ int av_channel_layout_describe_bprint(const AVChannelLayout *channel_layout,
case AV_CHANNEL_ORDER_CUSTOM: case AV_CHANNEL_ORDER_CUSTOM:
if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM) { if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM) {
int res = try_describe_ambisonic(bp, channel_layout); int res = try_describe_ambisonic(bp, channel_layout);
if (res < 0 || bp->len) if (res >= 0)
return res; return 0;
} }
if (channel_layout->nb_channels) if (channel_layout->nb_channels)
av_bprintf(bp, "%d channels (", channel_layout->nb_channels); av_bprintf(bp, "%d channels (", channel_layout->nb_channels);