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

af_lavcac3enc: switch to AVChannelLayout when available

This commit is contained in:
Jan Ekström 2022-06-14 22:36:54 +03:00
parent 42b58c5698
commit e7483ced5d
1 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
audio/filter/af_lavcac3enc.c
View File

@ -31,7 +31,10 @@
#include <libavutil/bswap.h> #include <libavutil/bswap.h>
#include <libavutil/mem.h> #include <libavutil/mem.h>
#include "config.h"
#include "audio/aframe.h" #include "audio/aframe.h"
#include "audio/chmap_avchannel.h"
#include "audio/chmap_sel.h" #include "audio/chmap_sel.h"
#include "audio/fmt-conversion.h" #include "audio/fmt-conversion.h"
#include "audio/format.h" #include "audio/format.h"
@ -104,8 +107,13 @@ static bool reinit(struct mp_filter *f)
// Put sample parameters // Put sample parameters
s->lavc_actx->sample_fmt = af_to_avformat(format); s->lavc_actx->sample_fmt = af_to_avformat(format);
#if !HAVE_AV_CHANNEL_LAYOUT
s->lavc_actx->channels = chmap.num; s->lavc_actx->channels = chmap.num;
s->lavc_actx->channel_layout = mp_chmap_to_lavc(&chmap); s->lavc_actx->channel_layout = mp_chmap_to_lavc(&chmap);
#else
mp_chmap_to_av_layout(&s->lavc_actx->ch_layout, &chmap);
#endif
s->lavc_actx->sample_rate = rate; s->lavc_actx->sample_rate = rate;
s->lavc_actx->bit_rate = bit_rate; s->lavc_actx->bit_rate = bit_rate;
@ -270,9 +278,11 @@ static const struct mp_filter_info af_lavcac3enc_filter = {
.destroy = destroy, .destroy = destroy,
}; };
static void add_chmaps_to_autoconv(struct mp_autoconvert *conv, static void add_chmaps_to_autoconv(struct mp_filter *f,
struct mp_autoconvert *conv,
const struct AVCodec *codec) const struct AVCodec *codec)
{ {
#if !HAVE_AV_CHANNEL_LAYOUT
const uint64_t *lch = codec->channel_layouts; const uint64_t *lch = codec->channel_layouts;
for (int n = 0; lch && lch[n]; n++) { for (int n = 0; lch && lch[n]; n++) {
struct mp_chmap chmap = {0}; struct mp_chmap chmap = {0};
@ -280,6 +290,24 @@ static void add_chmaps_to_autoconv(struct mp_autoconvert *conv,
if (mp_chmap_is_valid(&chmap)) if (mp_chmap_is_valid(&chmap))
mp_autoconvert_add_chmap(conv, &chmap); mp_autoconvert_add_chmap(conv, &chmap);
} }
#else
const AVChannelLayout *lch = codec->ch_layouts;
for (int n = 0; lch && lch[n].nb_channels; n++) {
struct mp_chmap chmap = {0};
if (!mp_chmap_from_av_layout(&chmap, &lch[n])) {
char layout[128] = {0};
MP_VERBOSE(f, "Skipping unsupported channel layout: %s\n",
av_channel_layout_describe(&lch[n],
layout, 128) < 0 ?
"undefined" : layout);
continue;
}
if (mp_chmap_is_valid(&chmap))
mp_autoconvert_add_chmap(conv, &chmap);
}
#endif
} }
static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent, static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
@ -322,7 +350,12 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
// parameters. (Not all decoders do that, but the ones we're interested // parameters. (Not all decoders do that, but the ones we're interested
// in do.) // in do.)
if (!s->lavc_acodec->sample_fmts || if (!s->lavc_acodec->sample_fmts ||
!s->lavc_acodec->channel_layouts) #if !HAVE_AV_CHANNEL_LAYOUT
!s->lavc_acodec->channel_layouts
#else
!s->lavc_acodec->ch_layouts
#endif
)
{ {
MP_ERR(f, "Audio encoder doesn't list supported parameters.\n"); MP_ERR(f, "Audio encoder doesn't list supported parameters.\n");
goto error; goto error;
@ -354,7 +387,7 @@ static struct mp_filter *af_lavcac3enc_create(struct mp_filter *parent,
mp_autoconvert_add_afmt(conv, mpfmt); mp_autoconvert_add_afmt(conv, mpfmt);
} }
add_chmaps_to_autoconv(conv, s->lavc_acodec); add_chmaps_to_autoconv(f, conv, s->lavc_acodec);
// 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);