sigrid/mpv · Ink

DOCS/interface-changes.rst+2−0

     - fix --external-files: strictly never select any tracks from them, unless
       explicitly selected (this may or may not be expected)
     - --ytdl is now always enabled, even for libmpv
+    - add a number of --audio-resample-* options, which should from now on be
+      used instead of --af-defaults=lavrresample:...
  --- mpv 0.28.0 ---
     - rename --hwdec=mediacodec option to mediacodec-copy, to reflect
       conventions followed by other hardware video decoding APIs

DOCS/man/options.rst+38−10

@@ -1441,16 +1441,6 @@ Audio · 1440 unmodified lines
1441	want. For example, most A/V receivers connected via HDMI and that can	1441	want. For example, most A/V receivers connected via HDMI and that can
1442	do 7.1 would be served by: ``--audio-channels=7.1,5.1,stereo``	1442	do 7.1 would be served by: ``--audio-channels=7.1,5.1,stereo``
1443		1443
1444	``--audio-normalize-downmix=<yes\|no>``
1445	Enable/disable normalization if surround audio is downmixed to stereo
1446	(default: no). If this is disabled, downmix can cause clipping. If it's
1447	enabled, the output might be too silent. It depends on the source audio.
1448
1449	Technically, this changes the ``normalize`` suboption of the
1450	``lavrresample`` audio filter, which performs the downmixing.
1451
1452	If downmix happens outside of mpv for some reason, this has no effect.
1453
1454	``--audio-display=<no\|attachment>``	1444	``--audio-display=<no\|attachment>``
1455	Setting this option to ``attachment`` (default) will display image	1445	Setting this option to ``attachment`` (default) will display image
1456	attachments (e.g. album cover art) when playing audio files. It will	1446	attachments (e.g. album cover art) when playing audio files. It will
@@ -3453,6 +3443,44 @@ Software Scaler · 1996 unmodified lines
3453	``--sws-cvs=<v>``	3443	``--sws-cvs=<v>``
3454	Software scaler chroma vertical shifting. See ``--sws-scaler``.	3444	Software scaler chroma vertical shifting. See ``--sws-scaler``.
3455		3445
		3446	Audio Resampler
		3447	---------------
		3448
		3449	This controls the default options of any resampling done by mpv (but not within
		3450	libavfilter, within the system audio API resampler, or any other places).
		3451
		3452	It also sets the defaults for the ``lavrresample`` audio filter.
		3453
		3454	``--audio-resample-filter-size=<length>``
		3455	Length of the filter with respect to the lower sampling rate. (default:
		3456	16)
		3457
		3458	``--audio-resample-phase-shift=<count>``
		3459	Log2 of the number of polyphase entries. (..., 10->1024, 11->2048,
		3460	12->4096, ...) (default: 10->1024)
		3461
		3462	``--audio-resample-cutoff=<cutoff>``
		3463	Cutoff frequency (0.0-1.0), default set depending upon filter length.
		3464
		3465	``--audio-resample-linear=<yes\|no>``
		3466	If set then filters will be linearly interpolated between polyphase
		3467	entries. (default: no)
		3468
		3469	``--audio-normalize-downmix=<yes\|no>``
		3470	Enable/disable normalization if surround audio is downmixed to stereo
		3471	(default: no). If this is disabled, downmix can cause clipping. If it's
		3472	enabled, the output might be too quiet. It depends on the source audio.
		3473
		3474	Technically, this changes the ``normalize`` suboption of the
		3475	``lavrresample`` audio filter, which performs the downmixing.
		3476
		3477	If downmix happens outside of mpv for some reason, or in the decoder
		3478	(decoder downmixing), or in the audio output (system mixer), this has no
		3479	effect.
		3480
		3481	``--audio-swresample-o=<string>``
		3482	Set AVOptions on the SwrContext or AVAudioResampleContext. These should
		3483	be documented by FFmpeg or Libav.
3456		3484
3457	Terminal	3485	Terminal
3458	--------	3486	--------

audio/aconverter.c+20−8

@@ -86,6 +86,23 @@ struct mp_aconverter { · 85 unmodified lines
86	bool output_eof; // queued output EOF	86	bool output_eof; // queued output EOF
87	};	87	};
88		88
		89	#define OPT_BASE_STRUCT struct mp_resample_opts
		90	const struct m_sub_options resample_config = {
		91	.opts = (const m_option_t[]) {
		92	OPT_INTRANGE("audio-resample-filter-size", filter_size, 0, 0, 32),
		93	OPT_INTRANGE("audio-resample-phase-shift", phase_shift, 0, 0, 30),
		94	OPT_FLAG("audio-resample-linear", linear, 0),
		95	OPT_DOUBLE("audio-resample-cutoff", cutoff, M_OPT_RANGE,
		96	.min = 0, .max = 1),
		97	OPT_FLAG("audio-normalize-downmix", normalize, 0),
		98	OPT_KEYVALUELIST("audio-swresample-o", avopts, 0),
		99	{0}
		100	},
		101	.size = sizeof(struct mp_resample_opts),
		102	.defaults = &(const struct mp_resample_opts)MP_RESAMPLE_OPTS_DEF,
		103	.change_flags = UPDATE_AUDIO,
		104	};
		105
89	#if HAVE_LIBAVRESAMPLE	106	#if HAVE_LIBAVRESAMPLE
90	static double get_delay(struct mp_aconverter *p)	107	static double get_delay(struct mp_aconverter *p)
91	{	108	{
@@ -211,12 +228,7 @@ static bool configure_lavrr(struct mp_aconverter *p, bool verbose) · 119 unmodified lines
211	cutoff = MPMAX(1.0 - 6.5 / (p->opts->filter_size + 8), 0.80);	228	cutoff = MPMAX(1.0 - 6.5 / (p->opts->filter_size + 8), 0.80);
212	av_opt_set_double(p->avrctx, "cutoff", cutoff, 0);	229	av_opt_set_double(p->avrctx, "cutoff", cutoff, 0);
213		230
214	int global_normalize;
215	mp_read_option_raw(p->global, "audio-normalize-downmix", &m_option_type_flag,
216	&global_normalize);
217	int normalize = p->opts->normalize;	231	int normalize = p->opts->normalize;
218	if (normalize < 0)
219	normalize = global_normalize;
220	#if HAVE_LIBSWRESAMPLE	232	#if HAVE_LIBSWRESAMPLE
221	av_opt_set_double(p->avrctx, "rematrix_maxval", normalize ? 1 : 1000, 0);	233	av_opt_set_double(p->avrctx, "rematrix_maxval", normalize ? 1 : 1000, 0);
222	#else	234	#else
@@ -628,9 +640,9 @@ struct mp_aconverter mp_aconverter_create(struct mpv_global global, · 405 unmodified lines
628	p->log = log;	640	p->log = log;
629	p->global = global;	641	p->global = global;
630		642
631	static const struct mp_resample_opts defs = MP_RESAMPLE_OPTS_DEF;	643	p->opts = opts;
632		644	if (!p->opts)
633	p->opts = opts ? opts : &defs;	645	p->opts = mp_get_config_group(p, global, &resample_config);
634		646
635	p->reorder_buffer = mp_aframe_pool_create(p);	647	p->reorder_buffer = mp_aframe_pool_create(p);
636	p->out_pool = mp_aframe_pool_create(p);	648	p->out_pool = mp_aframe_pool_create(p);

audio/aconverter.h+3−1

     .filter_size = 16,          \
     .cutoff      = 0.0,         \
     .phase_shift = 10,          \
-    .normalize   = -1,          \
+    .normalize   = 0,           \
     }
+extern const struct m_sub_options resample_config;
 struct mp_aconverter *mp_aconverter_create(struct mpv_global *global,
                                            struct mp_log *log,
                                            const struct mp_resample_opts *opts);

audio/filter/af.c+2−1

         .priv_size = af->priv_size,
         .priv_defaults = af->priv_defaults,
         .options = af->options,
+        .set_defaults = af->set_defaults,
         .p = af,
     };
     return true;
         .out_pool = mp_audio_pool_create(af),
     };
     struct m_config *config =
-        m_config_from_obj_desc_and_args(af, s->log, NULL, &desc,
+        m_config_from_obj_desc_and_args(af, s->log, s->global, &desc,
                                         name, s->opts->af_defs, args);
     if (!config)
         goto error;

audio/filter/af.h+2−0

@@ -52,6 +52,8 @@ struct af_info { · 51 unmodified lines
52	int priv_size;	52	int priv_size;
53	const void *priv_defaults;	53	const void *priv_defaults;
54	const struct m_option *options;	54	const struct m_option *options;
		55	// For m_obj_desc.set_defaults
		56	void (set_defaults)(struct mpv_global global, void *p);
55	};	57	};
56		58
57	// Linked list of audio filters	59	// Linked list of audio filters

audio/filter/af_lavrresample.c+26−0

 #include "common/av_common.h"
 #include "common/msg.h"
+#include "options/m_config.h"
 #include "options/m_option.h"
 #include "audio/filter/af.h"
 #include "audio/fmt-conversion.h"
     int allow_detach;
     double playback_speed;
     struct mp_resample_opts opts;
+    int global_normalize;
     struct mp_aconverter *converter;
 };
     af->filter_frame = filter;
     af->filter_out = filter_out;
+    if (s->opts.normalize < 0)
+        s->opts.normalize = s->global_normalize;
     s->converter = mp_aconverter_create(af->global, af->log, &s->opts);
     return AF_OK;
 }
+static void set_defaults(struct mpv_global *global, void *p)
+{
+    struct af_resample *s = p;
+    struct mp_resample_opts *opts = &s->opts;
+    struct mp_resample_opts *src_opts =
+        mp_get_config_group(s, global, &resample_config);
+    s->global_normalize = src_opts->normalize;
+    assert(!opts->avopts); // we don't set a default value, so it must be NULL
+    *opts = *src_opts;
+    opts->avopts = NULL;
+    struct m_option dummy = {.type = &m_option_type_keyvalue_list};
+    m_option_copy(&dummy, &opts->avopts, &src_opts->avopts);
+}
 #define OPT_BASE_STRUCT struct af_resample
 const struct af_info af_info_lavrresample = {
         OPT_KEYVALUELIST("o", opts.avopts, 0),
         {0}
     },
+    .set_defaults = set_defaults,
 };

options/m_config.c+12−5

     return config;
 }
-struct m_config *m_config_from_obj_desc(void *talloc_ctx, struct mp_log *log,
+static struct m_config *m_config_from_obj_desc(void *talloc_ctx,
-                                        struct m_obj_desc *desc)
+                                               struct mp_log *log,
+                                               struct mpv_global *global,
+                                               struct m_obj_desc *desc)
 {
-    return m_config_new(talloc_ctx, log, desc->priv_size, desc->priv_defaults,
+    struct m_config *c =
-                        desc->options);
+        m_config_new(talloc_ctx, log, desc->priv_size, desc->priv_defaults,
+                     desc->options);
+    c->global = global;
+    if (desc->set_defaults && c->global)
+        desc->set_defaults(c->global, c->optstruct);
+    return c;
 }
 // Like m_config_from_obj_desc(), but don't allocate option struct.
     struct mp_log *log, struct mpv_global *global, struct m_obj_desc *desc,
     const char *name, struct m_obj_settings *defaults, char **args)
 {
-    struct m_config *config = m_config_from_obj_desc(ta_parent, log, desc);
+    struct m_config *config = m_config_from_obj_desc(ta_parent, log, global, desc);
     for (int n = 0; defaults && defaults[n].name; n++) {
         struct m_obj_settings *entry = &defaults[n];

options/m_config.h+0−3

@@ -123,9 +123,6 @@ struct m_config m_config_new(void talloc_ctx, struct mp_log *log, · 122 unmodified lines
123	// mpv_global. Expected to be called at early init on the main m_config.	123	// mpv_global. Expected to be called at early init on the main m_config.
124	void m_config_create_shadow(struct m_config *config);	124	void m_config_create_shadow(struct m_config *config);
125		125
126	struct m_config m_config_from_obj_desc(void talloc_ctx, struct mp_log *log,
127	struct m_obj_desc *desc);
128
129	struct m_config m_config_from_obj_desc_noalloc(void talloc_ctx,	126	struct m_config m_config_from_obj_desc_noalloc(void talloc_ctx,
130	struct mp_log *log,	127	struct mp_log *log,
131	struct m_obj_desc *desc);	128	struct m_obj_desc *desc);

options/m_option.h+5−0

 struct m_config;
 struct mp_log;
 struct mpv_node;
+struct mpv_global;
 ///////////////////////////// Options types declarations ////////////////////
     bool hidden;
     // Callback to print custom help if "help" is passed
     void (*print_help)(struct mp_log *log);
+    // Callback that allows you to override the static default values. The
+    // pointer p points to the struct described by options/priv_size, with
+    // priv_defaults already applied. You can write to it to set any defaults.
+    void (*set_defaults)(struct mpv_global *global, void *p);
     // Set by m_obj_list_find(). If the requested name is an old alias, this
     // is set to the old name (while the name field uses the new name).
     const char *replaced_name;

options/options.c+4−1

 extern const struct m_sub_options cocoa_conf;
 extern const struct m_sub_options android_conf;
+extern const struct m_sub_options resample_config;
 static const struct m_sub_options screenshot_conf = {
     .opts = image_writer_opts,
     .size = sizeof(struct image_writer_opts),
     OPT_INTRANGE("audio-samplerate", force_srate, UPDATE_AUDIO, 1000, 16*48000),
     OPT_CHANNELS("audio-channels", audio_output_channels, UPDATE_AUDIO),
     OPT_AUDIOFORMAT("audio-format", audio_output_format, UPDATE_AUDIO),
-    OPT_FLAG("audio-normalize-downmix", audio_normalize, UPDATE_AUDIO),
     OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE, .min = 0.01, .max = 100.0),
     OPT_FLAG("audio-pitch-correction", pitch_correction, 0),
     OPT_STRING("record-file", record_file, M_OPT_FILE),
+    OPT_SUBSTRUCT("", resample_opts, resample_config, 0),
     OPT_SUBSTRUCT("", input_opts, input_config, 0),
     OPT_SUBSTRUCT("", vo, vo_sub_opts, 0),

options/options.h+2−1

     struct m_channels audio_output_channels;
     int audio_output_format;
-    int audio_normalize;
     int force_srate;
     double playback_speed;
     int pitch_correction;
     int wingl_dwm_flush;
+    struct mp_resample_opts *resample_opts;
     struct gl_video_opts *gl_video_opts;
     struct angle_opts *angle_opts;
     struct opengl_opts *opengl_opts;

audio: add global options for resampler defaults

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code