mirror of https://github.com/mpv-player/mpv
options: remove --af-adv
Anything this option did has been removed in the preceding 3 commits. Note that even though these options sounded like a good idea (like setting accuracy vs. speed tradeoffs), they were not really properly implemented.
This commit is contained in:
wm4
parent
08eecf070e
commit
abd5e8a2e7
|
|
@ -233,8 +233,7 @@ volume[=v[:sc[:fast]]]
|
|||
|
||||
This filter has a second feature: It measures the overall maximum sound
|
||||
level and prints out that level when mpv exits. This feature currently
|
||||
only works with floating-point data, use e.g. ``--af-adv=force=5``, or use
|
||||
``--af=stats``.
|
||||
only works with floating-point data.
|
||||
|
||||
*NOTE*: This filter is not reentrant and can therefore only be enabled
|
||||
once for every audio stream.
|
||||
|
|
|
|||
|
|
@ -44,40 +44,6 @@
|
|||
``--af-clr`` exist to modify a previously specified list, but you
|
||||
shouldn't need these for typical use.
|
||||
|
||||
--af-adv=<force=(0-7):list=(filters)>
|
||||
See also ``--af``.
|
||||
Specify advanced audio filter options:
|
||||
|
||||
force=<0-7>
|
||||
Forces the insertion of audio filters to one of the following:
|
||||
|
||||
0
|
||||
Use completely automatic filter insertion (currently identical to
|
||||
1).
|
||||
1
|
||||
Optimize for accuracy (default).
|
||||
2
|
||||
Optimize for speed. *Warning*: Some features in the audio filters
|
||||
may silently fail, and the sound quality may drop.
|
||||
3
|
||||
Use no automatic insertion of filters and no optimization.
|
||||
*Warning*: It may be possible to crash mpv using this setting.
|
||||
4
|
||||
Use automatic insertion of filters according to 0 above, but use
|
||||
floating point processing when possible.
|
||||
5
|
||||
Use automatic insertion of filters according to 1 above, but use
|
||||
floating point processing when possible.
|
||||
6
|
||||
Use automatic insertion of filters according to 2 above, but use
|
||||
floating point processing when possible.
|
||||
7
|
||||
Use no automatic insertion of filters according to 3 above, and
|
||||
use floating point processing when possible.
|
||||
|
||||
list=<filters>
|
||||
Same as ``--af``.
|
||||
|
||||
--aid=<ID|auto|no>
|
||||
Select audio channel. ``auto`` selects the default, ``no`` disables audio.
|
||||
See also ``--alang``.
|
||||
|
|
@ -1946,9 +1912,8 @@
|
|||
--srate=<Hz>
|
||||
Select the output sample rate to be used (of course sound cards have
|
||||
limits on this). If the sample frequency selected is different from that
|
||||
of the current media, the resample or lavcresample audio filter will be
|
||||
inserted into the audio filter layer to compensate for the difference. The
|
||||
type of resampling can be controlled by the ``--af-adv`` option.
|
||||
of the current media, the lavrresample audio filter will be
|
||||
inserted into the audio filter layer to compensate for the difference.
|
||||
|
||||
--start=<relative time>
|
||||
Seek to given time position.
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
int fakemono = 0;
|
||||
|
||||
struct af_cfg af_cfg = {1, NULL}; // Configuration for audio filters
|
||||
struct af_cfg af_cfg = {0}; // Configuration for audio filters
|
||||
|
||||
static int init_audio_codec(sh_audio_t *sh_audio, const char *decoder)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -81,9 +81,6 @@ static struct af_info* filter_list[] = {
|
|||
NULL
|
||||
};
|
||||
|
||||
// CPU speed
|
||||
int *af_cpu_speed = NULL;
|
||||
|
||||
/* Find a filter in the static list of filters using it's name. This
|
||||
function is used internally */
|
||||
static struct af_info *af_find(char *name)
|
||||
|
|
|
|||
|
|
@ -80,27 +80,8 @@ struct af_instance {
|
|||
bool auto_inserted; // inserted by af.c, such as conversion filters
|
||||
};
|
||||
|
||||
// Initialization flags
|
||||
extern int *af_cpu_speed;
|
||||
|
||||
#define AF_INIT_AUTO 0x00000000
|
||||
#define AF_INIT_SLOW 0x00000001
|
||||
#define AF_INIT_FAST 0x00000002
|
||||
#define AF_INIT_FORCE 0x00000003
|
||||
#define AF_INIT_TYPE_MASK 0x00000003
|
||||
|
||||
#define AF_INIT_INT 0x00000000
|
||||
#define AF_INIT_FLOAT 0x00000004
|
||||
#define AF_INIT_FORMAT_MASK 0x00000004
|
||||
|
||||
// Default init type
|
||||
#ifndef AF_INIT_TYPE
|
||||
#define AF_INIT_TYPE (af_cpu_speed ? *af_cpu_speed : AF_INIT_SLOW)
|
||||
#endif
|
||||
|
||||
// Configuration switches
|
||||
struct af_cfg {
|
||||
int force; // Initialization type
|
||||
char **list; /* list of names of filters that are added to filter
|
||||
list during first initialization of stream */
|
||||
};
|
||||
|
|
|
|||
|
|
@ -175,11 +175,6 @@ const m_option_t mfopts_conf[]={
|
|||
|
||||
#include "audio/filter/af.h"
|
||||
extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
|
||||
const m_option_t audio_filter_conf[]={
|
||||
{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
||||
{"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
|
||||
{NULL, NULL, 0, 0, 0, 0, NULL}
|
||||
};
|
||||
|
||||
extern int mp_msg_levels[MSGT_MAX];
|
||||
extern int mp_msg_level_all;
|
||||
|
|
@ -437,7 +432,6 @@ const m_option_t common_opts[] = {
|
|||
{"stereo", &fakemono, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
|
||||
|
||||
{"af*", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
||||
{"af-adv", (void *) audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
|
||||
OPT_SETTINGSLIST("vf*", vf_settings, 0, &vf_obj_list),
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue