RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

af_lavcac3enc: refactor chmap adding into its own function 

This simplifies ifdeffery with AVChannelLayouts.
This commit is contained in:
Jan Ekström 2022-06-14 22:19:45 +03:00
parent 7a3f9af67f
commit 42b58c5698
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/filter/af_lavcac3enc.c
View File

@ -270,6 +270,18 @@ static const struct mp_filter_info af_lavcac3enc_filter = {
.destroy = destroy, .destroy = destroy,
}; };
static void add_chmaps_to_autoconv(struct mp_autoconvert *conv,
const struct AVCodec *codec)
{
const uint64_t *lch = codec->channel_layouts;
for (int n = 0; lch && lch[n]; n++) {
struct mp_chmap chmap = {0};
mp_chmap_from_lavc(&chmap, lch[n]);
if (mp_chmap_is_valid(&chmap))
mp_autoconvert_add_chmap(conv, &chmap);
}
}
static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent, static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
void *options) void *options)
{ {
@ -342,13 +354,7 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
mp_autoconvert_add_afmt(conv, mpfmt); mp_autoconvert_add_afmt(conv, mpfmt);
} }
const uint64_t *lch = s->lavc_acodec->channel_layouts; add_chmaps_to_autoconv(conv, s->lavc_acodec);
for (int n = 0; lch && lch[n]; n++) {
struct mp_chmap chmap = {0};
mp_chmap_from_lavc(&chmap, lch[n]);
if (mp_chmap_is_valid(&chmap))
mp_autoconvert_add_chmap(conv, &chmap);
}
// At least currently, the AC3 encoder doesn't export sample rates. // At least currently, the AC3 encoder doesn't export sample rates.
mp_autoconvert_add_srate(conv, 48000); mp_autoconvert_add_srate(conv, 48000);