har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/ac3enc: Don't presume ch_layout to be AV_CHANNEL_ORDER_NATIVE

Browse Source 
It is perfectly legal for users to use a custom layout
that is equivalent to a supported native one.
In this case the union in AVChannelLayout is not an uint64_t mask,
but a pointer to a custom map.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-04-07 12:31:58 +02:00
parent 0e4dfa4709
commit c3fb0c5bab
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/ac3enc.c
View File

@ -2192,18 +2192,14 @@ av_cold int ff_ac3_encode_close(AVCodecContext *avctx)
static av_cold int set_channel_info(AVCodecContext *avctx)
{
AC3EncodeContext *s = avctx->priv_data;
uint64_t mask = av_channel_layout_subset(&avctx->ch_layout, ~(uint64_t)0);
int channels = avctx->ch_layout.nb_channels;
uint64_t mask = avctx->ch_layout.u.mask;
if (channels < 1 || channels > AC3_MAX_CHANNELS)
return AVERROR(EINVAL);
if (mask > 0x7FF)
return AVERROR(EINVAL);
if (!mask)
av_channel_layout_default(&avctx->ch_layout, channels);
mask = avctx->ch_layout.u.mask;
s->lfe_on = !!(mask & AV_CH_LOW_FREQUENCY);
s->channels = channels;
s->fbw_channels = channels - s->lfe_on;