RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 12:25:03 +00:00
Code Issues Releases Wiki Activity
0b428e4482
mpv/options/options.c

659 lines
25 KiB
C
Raw Normal View History

Add license header to all top-level files missing them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
/*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
Add MPLAYER_ prefix to multiple inclusion guards. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
#ifndef MPLAYER_CFG_MPLAYER_H
#define MPLAYER_CFG_MPLAYER_H
Add multiple inclusion guards to all header files that lack them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:35:58 +00:00
new command line/config file parser git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@148 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-18 23:32:31 +00:00
/*
* config for cfgparser
*/
Start of new option system First part of option restructuring. The aim is to move option values from a huge number of separate globals to a single non-global struct. This part adds some support for parsing option values into such struct instances, and moves one example option (fixed-vo) to the struct.
2008-03-31 03:19:29 +00:00
#include <stddef.h>
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
#include <sys/types.h>
Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups.
2013-07-07 21:54:11 +00:00
#include <limits.h>
Start of new option system First part of option restructuring. The aim is to move option values from a huge number of separate globals to a single non-global struct. This part adds some support for parsing option values into such struct instances, and moves one example option (fixed-vo) to the struct.
2008-03-31 03:19:29 +00:00
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
#include "config.h"
win32: implement --priority differently Does anyone actually use this? For now, update it, because it's the only case left where an option points to a global variable (and not a struct offset).
2014-06-11 22:34:20 +00:00
#if HAVE_PRIORITY
#include <windows.h>
#endif
#include "options.h"
Move options/config related files from mpvcore/ to options/ Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
2013-12-17 01:02:25 +00:00
#include "m_config.h"
#include "m_option.h"
Don't include version.h from make options.c I find this annoying. It's the reason common/version.c exists at all. options.c did this for the user agent, which contains the version number. Because not including version.h means you can't build the user agent and use it in mp_default_opts anymore, do something rather awkward in main.c to initialize the default user agent.
2013-12-22 13:33:15 +00:00
#include "common/common.h"
Remove radio:// It was disabled by default, works only for analogue radio, and I bet nobody uses it.
2014-04-13 16:51:43 +00:00
#include "stream/stream.h"
Rename directories, move files (step 2 of 2) Finish renaming directories and moving files. Adjust all include statements to make the previous commit compile. The two commits are separate, because git is bad at tracking renames and content changes at the same time. Also take this as an opportunity to remove the separation between "common" and "mplayer" sources in the Makefile. ("common" used to be shared between mplayer and mencoder.)
2012-11-09 00:06:43 +00:00
#include "video/csputils.h"
Rename sub.c/.h to osd.c/.h This was way too misleading. osd.c merely calls the subtitle renderers, instead of actually dealing with subtitles.
2013-11-24 11:58:06 +00:00
#include "sub/osd.h"
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
#include "audio/mixer.h"
#include "audio/filter/af.h"
#include "audio/decode/dec_audio.h"
Rename mp_core.h to core.h Get rid of the mp_ prefix.
2013-12-17 00:08:53 +00:00
#include "player/core.h"
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
#include "player/command.h"
options: add --list-protocols option
2014-06-30 10:49:01 +00:00
#include "stream/stream.h"
added tv subsystem git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2791 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-11-09 23:46:06 +00:00
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
extern const char mp_help_text[];
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
static void print_version(struct mp_log *log)
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
{
m_option, m_config: mp_msg conversions Always pass around mp_log contexts in the option parser code. This of course affects all users of this API as well. In stream.c, pass a mp_null_log, because we can't do it properly yet. This will be fixed later.
2013-12-21 18:45:42 +00:00
mp_print_version(log, true);
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
}
static void print_help(struct mp_log *log)
{
mp_info(log, "%s", mp_help_text);
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
}
options: add --version
2013-05-15 13:14:24 +00:00
tv: remove global option variables Pretty much nothing changes, but using -tv-scan with suboptions doesn't work anymore (instead of "-tv-scan x" it's "-tv scan-x" now). Flat options ("-tv-scan-x") stay compatible.
2014-06-09 21:54:45 +00:00
extern const struct m_sub_options tv_params_conf;
stream_pvr: remove global option variables
2014-06-10 18:12:19 +00:00
extern const struct m_sub_options stream_pvr_conf;
stream_cdda: remove global option variables
2014-06-10 18:46:15 +00:00
extern const struct m_sub_options stream_cdda_conf;
stream_dvb: remove global option variables
2014-06-10 19:44:50 +00:00
extern const struct m_sub_options stream_dvb_conf;
stream_lavf: allow setting AVOptions with --stream-lavf-o This commit also creates a private option struct for stream_lavf.c, but since I'm lazy, I'm not moving any existing options to it.
2014-07-29 23:15:42 +00:00
extern const struct m_sub_options stream_lavf_conf;
options: remove global variables for swscale options; rename them Additionally to removing the global variables, this makes the options more uniform. --ssf-... becomes --sws-..., and --sws becomes --sws- scaler. For --sws-scaler, use choices instead of magic integer values.
2014-06-10 20:41:14 +00:00
extern const struct m_sub_options sws_conf;
demux_raw: remove global option variables
2014-06-10 21:06:42 +00:00
extern const struct m_sub_options demux_rawaudio_conf;
extern const struct m_sub_options demux_rawvideo_conf;
demux_lavf: make option struct local Similar to previous commits.
2014-06-10 23:46:20 +00:00
extern const struct m_sub_options demux_lavf_conf;
vd_lavc: make option struct local Removes specifics from options.h and options.c, and puts everything into vd_lavc.c.
2014-06-10 23:35:39 +00:00
extern const struct m_sub_options vd_lavc_conf;
ad_lavc: make option struct local Similar to previous commit.
2014-06-10 23:39:51 +00:00
extern const struct m_sub_options ad_lavc_conf;
input: make option struct local Similar to previous commits. This also renames --doubleclick-time to --input-doubleclick-time, and --key-fifo-size to --input-key-fifo-size. We could keep the old names, but these options are very obscure, and renaming them seems better for consistency.
2014-06-10 23:54:03 +00:00
extern const struct m_sub_options input_config;
encode: make option struct local Similar to previous commits.
2014-06-11 00:04:02 +00:00
extern const struct m_sub_options encode_config;
win32: implement --priority differently Does anyone actually use this? For now, update it, because it's the only case left where an option points to a global variable (and not a struct offset).
2014-06-11 22:34:20 +00:00
extern const struct m_sub_options image_writer_conf;
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
options: use m_config for options instead of m_struct For some reason, both m_config and m_struct are somewhat similar, except that m_config is much more powerful. m_config is used for VOs and some other things, so to unify them. We plan to kick out m_struct and use m_config for everything. (Unfortunately, m_config is also a bit more bloated, so this commit isn't all that great, but it will allow to reduce the option parser mess somewhat.) This commit also switches all video filters to use the option macros. One reason is that m_struct and m_config, even though they both use m_option, store the offsets of the option fields differently (sigh...), meaning the options defined for either are incompatible. It's easier to switch everything in one go. This commit will allow using the -vf option parser for other things, like VOs and AOs.
2013-07-21 17:33:08 +00:00
extern const struct m_obj_list vf_obj_list;
audio/filter: use new option API Make the VF/VO/AO option parser available to audio filters. No audio filter uses this yet, but it's still a quite intrusive change. In particular, the commands for manipulating filters at runtime completely change. We delete the old code, and use the same infrastructure as for video filters. (This forces complete reinitialization of the filter chain, which hopefully isn't a problem for any use cases. The old code forced reinitialization too, but it could potentially allow a filter to cache things; e.g. consider loaded ladspa plugins and such.)
2013-07-22 12:43:58 +00:00
extern const struct m_obj_list af_obj_list;
options: use new code for parsing --vo Nothing should change from user perspective. mpv --vo=opengl:help now works. Remove the vo_opengl inline help text. The new code can list option names for you, but that's it. Refer to the manpage if you have trouble.
2013-07-21 19:17:48 +00:00
extern const struct m_obj_list vo_obj_list;
options: use new option code for --ao This requires completely refactoring the AO creation code too.
2013-07-21 19:33:17 +00:00
extern const struct m_obj_list ao_obj_list;
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
m_option: don't define OPT_BASE_STRUCT by default OPT_BASE_STRUCT defines which struct the OPT_ macros (like OPT_INT etc.) reference implicitly, since these macros take struct member names but no struct type. Normally, only cfg-mplayer.h should need this, and other places shouldn't be bothered with having to #undef it. (Some files, like demux_lavf.c, still store their options in MPOpts. In the long term, this should be removed, and handled like e.g. with VO suboptions instead.)
2013-03-01 10:27:59 +00:00
#define OPT_BASE_STRUCT struct MPOpts
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
const m_option_t mp_opts[] = {
msg: remove global state
2013-12-21 22:11:12 +00:00
// handled in command line pre-parser (parse_commandline.c)
options: remove some unneeded stuff No options pointing to global variables are in use anymore, so that part can be removed.
2014-06-13 00:16:47 +00:00
{"v", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG, .offset = -1},
{"playlist", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN | M_OPT_FIXED,
.min = 1, .offset = -1},
{"{", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1},
{"}", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1},
m_config: refactor some things Change how m_config is initialized. Make it more uniform; now all m_config structs are intialized in exactly the same way. Make sure there's only a single m_option[] array defining the options, and keep around the pointer to the optstruct default value, and the optstruct size as well. This will allow reconstructing the option default values in the following commit. In particular, stop pretending that the handling of some special options (like --profile, --v, and some others) is in any way elegant, and make them explicit hacks. This is really more readable and easier to understand than what was before, and simplifies the code.
2013-07-27 19:26:00 +00:00
// handled in m_config.c
options: remove some unneeded stuff No options pointing to global variables are in use anymore, so that part can be removed.
2014-06-13 00:16:47 +00:00
{ "include", CONF_TYPE_STRING, M_OPT_FIXED, .offset = -1},
{ "profile", CONF_TYPE_STRING_LIST, M_OPT_FIXED, .offset = -1},
{ "show-profile", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED, .offset = -1},
{ "list-options", CONF_TYPE_STORE, CONF_NOCFG | M_OPT_FIXED, .offset = -1},
m_config: refactor some things Change how m_config is initialized. Make it more uniform; now all m_config structs are intialized in exactly the same way. Make sure there's only a single m_option[] array defining the options, and keep around the pointer to the optstruct default value, and the optstruct size as well. This will allow reconstructing the option default values in the following commit. In particular, stop pretending that the handling of some special options (like --profile, --v, and some others) is in any way elegant, and make them explicit hacks. This is really more readable and easier to understand than what was before, and simplifies the code.
2013-07-27 19:26:00 +00:00
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
// handled in main.c (looks at the raw argv[])
options: remove some unneeded stuff No options pointing to global variables are in use anymore, so that part can be removed.
2014-06-13 00:16:47 +00:00
{ "leak-report", CONF_TYPE_STORE, CONF_GLOBAL | CONF_NOCFG | M_OPT_FIXED,
.offset = -1 },
m_config: refactor some things Change how m_config is initialized. Make it more uniform; now all m_config structs are intialized in exactly the same way. Make sure there's only a single m_option[] array defining the options, and keep around the pointer to the optstruct default value, and the optstruct size as well. This will allow reconstructing the option default values in the following commit. In particular, stop pretending that the handling of some special options (like --profile, --v, and some others) is in any way elegant, and make them explicit hacks. This is really more readable and easier to understand than what was before, and simplifies the code.
2013-07-27 19:26:00 +00:00
mplayer: reshuffle on every loop if --loop and --shuffle are used See github issue #194. Unfortunately, this breaks the property that going back in the playlist always works as expected. This changes, because the playlist_prev command will work on the reshuffled playlist, instead of loading the previously played files in order. If this ever becomes an issue, I might revert this commit.
2013-08-18 22:50:39 +00:00
OPT_FLAG("shuffle", shuffle, CONF_GLOBAL | CONF_NOCFG),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- common options --------------------
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("quiet", quiet, CONF_GLOBAL),
msg: remove global state
2013-12-21 22:11:12 +00:00
OPT_FLAG_STORE("really-quiet", verbose, CONF_GLOBAL | CONF_PRE_PARSE, -10),
options: add --no-terminal switch Mostly useful for internal reasons. This code will be enabled by default if mpv is started via the client API.
2014-02-06 15:49:50 +00:00
OPT_FLAG("terminal", use_terminal, CONF_GLOBAL | CONF_PRE_PARSE),
options: rename msg-related options --msgcolor → --msg-color --msglevel → --msg-level --msgmodule → --msg-module --msgtime → --msg-time (also document this one) --playing-msg → --term-playing-msg --status-msg → --term-status-msg
2014-04-24 16:16:47 +00:00
OPT_GENERAL(char*, "msg-level", msglevels, CONF_GLOBAL|CONF_PRE_PARSE,
msg: change --msglevel, reduce legacy glue Basically, reimplement --msglevel. Instead of making the new msg code use the legacy code, make the legacy code use the reimplemented functionality. The handling of the deprecated --identify switch changes. It temporarily stops working; this will be fixed in later commits. The actual sub-options syntax (like --msglevel-vo=...) goes away, but I bet nobody knew about this or used this anyway.
2013-12-18 18:04:30 +00:00
.type = &m_option_type_msglevels),
player: add a --dump-stats option This collects statistics and other things. The option dumps raw data into a file. A script to visualize this data is included too. Litter some of the player code with calls that generate these statistics. In general, this will be helpful to debug timing dependent issues, such as A/V sync problems. Normally, one could argue that this is the task of a real profiler, but then we'd have a hard time to include extra information like audio/video PTS differences. We could also just hardcode all statistics collection and processing in the player code, but then we'd end up with something like mplayer's status line, which was cluttered and required a centralized approach (i.e. getting the data to the status line; so it was all in mplayer.c). Some players can visualize such statistics on OSD, but that sounds even more complicated. So the approach added with this commit sounds sensible. The stats-conv.py script is rather primitive at the moment and its output is semi-ugly. It uses matplotlib, so it could probably be extended to do a lot, so it's not a dead-end.
2014-04-17 19:47:00 +00:00
OPT_STRING("dump-stats", dump_stats, CONF_GLOBAL | CONF_PRE_PARSE),
options: rename msg-related options --msgcolor → --msg-color --msglevel → --msg-level --msgmodule → --msg-module --msgtime → --msg-time (also document this one) --playing-msg → --term-playing-msg --status-msg → --term-status-msg
2014-04-24 16:16:47 +00:00
OPT_FLAG("msg-color", msg_color, CONF_GLOBAL | CONF_PRE_PARSE),
OPT_FLAG("msg-module", msg_module, CONF_GLOBAL),
OPT_FLAG("msg-time", msg_time, CONF_GLOBAL),
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_PRIORITY
win32: implement --priority differently Does anyone actually use this? For now, update it, because it's the only case left where an option points to a global variable (and not a struct offset).
2014-06-11 22:34:20 +00:00
OPT_CHOICE("priority", w32_priority, 0,
({"no", 0},
win32: add missing priority classes
2014-06-22 05:57:27 +00:00
{"realtime", REALTIME_PRIORITY_CLASS},
{"high", HIGH_PRIORITY_CLASS},
win32: implement --priority differently Does anyone actually use this? For now, update it, because it's the only case left where an option points to a global variable (and not a struct offset).
2014-06-11 22:34:20 +00:00
{"abovenormal", ABOVE_NORMAL_PRIORITY_CLASS},
{"normal", NORMAL_PRIORITY_CLASS},
{"belownormal", BELOW_NORMAL_PRIORITY_CLASS},
{"idle", IDLE_PRIORITY_CLASS})),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
#endif
options: change --no-config option, make it apply to input.conf as well Simplify --no-config and make it a normal flag option, and doesn't take an argument anymore. You can get the same behavior by using --no-config and then --include to explicitly load a certain config file. Make --no-config work for input.conf as well. Make it so that --input:conf=file still works in this case. As a technically unrelated change, the file argument now works as one would expect, instead of making it relatively to "~/.mpv/". This makes for simpler code and easier to understand option semantics. We can also print better error messages.
2013-02-08 22:52:06 +00:00
OPT_FLAG("config", load_config, CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE),
config: add a --config-dir option to force config directory Useful for slave-mode like uses, and not as radical as --no-config.
2014-02-25 20:04:04 +00:00
OPT_STRING("config-dir", force_configdir,
CONF_GLOBAL | CONF_NOCFG | CONF_PRE_PARSE),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_STRINGLIST("reset-on-next-file", reset_options, M_OPT_GLOBAL),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_LUA
Add initial Lua scripting support This is preliminary. There are still tons of issues, and any aspect of scripting may change in the future. I decided to merge this (preliminary) work now because it makes it easier to develop it, not because it's done. lua.rst is clear enough about it (plus some sarcasm). This requires linking to Lua. Lua has no official pkg-config file, but there are distribution specific .pc files, all with different names. Adding a non-pkg-config based configure test was considered, but we'd rather not. One major complication is that libquvi links against Lua too, and if the Lua version is different from mpv's, you will get a crash as soon as libquvi uses Lua. (libquvi by design always runs when a file is opened.) I would consider this the problem of distros and whoever builds mpv, but to make things easier for users, we add a terrible runtime test to the configure script, which probes whether libquvi will crash. This is disabled when cross-compiling, but in that case we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
OPT_STRINGLIST("lua", lua_files, CONF_GLOBAL),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_KEYVALUELIST("lua-opts", lua_opts, M_OPT_GLOBAL),
Add the on-screen-controller Signed-off-by: wm4 <wm4@nowhere>
2013-09-25 22:56:41 +00:00
OPT_FLAG("osc", lua_load_osc, CONF_GLOBAL),
lua: add option to disable auto-loading of lua scripts
2014-02-28 21:25:48 +00:00
OPT_FLAG("load-scripts", auto_load_scripts, CONF_GLOBAL),
Add initial Lua scripting support This is preliminary. There are still tons of issues, and any aspect of scripting may change in the future. I decided to merge this (preliminary) work now because it makes it easier to develop it, not because it's done. lua.rst is clear enough about it (plus some sarcasm). This requires linking to Lua. Lua has no official pkg-config file, but there are distribution specific .pc files, all with different names. Adding a non-pkg-config based configure test was considered, but we'd rather not. One major complication is that libquvi links against Lua too, and if the Lua version is different from mpv's, you will get a crash as soon as libquvi uses Lua. (libquvi by design always runs when a file is opened.) I would consider this the problem of distros and whoever builds mpv, but to make things easier for users, we add a terrible runtime test to the configure script, which probes whether libquvi will crash. This is disabled when cross-compiling, but in that case we hope the user knows what he is doing.
2013-09-25 22:41:14 +00:00
#endif
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- stream options --------------------
cache: redo options and default settings Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
2014-05-19 21:27:09 +00:00
OPT_CHOICE_OR_INT("cache", stream_cache.size, 0, 32, 0x7fffffff,
cache: use threads instead of fork() Basically rewrite all the code supporting the cache (i.e. anything other than the ringbuffer logic). The underlying design is untouched. Note that the old cache2.c (on which this code is based) already had a threading implementation. This was mostly unused on Linux, and had some problems, such as using shared volatile variables for communication and uninterruptible timeouts, instead of using locks for synchronization. This commit does use proper locking, while still retaining the way the old cache worked. It's basically a big refactor. Simplify the code too. Since we don't need to copy stream ctrl args anymore (we're always guaranteed a shared address space now), lots of annoying code just goes away. Likewise, we don't need to care about sector sizes. The cache uses the high-level stream API to read from other streams, and sector sizes are handled transparently.
2013-05-25 13:03:30 +00:00
({"no", 0},
cache: redo options and default settings Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
2014-05-19 21:27:09 +00:00
{"auto", -1})),
OPT_CHOICE_OR_INT("cache-default", stream_cache.def_size, 0, 32, 0x7fffffff,
({"no", 0})),
OPT_INTRANGE("cache-initial", stream_cache.initial, 0, 0, 0x7fffffff),
OPT_INTRANGE("cache-seek-min", stream_cache.seek_min, 0, 0, 0x7fffffff),
stream: add a file cache For remarks, pretty much see the manpage additions. Could help with network streams that require too much seeking (maybe), or might be extended to help with the use case of watching and downloading a file at the same time. In general, it might be a useless feature and could be removed again.
2014-06-22 00:50:52 +00:00
OPT_STRING("cache-file", stream_cache.file, 0),
OPT_INTRANGE("cache-file-size", stream_cache.file_max, 0, 0, 0x7fffffff),
build: make pthreads mandatory pthreads should be available anywhere. Even if not, for environment without threads a pthread wrapper could be provided that can't actually start threads, thus disabling features that require threads. Make pthreads mandatory in order to simplify build dependencies and to reduce ifdeffery. (Admittedly, there wasn't much complexity, but maybe we will use pthreads more in the future, and then it'd become a real bother.)
2013-11-28 18:28:38 +00:00
Revert "Remove DVD and Bluray support" This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1. *shrug*
2014-07-14 23:49:02 +00:00
#if HAVE_DVDREAD || HAVE_DVDNAV
OPT_STRING("dvd-device", dvd_device, 0),
OPT_INT("dvd-speed", dvd_speed, 0),
OPT_INTRANGE("dvd-angle", dvd_angle, 0, 1, 99),
#endif /* HAVE_DVDREAD */
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
OPT_INTPAIR("chapter", chapterrange, 0),
options: replace --edition=-1 with --edition=auto Originally, the objective of this commit was changing --edition to be 1-based, but this was cancelled. I'm still leaving the change to demux_mkv.c though, which is now only of cosmetic nature.
2013-08-21 16:41:59 +00:00
OPT_CHOICE_OR_INT("edition", edition_id, 0, 0, 8190,
({"auto", -1})),
Revert "Remove DVD and Bluray support" This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1. *shrug*
2014-07-14 23:49:02 +00:00
#if HAVE_LIBBLURAY
OPT_STRING("bluray-device", bluray_device, 0),
OPT_INTRANGE("bluray-angle", bluray_angle, 0, 0, 999),
#endif /* HAVE_LIBBLURAY */
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
options: move network related options to MPOpts
2013-12-22 12:11:22 +00:00
OPT_STRINGLIST("http-header-fields", network_http_header_fields, 0),
OPT_STRING("user-agent", network_useragent, 0),
OPT_STRING("referrer", network_referrer, 0),
OPT_FLAG("cookies", network_cookies_enabled, 0),
OPT_STRING("cookies-file", network_cookies_file, 0),
network: fix rtsp playback By default, libavformat uses UDP for rtsp playback. This doesn't work very well. Apparently the reason is that the buffer sizes libavformat chooses for UDP are way too small, and switching to TCP gets rid of this issue entirely (thanks go to Reimar Döffinger for figuring this out). In theory, you can set buffer sizes as libavformat options, but that doesn't seem to help. Add an option to select the rtsp transport, and make TCP the default. Also remove an outdated comment from stream.c.
2013-09-22 00:40:29 +00:00
OPT_CHOICE("rtsp-transport", network_rtsp_transport, 0,
({"lavf", 0},
{"udp", 1},
{"tcp", 2},
{"http", 3})),
options: move network related options to MPOpts
2013-12-22 12:11:22 +00:00
OPT_FLAG("tls-verify", network_tls_verify, 0),
OPT_STRING("tls-ca-file", network_tls_ca_file, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- demuxer options --------------------
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_CHOICE_OR_INT("frames", play_frames, M_OPT_FIXED, 0, INT_MAX,
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
({"all", -1})),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
options: rename -ss and -endpos, allow relative times Rename the -ss option to -start, and -endpos to -length. Add a -end option. The -end option always specifies an absolute end time, as opposed to -endpos/-length. All these options (--start, --end, --length) now accept relative times. Percent positions (e.g. "--start=30%") are interpreted as fractions of the file duration. Negative times (e.g. "--start=-1:00) are interpreted relative to the end of the file. Chapters (e.g. "--start=#3") yield the chapter's time position. The chapter support might be able to replace --chapter completely, but for now I am not sure how well this works out with e.g. DVDs and BDs, and a separate --chapter option is useful interface-wise.
2012-11-15 17:49:17 +00:00
OPT_REL_TIME("start", play_start, 0),
OPT_REL_TIME("end", play_end, 0),
OPT_REL_TIME("length", play_length, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("pause", pause, M_OPT_FIXED),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("keep-open", keep_open, 0),
core: add option to start in paused state The --paused option will start the player in paused state. That means it will start out with a still image of the first frame. This can be useful in combination with --ss to inspect a certain frame. Caveat: this plays a small bit of audio at the start, which might be perceived as an annoying artifact. This is because this is implemented by frame stepping after initialization in order to decode and display the first video frame.
2012-02-08 23:36:53 +00:00
options: turn --idx, --forceidx into --index Also clarify the semantics. It seems --idx didn't do anything. Possibly it used to change how the now removed legacy demuxers like demux_avi used to behave. Or maybe it was accidental. --forceidx basically becomes --index=force. It's possible that new index modes will be added in the future, so I'm keeping it extensible, instead of e.g. creating --force-index.
2014-06-13 00:05:37 +00:00
OPT_CHOICE("index", index_mode, 0, ({"default", 1}, {"recreate", 0})),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// select audio/video/subtitle stream
options: change --vid, --aid, --sid options The --vid, --aid, --sid options now accept the values 'off' and 'auto', instead of having the user deal with the numeric values -2 and -1. The numeric values are not allowed anymore. Remove the --audio option. It was probably meant as compensation option for --no-audio. There are no such options for sub/video, and it was not documented, so just remove it. The replacement is "--aid=auto". Also do some updates to the manpage.
2012-09-05 00:39:12 +00:00
OPT_TRACKCHOICE("aid", audio_id),
OPT_TRACKCHOICE("vid", video_id),
OPT_TRACKCHOICE("sid", sub_id),
player: add --secondary-sid for displaying a second subtitle stream This is relatively hacky, but it's Christmas, so it's ok. This does two things: 1. allow selecting two subtitle tracks, and 2. include a hack that renders the second subtitle always as toptitle. See manpage additions how to use this.
2013-12-24 16:46:14 +00:00
OPT_TRACKCHOICE("secondary-sid", sub2_id),
options: change handling of "no-" options Normally, all flag options can be negated by prepending a "no-", for example "--no-opt" becomes "--opt=no". Some flag options can't actually be negated, so add a CONF_TYPE_STORE option type to disallow the "no-" fallback. Do the same for choice options. Remove the explicit "no-" prefixed options, add "no" as choice. Move the handling of automatic "no-" options from parser-mpcmd.c to m_config.c, and use it in m_config_set_option/m_config_parse_option. This makes these options available in the config file. It also simplifies sub-option parsing, because it doesn't need to handle "no-" anymore.
2012-09-20 01:32:01 +00:00
OPT_FLAG_STORE("no-sub", sub_id, 0, -2),
OPT_FLAG_STORE("no-video", video_id, 0, -2),
OPT_FLAG_STORE("no-audio", audio_id, 0, -2),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
OPT_STRINGLIST("alang", audio_lang, 0),
OPT_STRINGLIST("slang", sub_lang, 0),
core: allow disabling display of "album art" in audio files ffmpeg pretends that image attachments (such as contained in ID3v2 metadata) are video streams. It injects the attached pictures as packets into the packet stream received with av_read_frame(). Add the --audio-display option to allow configuring whether attached pictures should be displayed. The default behavior doesn't change (images are displayed). Identify video streams, that are actually image attachments, with "[P]" in the terminal output. Modify the default stream selection such that real video streams are preferred over attached pictures. (This is just for robustness; I do not know of any samples where images are added before actual video streams and could lead to bad default stream selection with the old code.)
2012-12-10 17:52:06 +00:00
OPT_CHOICE("audio-display", audio_display, 0,
({"no", 0}, {"attachment", 1})),
Add support for playing video from streaming sites with libquvi This enables playing URLs from libquvi supported streaming sites directly, e.g. "mplayer http://www.youtube.com/watch?v=...." Anything opened with mplayer is checked with libquvi. If it looks like a URL of a supported streaming site, libquvi is used to extract the media URL, which is then passed to the lower level mplayer code instead of the HTML URL. Hopefully the libquvi URL checker works well enough that it doesn't cause any problems with normal URLs, files, or whatever else mplayer's stream layer accepts. Add the --libquvi-format option. the option value is directly passed to libquvi as requested format. The only values that seem to work for any streaming site seem to be "best" (best quality) and "default" (lowest quality). The mplayer option defaults to "best" (overriding libquvi's default). Outstanding issues: - Does libquvi checking every opened file really not cause problems? Should there be a runtime option to disable libquvi use? (Probably not an issue.) - Should we check/set the supported protocol? By default libquvi has support for all protocols enabled. In the worst case, it might return an URL using a protocol not supported by mplayer, even though it could extract URLs with other protocols too. (Probably not an issue.) - Somehow export metadata (like media title) to the mplayer frontend?
2012-03-02 19:24:34 +00:00
OPT_STRING("quvi-format", quvi_format, 0),
quvi: add option to not fetch subtitles Signed-off-by: wm4 <wm4@nowhere>
2014-01-05 21:21:08 +00:00
OPT_FLAG("quvi-fetch-subtitles", quvi_fetch_subtitles, 0),
Add support for playing video from streaming sites with libquvi This enables playing URLs from libquvi supported streaming sites directly, e.g. "mplayer http://www.youtube.com/watch?v=...." Anything opened with mplayer is checked with libquvi. If it looks like a URL of a supported streaming site, libquvi is used to extract the media URL, which is then passed to the lower level mplayer code instead of the HTML URL. Hopefully the libquvi URL checker works well enough that it doesn't cause any problems with normal URLs, files, or whatever else mplayer's stream layer accepts. Add the --libquvi-format option. the option value is directly passed to libquvi as requested format. The only values that seem to work for any streaming site seem to be "best" (best quality) and "default" (lowest quality). The mplayer option defaults to "best" (overriding libquvi's default). Outstanding issues: - Does libquvi checking every opened file really not cause problems? Should there be a runtime option to disable libquvi use? (Probably not an issue.) - Should we check/set the supported protocol? By default libquvi has support for all protocols enabled. In the worst case, it might return an URL using a protocol not supported by mplayer, even though it could extract URLs with other protocols too. (Probably not an issue.) - Somehow export metadata (like media title) to the mplayer frontend?
2012-03-02 19:24:34 +00:00
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_CDDA
stream_cdda: remove global option variables
2014-06-10 18:46:15 +00:00
OPT_SUBSTRUCT("cdda", stream_cdda_opts, stream_cdda_conf, 0),
OPT_STRING("cdrom-device", cdrom_device, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
#endif
// demuxer.c - select audio/sub file/demuxer
options: allow adding multiple files with --audio-file At least 1 person expected that this works this way.
2014-06-17 23:40:20 +00:00
OPT_STRING_APPEND_LIST("audio-file", audio_files, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
OPT_STRING("demuxer", demuxer_name, 0),
OPT_STRING("audio-demuxer", audio_demuxer_name, 0),
OPT_STRING("sub-demuxer", sub_demuxer_name, 0),
demux: add a demuxer thread This adds a thread to the demuxer which reads packets asynchronously. It will do so until a configurable minimum packet queue size is reached. (See options.rst additions.) For now, the thread is disabled by default. There are some corner cases that have to be fixed, such as fixing cache behavior with webradios. Note that most interaction with the demuxer is still blocking, so if e.g. network dies, the player will still freeze. But this change will make it possible to remove most causes for freezing. Most of the new code in demux.c actually consists of weird caches to compensate for thread-safety issues (with the previously single-threaded design), or to avoid blocking by having to wait on the demuxer thread. Most of the changes in the player are due to the fact that we must not access the source stream directly. the demuxer thread already accesses it, and the stream stuff is not thread-safe. For timeline stuff (like ordered chapters), we enable the thread for the current segment only. We also clear its packet queue on seek, so that the remaining (unconsumed) readahead buffer doesn't waste memory. Keep in mind that insane subtitles (such as ASS typesetting muxed into mkv files) will practically disable the readahead, because the total queue size is considered when checking whether the minimum queue size was reached.
2014-07-16 20:40:21 +00:00
OPT_FLAG("demuxer-thread", demuxer_thread, 0),
demux: add option to control the readahead buffer by a duration value --demuxer-readahead-secs now controls how much the demuxer should readahead by an amount of seconds. This is based on the raw packet timestamps. It's not always very exact. For example, h264 in Matroska does not store any linear timestamps (only PTS values which are going to be reordered by the decoder), so this heuristic is usually off by several hundred milliseconds. The decision whether to readahead is basically OR-ed with the other --demuxer-readahead-packets options. Change the manpage descriptions to subtly convey these semantics.
2014-08-16 15:07:36 +00:00
OPT_DOUBLE("demuxer-readahead-secs", demuxer_min_secs, M_OPT_MIN, .min = 0),
demux: add a demuxer thread This adds a thread to the demuxer which reads packets asynchronously. It will do so until a configurable minimum packet queue size is reached. (See options.rst additions.) For now, the thread is disabled by default. There are some corner cases that have to be fixed, such as fixing cache behavior with webradios. Note that most interaction with the demuxer is still blocking, so if e.g. network dies, the player will still freeze. But this change will make it possible to remove most causes for freezing. Most of the new code in demux.c actually consists of weird caches to compensate for thread-safety issues (with the previously single-threaded design), or to avoid blocking by having to wait on the demuxer thread. Most of the changes in the player are due to the fact that we must not access the source stream directly. the demuxer thread already accesses it, and the stream stuff is not thread-safe. For timeline stuff (like ordered chapters), we enable the thread for the current segment only. We also clear its packet queue on seek, so that the remaining (unconsumed) readahead buffer doesn't waste memory. Keep in mind that insane subtitles (such as ASS typesetting muxed into mkv files) will practically disable the readahead, because the total queue size is considered when checking whether the minimum queue size was reached.
2014-07-16 20:40:21 +00:00
OPT_INTRANGE("demuxer-readahead-packets", demuxer_min_packs, 0, 0, MAX_PACKS),
OPT_INTRANGE("demuxer-readahead-bytes", demuxer_min_bytes, 0, 0, MAX_PACK_BYTES),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
player: redo how stream caching and pausing on low cache works Add the --cache-secs option, which literally overrides the value of --demuxer-readahead-secs if the stream cache is active. The default value is very high (10 seconds), which means it can act as network cache. Remove the old behavior of trying to pause once the byte cache runs low. Instead, do something similar wit the demuxer cache. The nice thing is that we can guess how many seconds of video it has cached, and we can make better decisions. But for now, apply a relatively naive heuristic: if the cache is below 0.5 secs, pause, and wait until at least 2 secs are available. Note that due to timestamp reordering, the estimated cached duration of video might be inaccurate, depending on the file format. If the file format has DTS, it's easy, otherwise the duration will seemingly jump back and forth.
2014-08-26 23:13:20 +00:00
OPT_DOUBLE("cache-secs", demuxer_min_secs_cache, M_OPT_MIN, .min = 0),
OPT_FLAG("cache-pause", cache_pausing, 0),
demux_mf: remove global option variables
2014-06-10 20:48:11 +00:00
OPT_DOUBLE("mf-fps", mf_fps, 0),
OPT_STRING("mf-type", mf_type, 0),
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_TV
tv: remove global option variables Pretty much nothing changes, but using -tv-scan with suboptions doesn't work anymore (instead of "-tv-scan x" it's "-tv scan-x" now). Flat options ("-tv-scan-x") stay compatible.
2014-06-09 21:54:45 +00:00
OPT_SUBSTRUCT("tv", tv_params, tv_params_conf, 0),
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#endif /* HAVE_TV */
#if HAVE_PVR
stream_pvr: remove global option variables
2014-06-10 18:12:19 +00:00
OPT_SUBSTRUCT("pvr", stream_pvr_opts, stream_pvr_conf, 0),
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#endif /* HAVE_PVR */
#if HAVE_DVBIN
stream_dvb: remove global option variables
2014-06-10 19:44:50 +00:00
OPT_SUBSTRUCT("dvbin", stream_dvb_opts, stream_dvb_conf, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
#endif
stream_lavf: allow setting AVOptions with --stream-lavf-o This commit also creates a private option struct for stream_lavf.c, but since I'm lazy, I'm not moving any existing options to it.
2014-07-29 23:15:42 +00:00
OPT_SUBSTRUCT("", stream_lavf_opts, stream_lavf_conf, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- a-v sync options --------------------
// set A-V sync correction speed (0=disables it):
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
OPT_FLOATRANGE("mc", default_max_pts_correction, 0, 0, 100),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// force video/audio rate:
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_DOUBLE("fps", force_fps, CONF_MIN | M_OPT_FIXED),
options: rename audio-related options/properties Renamed options: --audiofile → --audio-file --audiofile-cache → --audio-file-cache --channels → --audio-channels --format → --audio-format --srate → --audio-samplerate Renamed properties: samplerate → audio-samplerate channels → audio-channels
2014-04-24 15:56:26 +00:00
OPT_INTRANGE("audio-samplerate", force_srate, 0, 1000, 8*48000),
OPT_CHMAP("audio-channels", audio_output_channels, CONF_MIN, .min = 0),
OPT_AUDIOFORMAT("audio-format", audio_output_format, 0),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_DOUBLE("speed", playback_speed, M_OPT_RANGE | M_OPT_FIXED,
.min = 0.01, .max = 100.0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// set a-v distance
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
OPT_FLOATRANGE("audio-delay", audio_delay, 0, -100.0, 100.0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- codec/vfilter options --------------------
options: add options that set defaults for af/vf/ao/vo There are some use cases for this. For example, you can use it to set defaults of automatically inserted filters (like af_lavrresample). It's also useful if you have a non-trivial VO configuration, and want to use --vo to quickly change between the drivers without repeating the whole configuration in the --vo argument.
2013-11-30 23:12:10 +00:00
OPT_SETTINGSLIST("af-defaults", af_defs, 0, &af_obj_list),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_SETTINGSLIST("af*", af_settings, M_OPT_FIXED, &af_obj_list),
options: add options that set defaults for af/vf/ao/vo There are some use cases for this. For example, you can use it to set defaults of automatically inserted filters (like af_lavrresample). It's also useful if you have a non-trivial VO configuration, and want to use --vo to quickly change between the drivers without repeating the whole configuration in the --vo argument.
2013-11-30 23:12:10 +00:00
OPT_SETTINGSLIST("vf-defaults", vf_defs, 0, &vf_obj_list),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_SETTINGSLIST("vf*", vf_settings, M_OPT_FIXED, &vf_obj_list),
core: redo how codecs are mapped, remove codecs.conf Use codec names instead of FourCCs to identify codecs. Rewrite how codecs are selected and initialized. Now each decoder exports a list of decoders (and the codec it supports) via add_decoders(). The order matters, and the first decoder for a given decoder is preferred over the other decoders. E.g. all ad_mpg123 decoders are preferred over ad_lavc, because it comes first in the mpcodecs_ad_drivers array. Likewise, decoders within ad_lavc that are enumerated first by libavcodec (using av_codec_next()) are preferred. (This is actually critical to select h264 software decoding by default instead of vdpau. libavcodec and ffmpeg/avconv use the same method to select decoders by default, so we hope this is sane.) The codec names follow libavcodec's codec names as defined by AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders have names different from the canonical codec name. The AVCodecDescriptor API is relatively new, so we need a compatibility layer for older libavcodec versions for codec names that are referenced internally, and which are different from the decoder name. (Add a configure check for that, because checking versions is getting way too messy.) demux/codec_tags.c is generated from the former codecs.conf (minus "special" decoders like vdpau, and excluding the mappings that are the same as the mappings libavformat's exported RIFF tables). It contains all the mappings from FourCCs to codec name. This is needed for demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the codec as determined by libavformat, while the other demuxers have to do this on their own, using the mp_set_audio/video_codec_from_tag() functions. Note that the sh_audio/video->format members don't uniquely identify the codec anymore, and sh->codec takes over this role. Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which provide cover the functionality of the removed switched. Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure container/video combinations (e.g. the sample Film_200_zygo_pro.mov) are played flipped. ffplay/avplay doesn't handle this properly either, so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_CHOICE("deinterlace", deinterlace, M_OPT_OPTIONAL_PARAM | M_OPT_FIXED,
core: add --deinterlace option, restore it with resume functionality The --deinterlace option does on playback start what the "deinterlace" property normally does at runtime. You could do this before by using the --vf option or by messing with the vo_vdpau default options, but this new option is supposed to be a "foolproof" way. The main motivation for adding this is so that the deinterlace property can be restored when using the video resume functionality (quit_watch_later command). Implementation-wise, this is a bit messy. The video chain is rebuilt in mpcodecs_reconfig_vo(), where we don't have access to MPContext, so the usual mechanism for enabling deinterlacing can't be used. Further, mpcodecs_reconfig_vo() is called by the video decoder, which doesn't have access to MPContext either. Moving this call to mplayer.c isn't currently possible either (see below). So we just do this before frames are filtered, which potentially means setting the deinterlacing every frame. Fortunately, setting deinterlacing is stable and idempotent, so this is hopefully not a problem. We also add a counter that is incremented on each reconfig to reduce the amount of additional work per frame to nearly zero. The reason we can't move mpcodecs_reconfig_vo() to mplayer.c is because of hardware decoding: we need to check whether the video chain works before we decide that we can use hardware decoding. Changing it so that this can be decided in advance without building a filter chain sounds like a good idea and should be done, but we aren't there yet.
2013-09-13 16:06:08 +00:00
({"auto", -1},
{"no", 0},
{"yes", 1}, {"", 1})),
core: redo how codecs are mapped, remove codecs.conf Use codec names instead of FourCCs to identify codecs. Rewrite how codecs are selected and initialized. Now each decoder exports a list of decoders (and the codec it supports) via add_decoders(). The order matters, and the first decoder for a given decoder is preferred over the other decoders. E.g. all ad_mpg123 decoders are preferred over ad_lavc, because it comes first in the mpcodecs_ad_drivers array. Likewise, decoders within ad_lavc that are enumerated first by libavcodec (using av_codec_next()) are preferred. (This is actually critical to select h264 software decoding by default instead of vdpau. libavcodec and ffmpeg/avconv use the same method to select decoders by default, so we hope this is sane.) The codec names follow libavcodec's codec names as defined by AVCodecDescriptor.name (see libavcodec/codec_desc.c). Some decoders have names different from the canonical codec name. The AVCodecDescriptor API is relatively new, so we need a compatibility layer for older libavcodec versions for codec names that are referenced internally, and which are different from the decoder name. (Add a configure check for that, because checking versions is getting way too messy.) demux/codec_tags.c is generated from the former codecs.conf (minus "special" decoders like vdpau, and excluding the mappings that are the same as the mappings libavformat's exported RIFF tables). It contains all the mappings from FourCCs to codec name. This is needed for demux_mkv, demux_mpg, demux_avi and demux_asf. demux_lavf will set the codec as determined by libavformat, while the other demuxers have to do this on their own, using the mp_set_audio/video_codec_from_tag() functions. Note that the sh_audio/video->format members don't uniquely identify the codec anymore, and sh->codec takes over this role. Replace the --ac/--vc/--afm/--vfm with new --vd/--ad options, which provide cover the functionality of the removed switched. Note: there's no CODECS_FLAG_FLIP flag anymore. This means some obscure container/video combinations (e.g. the sample Film_200_zygo_pro.mov) are played flipped. ffplay/avplay doesn't handle this properly either, so we don't care and blame ffmeg/libav instead.
2013-02-09 14:15:19 +00:00
OPT_STRING("ad", audio_decoders, 0),
OPT_STRING("vd", video_decoders, 0),
options: rename --mkv-subtitle-preroll, --dtshd We still keep the old names as alias for short-time compatibility.
2013-06-28 13:26:30 +00:00
OPT_FLAG("ad-spdif-dtshd", dtshd, 0),
OPT_FLAG("dtshd", dtshd, 0), // old alias
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
video: different way to enable hardware decoding, add software fallback Deprecate the hardware specific video codec entries (like ffh264vdpau). Replace them with the --hwdec switch, which requests that a specific hardware decoding API should be used. The codecs.conf entries will be removed at a later time, but for now they are useful for testing and compatibility. Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used. Add a fallback if hardware decoding fails. Most hardware decoders (including vdpau) support only a subset of h264, and having such a fallback is supposed to enable a better user experience.
2012-12-11 17:16:42 +00:00
OPT_CHOICE("hwdec", hwdec_api, 0,
({"no", 0},
video: redo hw decoding initialization, add --hwdec=auto Change how the HW decoding stuff is organized, the way it's initialized in particular. Instead of duplicating the list of supported codecs for hwaccel decoders, add a probe function which allows each decoder to report whether it supports a given codec. Add an "auto" choice to the --hwdec option, which automatically enables hardware decoding if libavcodec and/or the VO supports it. What mpv prints on the terminal changes a bit. Now it will just print a single line whether hw decoding is used or not (and nothing at all if no hw decoding at all was requested). The pretty violent fallback from hw decoding to software decoding is still quite verbose and evil-looking though.
2013-08-11 21:23:12 +00:00
{"auto", -1},
video: different way to enable hardware decoding, add software fallback Deprecate the hardware specific video codec entries (like ffh264vdpau). Replace them with the --hwdec switch, which requests that a specific hardware decoding API should be used. The codecs.conf entries will be removed at a later time, but for now they are useful for testing and compatibility. Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used. Add a fallback if hardware decoding fails. Most hardware decoders (including vdpau) support only a subset of h264, and having such a fallback is supposed to enable a better user experience.
2012-12-11 17:16:42 +00:00
{"vdpau", 1},
{"vda", 2},
vaapi: allow GPU read-back with --hwdec=vaapi-copy This code is actually quite inefficient: it reuses the (slow, simple) screenshot code. It uses an inefficient method to read the image (vaGetImage() instead of vaDeriveImage()), allocates new memory for each frame that is read, and it tries all image formats again each time. Also, in my tests it always picked NV12 as image format, which is not ideal if you actually want to filter the video, and vo_xv can't handle this format without conversion either. However, a user confirmed that it worked for him, so everything is fine.
2013-09-22 20:47:50 +00:00
{"vaapi", 4},
{"vaapi-copy", 5})),
video: add --hwdec-codecs option to whitelist codecs for hw decoding
2013-05-03 19:00:05 +00:00
OPT_STRING("hwdec-codecs", hwdec_codecs, 0),
video: different way to enable hardware decoding, add software fallback Deprecate the hardware specific video codec entries (like ffh264vdpau). Replace them with the --hwdec switch, which requests that a specific hardware decoding API should be used. The codecs.conf entries will be removed at a later time, but for now they are useful for testing and compatibility. Instead of --vc=ffh264vdpau, --hwdec=vdpau should be used. Add a fallback if hardware decoding fails. Most hardware decoders (including vdpau) support only a subset of h264, and having such a fallback is supposed to enable a better user experience.
2012-12-11 17:16:42 +00:00
options: remove global variables for swscale options; rename them Additionally to removing the global variables, this makes the options more uniform. --ssf-... becomes --sws-..., and --sws becomes --sws- scaler. For --sws-scaler, use choices instead of magic integer values.
2014-06-10 20:41:14 +00:00
OPT_SUBSTRUCT("sws", vo.sws_opts, sws_conf, 0),
video: let sh_video->aspect always be container aspect ratio Now writing -1 to the 'aspect' property resets the video to the auto aspect ratio. Returning the aspect from the property becomes a bit more complicated, because we still try to return the container aspect ratio if no frame has been decoded yet.
2013-09-26 14:53:17 +00:00
// -1 means auto aspect (prefer container size until aspect change)
// 0 means square pixels
options: rename video-related options/properties Renamed options: --aspect → --video-aspect --fstype → --x11-fstype --native-fs → --fs-missioncontrol --name → --x11-name Renamed properties: aspect → video-aspect
2014-04-24 16:10:20 +00:00
OPT_FLOATRANGE("video-aspect", movie_aspect, 0, -1.0, 10.0),
OPT_FLOAT_STORE("no-video-aspect", movie_aspect, 0, 0.0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
dec_video: get rid of two global variables
2013-05-20 22:45:42 +00:00
OPT_CHOICE("field-dominance", field_dominance, 0,
({"auto", -1}, {"top", 0}, {"bottom", 1})),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
vd_lavc: make option struct local Removes specifics from options.h and options.c, and puts everything into vd_lavc.c.
2014-06-10 23:35:39 +00:00
OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0),
ad_lavc: make option struct local Similar to previous commit.
2014-06-10 23:39:51 +00:00
OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0),
options: rename -lavdopts to -vd-lavc, -lavfdopts to -demuxer-lavf Also change manpage so that top-level options are documented instead of suboptions. Suboptions still work, but might go away eventually.
2013-06-28 12:56:52 +00:00
demux_lavf: make option struct local Similar to previous commits.
2014-06-10 23:46:20 +00:00
OPT_SUBSTRUCT("demuxer-lavf", demux_lavf, demux_lavf_conf, 0),
demux_raw: remove global option variables
2014-06-10 21:06:42 +00:00
OPT_SUBSTRUCT("demuxer-rawaudio", demux_rawaudio, demux_rawaudio_conf, 0),
OPT_SUBSTRUCT("demuxer-rawvideo", demux_rawvideo, demux_rawvideo_conf, 0),
options: rename -lavdopts to -vd-lavc, -lavfdopts to -demuxer-lavf Also change manpage so that top-level options are documented instead of suboptions. Suboptions still work, but might go away eventually.
2013-06-28 12:56:52 +00:00
options: rename --mkv-subtitle-preroll, --dtshd We still keep the old names as alias for short-time compatibility.
2013-06-28 13:26:30 +00:00
OPT_FLAG("demuxer-mkv-subtitle-preroll", mkv_subtitle_preroll, 0),
OPT_FLAG("mkv-subtitle-preroll", mkv_subtitle_preroll, 0), // old alias
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
// ------------------------- subtitles options --------------------
options: change --sub-file behavior --sub-file is actually a string list, so you can add multipel external subtitle files. But to be able to set a list, the option value was split on ",". This made it impossible to add filenames. One possible solution would be adding escaping. That's probably a good idea (and some other options already do this), but it's also complicated both to implement and for the user. The simpler solution is making --sub-file appending, and make it take only a single entry. I'm not quite sure about this yet. It breaks the invariant that if a value is printed and parsed, you get the same value back. So for now, just go with the simple solution. Fixes #840.
2014-06-07 21:41:47 +00:00
OPT_STRING_APPEND_LIST("sub-file", sub_name, 0),
options: merge cfg-mplayer.h and cfg-common.h Remove obsolete extern declarations for demuxer_type, audio_demuxer_type, sub_demuxer_type and noconfig_opts in the process.
2011-03-10 21:08:21 +00:00
OPT_PATHLIST("sub-paths", sub_paths, 0),
options: rename subtitle-related options --ass → --sub-ass --autosub → --sub-auto --autosub-match → --sub-auto-match --sub → --sub-file --subcp → --sub-codepage --subfps → --sub-fps
2014-04-24 15:42:54 +00:00
OPT_STRING("sub-codepage", sub_cp, 0),
sub: remove some global variables
2013-04-28 23:49:20 +00:00
OPT_FLOAT("sub-delay", sub_delay, 0),
options: rename subtitle-related options --ass → --sub-ass --autosub → --sub-auto --autosub-match → --sub-auto-match --sub → --sub-file --subcp → --sub-codepage --subfps → --sub-fps
2014-04-24 15:42:54 +00:00
OPT_FLOAT("sub-fps", sub_fps, 0),
options: add -sub-speed option Should we actually get into trouble for unproper handling of frame-based subtitle formats, this might be the simplest way to work this around. Also is a bit more intuitive than -subfps, which might use an unknown, misdetected, or non-sense video FPS. Still pretty silly, though.
2013-06-24 22:03:37 +00:00
OPT_FLOAT("sub-speed", sub_speed, 0),
options: add --no-sub-visibility for symmetry Not really useful, but for symmetry with the sub-visibility property (mapped to the 'v' key by default).
2013-04-28 23:39:50 +00:00
OPT_FLAG("sub-visibility", sub_visibility, 0),
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
OPT_FLAG("sub-forced-only", forced_subs_only, 0),
sd_lavc, sd_spu: make dvdsub stretching conditional on --stretch-dvd-subs. We found that the stretching - although it usually improves the looks of the fonts - is incorrect. On DVD, subtitles can cover the full area of the picture, and they have the same pixel aspect as the movie itself. Too bad many commercially released DVDs use bitmap fonts made with the wrong pixel aspect (i.e. assuming 1:1) - --stretch-dvd-subs will make these more pretty then.
2013-11-01 15:02:47 +00:00
OPT_FLAG("stretch-dvd-subs", stretch_dvd_subs, 0),
options: remove use of an inverted option value Now MPOpts.sub_fix_timing corresponds to the commandline switch directly, instead of storing the inverted value.
2014-06-13 00:06:03 +00:00
OPT_FLAG("sub-fix-timing", sub_fix_timing, 0),
options: merge ---sub-auto-match with --sub-auto There's no reason why these should be separate.
2014-05-04 08:31:24 +00:00
OPT_CHOICE("sub-auto", sub_auto, 0,
({"no", -1}, {"exact", 0}, {"fuzzy", 1}, {"all", 2})),
sub: remove some global variables
2013-04-28 23:49:20 +00:00
OPT_INTRANGE("sub-pos", sub_pos, 0, 0, 100),
sub: reimplement -spugauss as --sub-gauss Apparently the -spugauss option was popular. The code originally implementing this is gone (scaler stuff in spudec.c). Reimplement it using libswscale to scale and blur image subtitles if the --sub-gauss option is set. The code does some rather lazy padding to allow the blur to spread pixels past the original image bounding box. (This problem exists with normal bilinear scaling too, but is barely noticable.) Technically, this doesn't just blur subtitles, but anything RGBA (or indexed) that enters the OSD rendering path. But only image subtitles produce these OSD formats currently, so no explicit check is done to prevent blurring in other cases.
2012-11-24 23:06:16 +00:00
OPT_FLOATRANGE("sub-gauss", sub_gauss, 0, 0.0, 3.0),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("sub-gray", sub_gray, 0),
options: rename subtitle-related options --ass → --sub-ass --autosub → --sub-auto --autosub-match → --sub-auto-match --sub → --sub-file --subcp → --sub-codepage --subfps → --sub-fps
2014-04-24 15:42:54 +00:00
OPT_FLAG("sub-ass", ass_enabled, 0),
osd: make the OSD and sub font more customizable Make more aspects of the OSD font customizable. This also affects the font used for unstyled subtitles (such as SRT), or when using the --no-ass option. This adds back some customizability that was lost with commit 74e7a1 (osd: use libass for OSD rendering). Removed options: --ass-border-color --ass-color --font --subfont --subfont-text-scale Added options: --osd-color --osd-border --osd-back-color --osd-shadow-color --osd-font --osd-font-size --osd-border-size --osd-margin-x --osd-margin-y --osd-shadow-offset --osd-spacing --sub-scale The font size is now specified in pixels as it would be rendered on a window with a height of 720 pixels. OSD and subtitles are always scaled with the window height, so specifying or expecting an absolute font size doesn't make sense. Such scaled pixel units are used to specify font border etc. as well. (Note: the font size is directly passed to libass. How the fonts are actually rasterized is outside of our control, but in theory ASS font sizes map to "script" pixels and then are scaled to screen size.) The default settings should be about the same, with slight difference due to rounding to the new scales. The OSD and subtitle fonts are not separately configurable. It has limited use and would double the number of newly added options, which would be more confusing than helpful. It could be easily added later, should the need arise. Other small details that change: - ASS_Style.Encoding is not set to -1 for subs anymore (assuming subs use VSFilter direction in -no-ass mode too) - use a different WrapStyle for OSD - ASS forced styles are not applied to OSD
2012-11-17 19:56:45 +00:00
OPT_FLOATRANGE("sub-scale", sub_scale, 0, 0, 100),
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
OPT_FLOATRANGE("ass-line-spacing", ass_line_spacing, 0, -1000, 1000),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("ass-use-margins", ass_use_margins, 0),
OPT_FLAG("ass-vsfilter-aspect-compat", ass_vsfilter_aspect_compat, 0),
sd_add: add terrible hack for (xy-)vsfilter compatibility Much has been said about this topic, we don't need to say even more. See additions to options.rst.
2013-07-14 23:48:25 +00:00
OPT_CHOICE("ass-vsfilter-color-compat", ass_vsfilter_color_compat, 0,
({"no", 0}, {"basic", 1}, {"full", 2}, {"force-601", 3})),
sd_ass: scale blur by original video size if requested
2013-06-30 16:46:29 +00:00
OPT_FLAG("ass-vsfilter-blur-compat", ass_vsfilter_blur_compat, 0),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("embeddedfonts", use_embedded_fonts, 0),
subs: fix per-file --ass-force-style The --ass-force-style option was only applied when the main libass library handle was created. Thus any per-file option changes later had no effect. Do the ass_set_style_overrides() call in per-file initialization instead so that possible changes will be applied. Also move the option variable to the option struct. Current libass will crash (usually) if you set style overrides to a nonempty value, then an empty one. It'll be easier to trigger this bug after this commit, but the problem is not on mplayer2 side. The fix is trivial so hopefully there will be a fixed libass soon.
2011-07-23 02:13:25 +00:00
OPT_STRINGLIST("ass-force-style", ass_force_style_list, 0),
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
OPT_STRING("ass-styles", ass_styles_file, 0),
options: make --ass-hinting a choice, instead of using magic numbers options.c still doesn't use the constants defined by the libass headers, but it's still better than exposing those to the user directly.
2013-09-25 19:40:35 +00:00
OPT_CHOICE("ass-hinting", ass_hinting, 0,
({"none", 0}, {"light", 1}, {"normal", 2}, {"native", 3})),
options: allow selecting the libass shaper I'm using the word "languages" instead of "scripts" in the manpage, but I think that's easier to understand with a smaller amount of descriptions.
2013-09-25 19:42:29 +00:00
OPT_CHOICE("ass-shaper", ass_shaper, 0,
({"simple", 0}, {"complex", 1})),
sub: add --ass-style-override option to disable style overrides There are a number of options which modify ASS subtitle rendering. Most of these do things that can interfere with the styling done by subtitle scripts, resulting in incorrect rendering. Add the --ass-style-override option to make it easy to disable all overrides. This helps trouble- shooting, and makes it more practical to use the override features. (You can simply toggle the ass-style-override property at runtime, should one of the style override options break subtitle rendering at a certain point.) This mainly affects whether most --ass-* options are applied, as well as --sub-pos. Some things, like explicit style overrides loaded with --ass-force-style, can't be changed at runtime using the ass-style-override property.
2012-10-11 00:23:29 +00:00
OPT_CHOICE("ass-style-override", ass_style_override, 0,
sub: remove old style override option Didn't work too well.
2014-06-04 23:10:48 +00:00
({"no", 0}, {"yes", 1}, {"force", 3})),
sub: add --sub-scale-with-window option Implements the feature requested in #839 and #186.
2014-06-14 17:17:31 +00:00
OPT_FLAG("sub-scale-with-window", sub_scale_with_window, 0),
osd: add --no-osd-bar option to disable the OSD bar In addition to disabling the OSD bar physically, also add some fallbacks to OSD text in places the OSD bar would have been used.
2013-02-16 20:17:59 +00:00
OPT_FLAG("osd-bar", osd_bar_visible, 0),
osd: add --osd-bar-align-x/y options to control OSD bar position
2013-02-14 19:43:00 +00:00
OPT_FLOATRANGE("osd-bar-align-x", osd_bar_align_x, 0, -1.0, +1.0),
OPT_FLOATRANGE("osd-bar-align-y", osd_bar_align_y, 0, -1.0, +1.0),
osd: draw the OSD bar with ASS vector drawings Drawing the bar with vector drawings (instead with characters from the OSD font) offers more flexibility and looks better. This also adds chapter marks to the OSD bar, which are visible as small triangles on the top and bottom inner border of the bar. Change the default position of the OSD bar below the center of the screen. This is less annoying than putting the bar directly into the center of the view, where it obscures the video. The new position is not quite on the bottom of the screen to avoid collisions with subtitles. The old centered position can be forced with ``--osd-bar-align-y=0``. Also make it possible to change the OSD bar width/height with the new --osd-bar-w and --osd-bar-h options. It's possible that the new OSD bar renders much slower than the old one. There are two reasons for this: 1. the character based bar allowed libass to cache each character, while the vector drawing forces it to redraw every time the bar position changes. 2., the bar position is updated at a much higher granularity (the bar position is passed along as float instead of as integer in the range 0-100, so the bar will be updated on every single video frame).
2013-03-30 19:08:56 +00:00
OPT_FLOATRANGE("osd-bar-w", osd_bar_w, 0, 1, 100),
OPT_FLOATRANGE("osd-bar-h", osd_bar_h, 0, 0.1, 50),
options: drop --opt:subopt option names For all suboptions, "flat" options were available by separating the parent option and the sub option with ":", e.g. "--rawvideo:w=123". Drop this syntax and use "-" as separator. This means even suboptions are available as normal options now, e.g. "--rawvideo-w=123". The old syntax doesn't work anymore. Note that this is completely separate from actual suboptions. For example, "-rawvideo w=123:h=123" still works. (Not that this syntax is worth supporting, but it's needed anyway, for for other things like vf and vo suboptions.) As a consequence of this change, we also have to add new "no-" prefixed options for flag suboptions, so that "--no-input-default-bindings" works. ("--input-no-default-bindings" also works as a consequence of allowing "-input no-default-bindings" - they are handled by the same underlying option.) For --input, always use the full syntax in the manpage. There exist suboptions other than --input (like --tv, --rawvideo, etc.), but since they might be handled differently in the future, don't touch these yet. M_OPT_PREFIXED becomes the default, so remove it. As a minor unrelated cleanup, get rid of M_OPT_MERGE too and use the OPT_SUBSTRUCT() macro in some places. Unrelated: remove the duplicated --tv:buffersize option, fix a typo in changes.rst.
2013-02-21 21:10:21 +00:00
OPT_SUBSTRUCT("osd", osd_style, osd_style_conf, 0),
OPT_SUBSTRUCT("sub-text", sub_text_style, osd_style_conf, 0),
sub: add option to workaround broken mkv files See additions to options.rst.
2014-08-14 21:59:35 +00:00
OPT_FLAG("sub-clear-on-seek", sub_clear_on_seek, 0),
common options moved out - for mencoder git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2617 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-11-02 00:32:35 +00:00
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
//---------------------- libao/libvo options ------------------------
options: use new code for parsing --vo Nothing should change from user perspective. mpv --vo=opengl:help now works. Remove the vo_opengl inline help text. The new code can list option names for you, but that's it. Refer to the manpage if you have trouble.
2013-07-21 19:17:48 +00:00
OPT_SETTINGSLIST("vo", vo.video_driver_list, 0, &vo_obj_list),
options: add options that set defaults for af/vf/ao/vo There are some use cases for this. For example, you can use it to set defaults of automatically inserted filters (like af_lavrresample). It's also useful if you have a non-trivial VO configuration, and want to use --vo to quickly change between the drivers without repeating the whole configuration in the --vo argument.
2013-11-30 23:12:10 +00:00
OPT_SETTINGSLIST("vo-defaults", vo.vo_defs, 0, &vo_obj_list),
options: use new option code for --ao This requires completely refactoring the AO creation code too.
2013-07-21 19:33:17 +00:00
OPT_SETTINGSLIST("ao", audio_driver_list, 0, &ao_obj_list),
options: add options that set defaults for af/vf/ao/vo There are some use cases for this. For example, you can use it to set defaults of automatically inserted filters (like af_lavrresample). It's also useful if you have a non-trivial VO configuration, and want to use --vo to quickly change between the drivers without repeating the whole configuration in the --vo argument.
2013-11-30 23:12:10 +00:00
OPT_SETTINGSLIST("ao-defaults", ao_defs, 0, &ao_obj_list),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("fixed-vo", fixed_vo, CONF_GLOBAL),
core: add --force-window This commit adds the --force-window option, which will cause mpv always to create a window when started. This can be useful when pretending that mpv is a GUI application (which it isn't, but users pretend anyway), and playing audio files would run mpv in the background without giving a window to control it. This doesn't actually create the window immediately: it only does so only after initializing playback and when it is clear that there won't be any actual video. This could be a problem when starting slow or completely stuck network streams (mpv would remain frozen in the background), or if video initialization somehow is stuck forever in an in-between state (like when the decoder doesn't output a video frame, but doesn't return an error either). Well, we can pretend only so much that mpv is a GUI application.
2013-10-01 23:15:59 +00:00
OPT_FLAG("force-window", force_vo, CONF_GLOBAL),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("ontop", vo.ontop, M_OPT_FIXED),
OPT_FLAG("border", vo.border, M_OPT_FIXED),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
input: allow disabling window dragging with --no-window-dragging Requested in github issue #608.
2014-05-20 00:40:00 +00:00
OPT_FLAG("window-dragging", allow_win_drag, CONF_GLOBAL),
softvol, ao_pulse: prefer ao_pulse volume control by default --softvol is enabled by default. For most audio outputs, this is a good thing, as they have either their own (bad) soft volume implementation, or control the system mixer. With ao_pulse, the situation is a bit different: it supports per-application volume (i.e. volume control is not really global). More importantly, ao_pulse uses a rather large audio buffer, and changing the volume with mplayer's volume filter has a large delay. With the native ao_pulse volume control, it's instant, because PulseAudio's audio filtering happens at a later stage in its processing pipeline (inaccessible for mplayer). This means native volume control should really be allowed for ao_pulse, while it's the reverse for other audio outputs. Make --softvol a choice option, and add a new "auto" choice. This is default and will use PA's volume control with ao_pulse, and mplayer's volume filter otherwise (i.e. the old softvol behavior).
2012-09-18 19:41:22 +00:00
OPT_CHOICE("softvol", softvol, 0,
({"no", SOFTVOL_NO},
{"yes", SOFTVOL_YES},
{"auto", SOFTVOL_AUTO})),
options: move mixer.h options to struct
2012-01-21 07:28:07 +00:00
OPT_FLOATRANGE("softvol-max", softvol_max, 0, 10, 10000),
core: remove volstep global variable
2013-04-09 00:41:46 +00:00
OPT_INTRANGE("volstep", volstep, 0, 0, 100),
options: fix --volume option range, add some explanations to manpage The --volume option accepted values up to 10000, but internally, the value is always clipped to 0-100 range. What makes this even worse is that --softvol-max suggests that it extends the range of --volume, which is not the case. (And passing a volume larger than 100 to --volume didn't even print a warning.)
2013-09-07 06:53:04 +00:00
OPT_FLOATRANGE("volume", mixer_init_volume, 0, -1, 100),
options: unify single dash and double dash options There were two option syntax variations: "old": -opt value "new": --opt=value "-opt=value" was invalid, and "--opt value" meant "--opt=" followed by a separate option "value" (i.e. interpreted as filename). There isn't really any reason to do this. The "old" syntax used to be ambiguous (you had to call the option parser to know whether the following argument is an option value or a new option), but that has been removed. Further, using "=" in the option string is always unambiguous. Since the distinction between the two option variants is confusing, just remove the difference and allow "--opt value" and "-opt=value". To make this easier, do some other cleanups as well (e.g. avoid having to do a manual lookup of the option just to check for M_OPT_PRE_PARSE, which somehow ended up with finally getting rid of the m_config.mode member). Error reporting is still a mess, and we opt for reporting too many rather than too few errors to the user. There shouldn't be many user-visible changes. The --framedrop and --term-osd options now always require parameters. The --mute option is intentionally made ambiguous: it works like a flag option, but a value can be passed to it explicitly ("--mute=auto"). If the interpretation of the option is ambiguous (like "--mute auto"), the second string is interpreted as separate option or filename. (Normal flag options are actually ambiguous in this way too.)
2012-09-21 07:22:25 +00:00
OPT_CHOICE("mute", mixer_init_mute, M_OPT_OPTIONAL_PARAM,
options: add --mute for setting initial audio mute status Similar to --volume. Takes this as opportunity to move the variable corresponding to --volume into MPOpts.
2012-11-15 18:22:01 +00:00
({"auto", -1},
{"no", 0},
options: unify single dash and double dash options There were two option syntax variations: "old": -opt value "new": --opt=value "-opt=value" was invalid, and "--opt value" meant "--opt=" followed by a separate option "value" (i.e. interpreted as filename). There isn't really any reason to do this. The "old" syntax used to be ambiguous (you had to call the option parser to know whether the following argument is an option value or a new option), but that has been removed. Further, using "=" in the option string is always unambiguous. Since the distinction between the two option variants is confusing, just remove the difference and allow "--opt value" and "-opt=value". To make this easier, do some other cleanups as well (e.g. avoid having to do a manual lookup of the option just to check for M_OPT_PRE_PARSE, which somehow ended up with finally getting rid of the m_config.mode member). Error reporting is still a mess, and we opt for reporting too many rather than too few errors to the user. There shouldn't be many user-visible changes. The --framedrop and --term-osd options now always require parameters. The --mute option is intentionally made ambiguous: it works like a flag option, but a value can be passed to it explicitly ("--mute=auto"). If the interpretation of the option is ambiguous (like "--mute auto"), the second string is interpreted as separate option or filename. (Normal flag options are actually ambiguous in this way too.)
2012-09-21 07:22:25 +00:00
{"yes", 1}, {"", 1})),
mixer: restore volume with playback resume Note that this is intentionally never done if the AO or softvolume is different, or if the current volume control method is thought to control system wide volume (such as ALSA) or otherwise user controllable (such as PulseAudio). The intention is to keep things robust and to avoid messing with the user's audio settings as far as possible, while still providing the ability to resume volume if it makes sense.
2013-09-19 12:32:47 +00:00
OPT_STRING("volume-restore-data", mixer_restore_volume_data, 0),
audio: add a "weak" gapless mode, and make it default Basically, this allows gapless playback with similar files (including the ordered chapter case), while still being robust in general. The implementation is quite simplistic on purpose, in order to avoid all the weird corner cases that can occur when creating the filter chain. The consequence is that it might do not-gapless playback in more cases when needed, but if that bothers you, you still can use the normal gapless mode. Just using "--gapless-audio" or "--gapless-audio=yes" selects the old mode.
2014-06-08 21:54:05 +00:00
OPT_CHOICE("gapless-audio", gapless_audio, M_OPT_FIXED | M_OPT_OPTIONAL_PARAM,
({"no", 0},
{"yes", 1}, {"", 1},
{"weak", -1})),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_GEOMETRY("geometry", vo.geometry, 0),
OPT_SIZE_BOX("autofit", vo.autofit, 0),
OPT_SIZE_BOX("autofit-larger", vo.autofit_larger, 0),
OPT_FLAG("force-window-position", vo.force_window_position, 0),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
// vo name (X classname) and window title strings
options: rename video-related options/properties Renamed options: --aspect → --video-aspect --fstype → --x11-fstype --native-fs → --fs-missioncontrol --name → --x11-name Renamed properties: aspect → video-aspect
2014-04-24 16:10:20 +00:00
OPT_STRING("x11-name", vo.winname, 0),
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_STRING("title", wintitle, 0),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
// set aspect ratio of monitor - useful for 16:9 TV-out
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_FLOATRANGE("monitoraspect", vo.force_monitor_aspect, 0, 0.0, 9.0),
OPT_FLOATRANGE("monitorpixelaspect", vo.monitor_pixel_aspect, 0, 0.2, 9.0),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
// start in fullscreen mode:
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("fullscreen", vo.fullscreen, M_OPT_FIXED),
OPT_FLAG("fs", vo.fullscreen, M_OPT_FIXED),
OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, M_OPT_FIXED),
options: fix panscan controls The value range was set to 1-99 instead of 0-1. This broke panscan control with the 'w' and 'e' keybindings. Broken by commit 1198c03.
2013-03-06 16:27:03 +00:00
OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
video: make it possible to scale/pan the video by arbitrary amounts Add --video-align-x/y, --video-pan-x/y, --video-scale options and properties. See the additions to the manpage for description and semantics. These transformations are intentionally done on top of panscan. Unlike the (now removed) --panscanrange option, this doesn't affect the default panscan behavior. (Although panscan itself becomes kind of useless if the new options are used.)
2013-06-14 22:15:32 +00:00
OPT_FLOATRANGE("video-zoom", vo.zoom, 0, -20.0, 20.0),
OPT_FLOATRANGE("video-pan-x", vo.pan_x, 0, -3.0, 3.0),
OPT_FLOATRANGE("video-pan-y", vo.pan_y, 0, -3.0, 3.0),
OPT_FLOATRANGE("video-align-x", vo.align_x, 0, -1.0, 1.0),
OPT_FLOATRANGE("video-align-y", vo.align_y, 0, -1.0, 1.0),
video: add unscaled mode with --video-unscaled
2013-09-01 01:27:03 +00:00
OPT_FLAG("video-unscaled", vo.unscaled, 0),
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0),
video, options: implement better YUV->RGB conversion control Rewrite control of the colorspace and input/output level parameters used in YUV-RGB conversions, replacing VO-specific suboptions with new common options and adding configuration support to more cases. Add new option --colormatrix which selects the colorspace the original video is assumed to have in YUV->RGB conversions. The default behavior changes from assuming BT.601 to colorspace autoselection between BT.601 and BT.709 using a simple heuristic based on video size. Add new options --colormatrix-input-range and --colormatrix-output-range which select input YUV and output RGB range. Disable the previously existing VO-specific colorspace and level conversion suboptions in vo_gl and vo_vdpau. Remove the "yuv_colorspace" property and replace it with one named "colormatrix" and semantics matching the new option. Add new properties matching the options for level conversion. Colorspace selection is currently supported by vo_gl, vo_vdpau, vo_xv and vf_scale, and all can change it at runtime (previously only vo_vdpau and vo_xv could). vo_vdpau now uses the same conversion matrix generation as vo_gl instead of libvdpau functionality; the main functional difference is that the "contrast" equalizer control behaves somewhat differently (it scales the Y component around 1/2 instead of around 0, so that contrast 0 makes the image gray rather than black). vo_xv does not support level conversion. vf_scale supports range setting for input, but always outputs full-range RGB. The value of the slave properties is the policy setting used for conversions. This means they can be set to any value regardless of whether the current VO supports that value or whether there currently even is any video. Possibly separate properties could be added to query the conversion actually used at the moment, if any. Because the colorspace and level settings are now set with a single VF/VO control call, the return value of that is no longer used to signal whether all the settings are actually supported. Instead code should set all the details it can support, and ignore the rest. The core will use GET_YUV_COLORSPACE to check which colorspace details have been set and which not. In other words, the return value for SET_YUV_COLORSPACE only signals whether any kind of YUV colorspace conversion handling exists at all, and VOs have to take care to return the actual state with GET_YUV_COLORSPACE instead. To be changed in later commits: add missing option documentation.
2011-10-15 21:50:21 +00:00
OPT_CHOICE("colormatrix", requested_colorspace, 0,
options: get rid of some compatibility stuff Doesn't make sense because we broke/are going to break compatibility with everything anyway. Remove mechanism for warning the user against disabled options. Remove colorspace alternative option values.
2012-08-05 22:10:13 +00:00
({"auto", MP_CSP_AUTO},
{"BT.601", MP_CSP_BT_601},
{"BT.709", MP_CSP_BT_709},
video: support YCgCo colorspace YCgCo can be manually selected, but will also be used if the decoder reports YCgCo. To make things more fun, files are sometimes marked incorrectly, which will display such broken files incorrectly starting with this commit.
2013-05-02 23:37:13 +00:00
{"SMPTE-240M", MP_CSP_SMPTE_240M},
video: Support BT.2020 constant luminance system Signed-off-by: wm4 <wm4@nowhere>
2014-03-26 22:00:09 +00:00
{"BT.2020-NCL", MP_CSP_BT_2020_NC},
{"BT.2020-CL", MP_CSP_BT_2020_C},
video: support YCgCo colorspace YCgCo can be manually selected, but will also be used if the decoder reports YCgCo. To make things more fun, files are sometimes marked incorrectly, which will display such broken files incorrectly starting with this commit.
2013-05-02 23:37:13 +00:00
{"YCgCo", MP_CSP_YCGCO})),
video, options: implement better YUV->RGB conversion control Rewrite control of the colorspace and input/output level parameters used in YUV-RGB conversions, replacing VO-specific suboptions with new common options and adding configuration support to more cases. Add new option --colormatrix which selects the colorspace the original video is assumed to have in YUV->RGB conversions. The default behavior changes from assuming BT.601 to colorspace autoselection between BT.601 and BT.709 using a simple heuristic based on video size. Add new options --colormatrix-input-range and --colormatrix-output-range which select input YUV and output RGB range. Disable the previously existing VO-specific colorspace and level conversion suboptions in vo_gl and vo_vdpau. Remove the "yuv_colorspace" property and replace it with one named "colormatrix" and semantics matching the new option. Add new properties matching the options for level conversion. Colorspace selection is currently supported by vo_gl, vo_vdpau, vo_xv and vf_scale, and all can change it at runtime (previously only vo_vdpau and vo_xv could). vo_vdpau now uses the same conversion matrix generation as vo_gl instead of libvdpau functionality; the main functional difference is that the "contrast" equalizer control behaves somewhat differently (it scales the Y component around 1/2 instead of around 0, so that contrast 0 makes the image gray rather than black). vo_xv does not support level conversion. vf_scale supports range setting for input, but always outputs full-range RGB. The value of the slave properties is the policy setting used for conversions. This means they can be set to any value regardless of whether the current VO supports that value or whether there currently even is any video. Possibly separate properties could be added to query the conversion actually used at the moment, if any. Because the colorspace and level settings are now set with a single VF/VO control call, the return value of that is no longer used to signal whether all the settings are actually supported. Instead code should set all the details it can support, and ignore the rest. The core will use GET_YUV_COLORSPACE to check which colorspace details have been set and which not. In other words, the return value for SET_YUV_COLORSPACE only signals whether any kind of YUV colorspace conversion handling exists at all, and VOs have to take care to return the actual state with GET_YUV_COLORSPACE instead. To be changed in later commits: add missing option documentation.
2011-10-15 21:50:21 +00:00
OPT_CHOICE("colormatrix-input-range", requested_input_range, 0,
({"auto", MP_CSP_LEVELS_AUTO},
{"limited", MP_CSP_LEVELS_TV},
{"full", MP_CSP_LEVELS_PC})),
OPT_CHOICE("colormatrix-output-range", requested_output_range, 0,
({"auto", MP_CSP_LEVELS_AUTO},
{"limited", MP_CSP_LEVELS_TV},
{"full", MP_CSP_LEVELS_PC})),
options: Expose --colormatrix-primaries to the user Signed-off-by: wm4 <wm4@nowhere>
2014-03-26 13:03:24 +00:00
OPT_CHOICE("colormatrix-primaries", requested_primaries, 0,
({"auto", MP_CSP_PRIM_AUTO},
{"BT.601-525", MP_CSP_PRIM_BT_601_525},
{"BT.601-625", MP_CSP_PRIM_BT_601_625},
{"BT.709", MP_CSP_PRIM_BT_709},
{"BT.2020", MP_CSP_PRIM_BT_2020})),
video: add --video-rotate option for controlling auto-rotation
2014-05-24 12:08:39 +00:00
OPT_CHOICE_OR_INT("video-rotate", video_rotate, 0, 0, 359,
({"no", -1})),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
options: cosmetics: move cursor_autohide_delay definition No functional changes.
2013-09-08 00:07:20 +00:00
OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0,
options: rename --cursor-autohide, replace magic number values --cursor-autohide-delay=-2 becomes --cursor-autohide=always --cursor-autohide-delay=-1 becomes --cursor-autohide=no --cursor-autohide-delay=123 becomes --cursor-autohide=123
2012-11-15 17:59:41 +00:00
0, 30000, ({"no", -1}, {"always", -2})),
mplayer: add --cursor-autohide-fs-only option This option makes the cursor always visible in windowed mode. Apparently, this is what (some?) Windows and OSX users expect. It's disabled by default for now. Restructure the cursor hide logic a bit for this purpose.
2013-09-08 00:46:19 +00:00
OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0),
x11: enable screensaver when paused, rename/change --stop-xscreensaver Use the recently introduced screensaver VOCTRLs to control the screensaver in the X11 backend. This means the behavior when paused changes: the old code always kept the screensaver disabled, but now the screensaver is reenabled on pausing. Rename the --stop-xscreensaver option to --stop-screensaver and make it more generic. Now it affects all backends that respond to the screensaver VOCTRLs.
2013-06-13 22:24:41 +00:00
OPT_FLAG("stop-screensaver", stop_screensaver, 0),
Remove trailing whitespace from most files
2009-07-06 23:26:13 +00:00
options: fix --wid A recent change accidentally set the flags options to -1 (probably confusing it with the defasult value?), which mistakenly set all flags and rejected all option values (except 0).
2013-03-18 02:13:28 +00:00
OPT_INT64("wid", vo.WinID, CONF_GLOBAL),
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_X11
x11: replace--[x11-]fstype option with --x11-netwm Simplifies the code a lot. You can still use --x11-netwm=no to disable NetWM for whatever reasons.
2014-05-15 22:47:13 +00:00
OPT_FLAG("x11-netwm", vo.x11_netwm, 0),
add rootwin cmd to mac osx git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12888 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-23 13:00:16 +00:00
#endif
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0),
core: add --heartbeat-interval option This closely follows MPlayer commit 36099, with some changes. Move a mutable static variable into MPContext.
2013-04-04 12:24:42 +00:00
OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0),
add rootwin cmd to mac osx git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12888 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-23 13:00:16 +00:00
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_CHOICE_OR_INT("screen", vo.screen_id, 0, 0, 32,
core: add fs-screen option for fullscreen display selection `--fs-screen` allows to decide what display to go fullscreen into. The semantics of `--screen` changed and now it is only used to select the windowed display when starting the application. This is useful for people using mpv with an external TV. They will start windowed on their laptop's screen and switch to fullscreen on the TV. @wm4 worked on the x11 and w32 parts of the code. All is squashed in one commit for history clarity.
2013-02-17 15:35:44 +00:00
({"default", -1})),
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_CHOICE_OR_INT("fs-screen", vo.fsscreen_id, 0, 0, 32,
core: move `xineramascreen` to `MPOpts` as `vo_screen_id` This is a small cleanup in preparation for the next commit.
2013-02-10 08:50:12 +00:00
({"all", -2}, {"current", -1})),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_COCOA
options: rename video-related options/properties Renamed options: --aspect → --video-aspect --fstype → --x11-fstype --native-fs → --fs-missioncontrol --name → --x11-name Renamed properties: aspect → video-aspect
2014-04-24 16:10:20 +00:00
OPT_FLAG("fs-missioncontrol", vo.fs_missioncontrol, 0),
cocoa_common: add native OSX fullscreen support This adds Mission Control fullscreen functionality to mpv. Since this doesn't play well with many of mpv's features disable it by default. Users can activate this feature by using `--native-fs` when starting mpv. Fixes #34
2013-05-10 22:22:23 +00:00
#endif
vo: remove and cleanup globals Removes almost every global variabel in vo.h and puts them in a special struct in MPOpts for video output related options. Also we completly remove the options/globals pts and refresh rate because they were unused.
2013-03-04 16:40:21 +00:00
OPT_INTRANGE("brightness", gamma_brightness, 0, -100, 100),
OPT_INTRANGE("saturation", gamma_saturation, 0, -100, 100),
OPT_INTRANGE("contrast", gamma_contrast, 0, -100, 100),
OPT_INTRANGE("hue", gamma_hue, 0, -100, 100),
OPT_INTRANGE("gamma", gamma_gamma, 0, -100, 100),
cfg-mplayer: fix some option flags
2013-05-16 21:12:52 +00:00
OPT_FLAG("keepaspect", vo.keepaspect, 0),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
//---------------------- mplayer-only options ------------------------
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("use-filedir-conf", use_filedir_conf, M_OPT_GLOBAL),
commands: rename "osdlevel" option and property, make it a choice Rename both the option and property to "osd-level", which fits a bit better with the general naming scheme. Make it a choice instead of an integer range. I failed to come up with good names for the various levels, so leave them as-is. Remove the useless property handler for the "loop" property too.
2012-09-17 06:45:35 +00:00
OPT_CHOICE("osd-level", osd_level, 0,
({"0", 0}, {"1", 1}, {"2", 2}, {"3", 3})),
Merge svn change r31134 Fix some search/replace errors introduced in the svn commit.
2010-05-07 19:02:47 +00:00
OPT_INTRANGE("osd-duration", osd_duration, 0, 0, 3600000),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("osd-fractions", osd_fractions, 0),
add osd-scale command Signed-off-by: Paul B Mahol <onemda@gmail.com> Modified to add docs for --osd-scale option, and adjusted to the previous commit by wm4.
2013-05-14 12:10:27 +00:00
OPT_FLOATRANGE("osd-scale", osd_scale, 0, 0, 100),
osd: add option for "unscaled" OSD
2013-12-10 18:58:57 +00:00
OPT_FLAG("osd-scale-by-window", osd_scale_by_window, 0),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
core: remove a number of global variables Move them into per-instance structs. This should get rid of all global variables in mplayer.c (not counting those referenced by cfg-mplayer.h). In core/input/ar.c, just remove checking the slave_mode variable. I'm not sure what this code was supposed to achieve, but slave mode is broken, slave mode is actually infeasible on OSX (ar.c is completely OSX specific), and the correct way of doing this would be to disable this input device per command line switch.
2013-03-08 01:08:02 +00:00
OPT_DOUBLE("sstep", step_sec, CONF_MIN, 0),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
commands: replace --hardframedrop, change framedropping property Replace --hardframedrop with --framedrop=hard. Rename the framedrop property from "framedropping" to "framedrop" for the sake of making command line options have the same name as their corresponding property. Change the property to accept choice values instead of numeric values. Remove unused/forgotten auto_quality variable.
2012-09-17 06:38:19 +00:00
OPT_CHOICE("framedrop", frame_dropping, 0,
({"no", 0},
video: add VO framedropping mode This mostly uses the same idea as with vo_vdpau.c, but much simplified. On X11, it tries to get the display framerate with XF86VM, and limits the frequency of new video frames against it. Note that this is an old extension, and is confirmed not to work correctly with multi-monitor setups. But we're using it because it was already around (it is also used by vo_vdpau). This attempts to predict the next vsync event by using the time of the last frame and the display FPS. Even if that goes completely wrong, the results are still relatively good. On other systems, or if the X11 code doesn't return a display FPS, a framerate of 1000 is assumed. This is infinite for all practical purposes, and means that only frames which are definitely too late are dropped. This probably has worse results, but is still useful. "--framedrop=yes" is basically replaced with "--framedrop=decoder". The old framedropping mode is kept around, and should perhaps be improved. Dropping on the decoder level is still useful if decoding itself is too slow.
2014-08-15 21:33:33 +00:00
{"vo", 1},
{"decoder", 2},
{"decoder+vo", 3})),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
video: add --display-fps switch to control framedrop FPS Since the display FPS is currently detected on X11 only (and even there it's known to be wrong on certain setups), it seems like a good idea to make this user-configurable.
2014-08-15 22:05:02 +00:00
OPT_DOUBLE("display-fps", frame_drop_fps, M_OPT_MIN, .min = 0),
audio: add a mode to insert silence on severe A/V desync This is probably a stupid idea, but it can't be denied that this actually allows playing video without larger desync, even if video is too slow.
2014-08-15 21:52:42 +00:00
OPT_FLAG("audiodrop", insert_silence, 0),
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("untimed", untimed, M_OPT_FIXED),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_STRING("stream-capture", stream_capture, M_OPT_FIXED),
OPT_STRING("stream-dump", stream_dump, M_OPT_FIXED),
core: add --stream-capture This is a partial revert of commit 7059c15, and basically re-adds --capture, just with different option names and slightly different semantics.
2013-05-11 20:19:33 +00:00
options: --loop=N means playback N times, not N+1 times The argument or this change is that --loop should set how often the file is played, not the number of additional repeats. Based on pull request 277, with additions to the manpage and removal of "--loop=0". Signed-off-by: wm4 <wm4@nowhere>
2013-10-09 03:51:00 +00:00
OPT_CHOICE_OR_INT("loop", loop_times, M_OPT_GLOBAL, 2, 10000,
({"no", -1}, {"1", -1},
options: change --loop option, and extend choice option type The --loop option takes slightly different parameters now. --loop=0 used to mean looping forever. Now it means looping is disabled (this is more logical: 2 means playing 2 more times, 1 means playing 1 more time, and 0 should mean playing not again). Now --loop=inf must be used to enable looping forever. Extend choice types to allow an optional range of integers as values. If CONF_RANGE is added to the flags of a m_option_type_choice option, m_option.min/max specify a range of allowed integer values. This can be used to remove "special" values from make integer range options. These special values are unintuitive, and sometimes expose mplayer internals to the user. The (internal) choice values can be freely mixed with the specified integer value range. If there are overlaps, the choice values are preferred for conversion to/from strings. Also make sure the extension to choice options works with properties. Add the ability to step choice properties downwards, instead of just upwards.
2012-09-05 00:17:13 +00:00
{"inf", 0})),
player: add a --loop-file option Unlike --loop, loops a file instead of the playlist.
2014-04-17 21:55:04 +00:00
OPT_FLAG("loop-file", loop_file, 0),
options: get rid of ambiguous option parsing Options parsing used to be ambiguous, as in the splitting into option and values pairs was ambiguous. Example: -option -something It wasn't clear whether -option actually takes an argument or not. The string "-something" could either be a separate option, or an argument to "-option". The code had to call the option specific parser function to resolve this. This made everything complicated and didn't even have a real use. There was only one case where this was actually used: string lists (m_option_type_string_list) and options based on it. That is because this option type actually turns a single option into a proxy for several real arguments, e.g. "vf*" can handle "-vf-add" and "-vf-clr". Options suffixed with "-clr" are the only options of this group which take no arguments. This is ambiguous only with the "old syntax" (as shown above). The "new" option syntax always puts option name and value into same argument. (E.g. "--option=--something" or "--option" "--something".) Simplify the code by making it statically known whether an option takes a parameter or not with the flag M_OPT_TYPE_OLD_SYNTAX_NO_PARAM. If it's set, the option parser assumes the option takes no argument. The only real ambiguity left, string list options that end on "-clr", are special cased in the parser. Remove some duplication of the logic in the command line parser by moving all argument splitting logic into split_opt(). (It's arguable whether that can be considered code duplication, but now the code is a bit simpler anyway. This might be subjective.) Remove the "ambiguous" parameter from all option parsing related code. Make m_config unaware of the pre-parsing concept. Make most CONF_NOCFG options also CONF_GLOBAL (except those explicitly usable as per-file options.)
2012-08-05 21:34:28 +00:00
core: add playback resume feature (manual/opt-in) A "watch later" command is now mapped to Shift+Q. This quits the player and stores the playback state in a config file in ~/.mpv/watch_later/. When calling the player with the same file again, playback is resumed at that time position. It's also possible to make mpv save playback state always on quit with the --save-position-on-quit option. Likewise, resuming can be disabled with the --no-resume-playback option. This also attempts to save some playback parameters, like fullscreen state or track selection. This will unconditionally override config settings and command line options (which is probably not what you would expect, but in general nobody will really care about this). Some things are not backed up, because that would cause various problems. Additional subtitle files, video filters, etc. are not stored because that would be too hard and fragile. Volume/mute state are not stored because it would mess up if the system mixer is used, or if the system mixer was readjusted in the meantime. Basically, the tradeoff between perfect state restoration and complexity/fragility makes it not worth to attempt to implement it perfectly, even if the result is a little bit inconsistent.
2013-05-05 17:37:29 +00:00
OPT_FLAG("resume-playback", position_resume, 0),
OPT_FLAG("save-position-on-quit", position_save_on_quit, 0),
player: write file name to the watch later config file This simply writes the file name as a comment to the top of the watch later config file. It can be useful to the user for determining whether a watch later config file can be manually removed (e.g. in case the corresponding media file has been deleted) or not.
2014-06-01 16:25:21 +00:00
OPT_FLAG("write-filename-in-watch-later-config", write_filename_in_watch_later_config, 0),
core: add playback resume feature (manual/opt-in) A "watch later" command is now mapped to Shift+Q. This quits the player and stores the playback state in a config file in ~/.mpv/watch_later/. When calling the player with the same file again, playback is resumed at that time position. It's also possible to make mpv save playback state always on quit with the --save-position-on-quit option. Likewise, resuming can be disabled with the --no-resume-playback option. This also attempts to save some playback parameters, like fullscreen state or track selection. This will unconditionally override config settings and command line options (which is probably not what you would expect, but in general nobody will really care about this). Some things are not backed up, because that would cause various problems. Additional subtitle files, video filters, etc. are not stored because that would be too hard and fragile. Volume/mute state are not stored because it would mess up if the system mixer is used, or if the system mixer was readjusted in the meantime. Basically, the tradeoff between perfect state restoration and complexity/fragility makes it not worth to attempt to implement it perfectly, even if the result is a little bit inconsistent.
2013-05-05 17:37:29 +00:00
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("ordered-chapters", ordered_chapters, 0),
matroska: add --ordered-chapters-files option This option takes a playlist. The playlist will then be used as list of potential segment files for use with ordered chapters.
2013-12-14 20:52:37 +00:00
OPT_STRING("ordered-chapters-files", ordered_chapters_files, 0),
core: ordered chapters: add heuristic for merging inaccurate chapters Some Matroska files have inaccurate ordered chapter endpoints, and so parts where one chapter should end and the next begin at the same timestamp were not merged. This resulted in an unnecessary seek over a minimal distance. Add a heuristic to merge parts with a minimal gap or overlap between them. Based on patch by Hector Martin <hector@marcansoft.com>.
2010-11-26 14:56:05 +00:00
OPT_INTRANGE("chapter-merge-threshold", chapter_merge_threshold, 0, 0, 10000),
Add option -noordered-chapters.
2009-04-07 23:37:27 +00:00
command: more intuitive chapter seek behavior If close to chapter start, skipping back goes to previous chapter (no change). If more than <threshold> seconds in, skipping back will now go to the beginning of the current chapter instead. The threshold is set by the new option --chapter-seek-threshold and defaults to 5 seconds. A negative value disables the new functionality.
2013-08-14 01:25:50 +00:00
OPT_DOUBLE("chapter-seek-threshold", chapter_seek_threshold, 0),
core: add a playlist demuxer Modeled after the old playlist_parser.c, but actually new code, and it works a bit differently. Demuxers (and sometimes streams) are the component that should be used to open files and to determine the file format. This was already done for subtitles, but playlists still use a separate code path.
2013-08-25 18:40:21 +00:00
OPT_FLAG("load-unsafe-playlists", load_unsafe_playlists, 0),
player: add --merge-files option
2013-11-19 21:36:33 +00:00
OPT_FLAG("merge-files", merge_files, 0),
core: add a playlist demuxer Modeled after the old playlist_parser.c, but actually new code, and it works a bit differently. Demuxers (and sometimes streams) are the component that should be used to open files and to determine the file format. This was already done for subtitles, but playlists still use a separate code path.
2013-08-25 18:40:21 +00:00
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
// a-v sync stuff:
options: simplify --correct-pts handling Remove the (now unused) code for determining correct-pts mode based on the demuxer in use. Change its description in the manpage to reflect what this option does now.
2013-07-26 00:06:58 +00:00
OPT_FLAG("correct-pts", correct_pts, 0),
options: add "choice" option type, use for -pts-association-mode Add a "choice" option type. Options of this type take a string as input and set an int option variable to the value corresponding to the string. The string->int mapping is option-specific and is given in the option definition. Strings not found in the mapping are rejected as invalid option values. Change the option -pts-association-mode to use this new option type and accept values "auto, decoder, sort" instead of "0, 1, 2". The change in accepted values shouldn't cause problems as this option is not appropriate to use in normal user config files.
2010-12-17 23:00:28 +00:00
OPT_CHOICE("pts-association-mode", user_pts_assoc_mode, 0,
({"auto", 0}, {"decoder", 1}, {"sort", 2})),
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("initial-audio-sync", initial_audio_sync, 0),
core: add support for precise non-keyframe-limited seeks Add support for seeking to an arbitrary non-keyframe position by decoding video starting from the previous keyframe. Whether to use this functionality when seeking is controlled by the new option -hr-seek and a new third argument to the "seek" command. The default is to use it for absolute seeks (like chapter seeks) but not for relative ones. Because there's currently no support for cutting encoded audio some desync is expected if encoded audio passthrough is used. Currently precise seeks always go to the first frame with timestamp equal to or greater than the target position; there's no support for "matching or earlier" backwards seeks at frame level.
2010-12-14 23:09:47 +00:00
OPT_CHOICE("hr-seek", hr_seek, 0,
options: accept "yes" and "no" only for flags This removes the alternative values like "off", "0", "false" etc., and also the non-English versions of these. This is done for general consistency. It's better to have a single way of doing things when multiple ways don't add singificant value. Also update some choices for consistency.
2012-09-18 13:50:24 +00:00
({"no", -1}, {"absolute", 0}, {"always", 1}, {"yes", 1})),
options, core/hrseek: add --hr-seek-demuxer-offset Some demuxers do not accurately seek to a keyframe before a given time but instead start too late. This means that precise seeks cannot work either. Most notably the libavformat mpeg demuxer exhibits this behavior depending on the file being played (with the internal mpeg demuxer precise seeks don't work at all). Add new option --hr-seek-demuxer-offset which can be used as a workaround with such demuxers. The value of the option is subtracted from the seek target position given to the demuxer when doing a precise seek.
2011-11-06 14:54:57 +00:00
OPT_FLOATRANGE("hr-seek-demuxer-offset", hr_seek_demuxer_offset, 0, -9, 99),
options: add --hr-seek-framedrop option This allows disabling of decoder framedrop during hr-seek. It's basically another useless option, but it will help exploring whether this framedropping really makes seeking faster, or whether disabling it helps with precise seeking (especially frame backstepping).
2014-05-07 20:01:17 +00:00
OPT_FLAG("hr-seek-framedrop", hr_seek_framedrop, 0),
options: change handling of "no-" options Normally, all flag options can be negated by prepending a "no-", for example "--no-opt" becomes "--opt=no". Some flag options can't actually be negated, so add a CONF_TYPE_STORE option type to disallow the "no-" fallback. Do the same for choice options. Remove the explicit "no-" prefixed options, add "no" as choice. Move the handling of automatic "no-" options from parser-mpcmd.c to m_config.c, and use it in m_config_set_option/m_config_parse_option. This makes these options available in the config file. It also simplifies sub-option parsing, because it doesn't need to handle "no-" anymore.
2012-09-20 01:32:01 +00:00
OPT_CHOICE_OR_INT("autosync", autosync, 0, 0, 10000,
({"no", -1})),
removed -dapsync (obsolete code) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7496 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-23 22:12:29 +00:00
options: remove M_OPT_IMPLICIT_DEFAULT This was to make an option without value use the option's default value (e.g. --term-osd is the same as --term-osd=auto). Make it simpler by handling this case as an empty choice. The flag was probably needed when option handling still did ambiguous argument parsing.
2012-09-03 20:44:44 +00:00
OPT_CHOICE("term-osd", term_osd, 0,
osd: add setting to display OSD always on terminal Now the option --term-osd=force will cause mplayer to display all OSD messages on the terminal, even if there is video. Possible values for --term-osd: - auto: use video OSD, or of there's no video, the terminal (default) - off: always use video for OSD - force: always use terminal for OSD -term-osd and --term-osd are equivalent to --term-osd=force. This changes the meaning of the option, since -term-osd used to enable the OSD default behavior, i.e. --term-osd=auto. -noterm-osd has the same effect as --term-osd=off, and is kept for compatibility. Implementation note: The location for the OSD text was shared between the two code paths (it was in osd_state.osd_text). We can't rely on the fact that the video-OSD update code normally isn't run when --term-osd is called. When e.g. panscan is updated, the video OSD code will draw the OSD anyway. This would sometimes show unwanted OSD text on the video. Deal with this by putting the current terminal-OSD text in a different place (in MPContext.terminal_osd_text) to deal with this.
2012-01-06 18:48:50 +00:00
({"force", 1},
options: unify single dash and double dash options There were two option syntax variations: "old": -opt value "new": --opt=value "-opt=value" was invalid, and "--opt value" meant "--opt=" followed by a separate option "value" (i.e. interpreted as filename). There isn't really any reason to do this. The "old" syntax used to be ambiguous (you had to call the option parser to know whether the following argument is an option value or a new option), but that has been removed. Further, using "=" in the option string is always unambiguous. Since the distinction between the two option variants is confusing, just remove the difference and allow "--opt value" and "-opt=value". To make this easier, do some other cleanups as well (e.g. avoid having to do a manual lookup of the option just to check for M_OPT_PRE_PARSE, which somehow ended up with finally getting rid of the m_config.mode member). Error reporting is still a mess, and we opt for reporting too many rather than too few errors to the user. There shouldn't be many user-visible changes. The --framedrop and --term-osd options now always require parameters. The --mute option is intentionally made ambiguous: it works like a flag option, but a value can be passed to it explicitly ("--mute=auto"). If the interpretation of the option is ambiguous (like "--mute auto"), the second string is interpreted as separate option or filename. (Normal flag options are actually ambiguous in this way too.)
2012-09-21 07:22:25 +00:00
{"auto", 2},
options: accept "yes" and "no" only for flags This removes the alternative values like "off", "0", "false" etc., and also the non-English versions of these. This is done for general consistency. It's better to have a single way of doing things when multiple ways don't add singificant value. Also update some choices for consistency.
2012-09-18 13:50:24 +00:00
{"no", 0})),
osd: add setting to display OSD always on terminal Now the option --term-osd=force will cause mplayer to display all OSD messages on the terminal, even if there is video. Possible values for --term-osd: - auto: use video OSD, or of there's no video, the terminal (default) - off: always use video for OSD - force: always use terminal for OSD -term-osd and --term-osd are equivalent to --term-osd=force. This changes the meaning of the option, since -term-osd used to enable the OSD default behavior, i.e. --term-osd=auto. -noterm-osd has the same effect as --term-osd=off, and is kept for compatibility. Implementation note: The location for the OSD text was shared between the two code paths (it was in osd_state.osd_text). We can't rely on the fact that the video-OSD update code normally isn't run when --term-osd is called. When e.g. panscan is updated, the video OSD code will draw the OSD anyway. This would sometimes show unwanted OSD text on the video. Deal with this by putting the current terminal-OSD text in a different place (in MPContext.terminal_osd_text) to deal with this.
2012-01-06 18:48:50 +00:00
player: add --term-osd-bar, which shows a status bar on the terminal Feature request from github issue #451. Disabled by default, will probably stay this way.
2014-01-15 15:14:37 +00:00
OPT_FLAG("term-osd-bar", term_osd_bar, 0),
OPT_STRING("term-osd-bar-chars", term_osd_bar_chars, 0),
options: rename msg-related options --msgcolor → --msg-color --msglevel → --msg-level --msgmodule → --msg-module --msgtime → --msg-time (also document this one) --playing-msg → --term-playing-msg --status-msg → --term-status-msg
2014-04-24 16:16:47 +00:00
OPT_STRING("term-playing-msg", playing_msg, 0),
OPT_STRING("term-status-msg", status_msg, 0),
options: handle escape sequences in e.g. --playing-msg differently M_OPT_PARSE_ESCAPES was pretty stupid, and broke the (useful) assumption that string variables contain exactly the same value as set by the option. Simplify it, and move escape handling to the place where it's used. Escape handling itself is not terribly useful, but still allows useful things like multiline custom OSD with "\n".
2014-02-20 13:46:23 +00:00
OPT_STRING("osd-status-msg", osd_status_msg, 0),
the great MPlayer tab removal: part II some extra indentation fixes are put in as a bonus git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
options: allow changing options at runtime Allow changing all options at runtime, except some cherry-picked options, which are disabled with M_OPT_FIXED.
2014-02-25 22:59:27 +00:00
OPT_FLAG("idle", player_idle_mode, M_OPT_GLOBAL),
options: rename input-related options --ar → --input-appleremote --consolecontrols → --input-terminal --media-keys → --input-media-keys --joystick → --input-joystick --lirc → --input-lirc --lircconf → --input-lirc-conf --mouse-movements → --input-cursor --right-alt-gr → --input-right-alt-gr
2014-04-24 15:27:27 +00:00
OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL),
re-ordering options, add comemnts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5975 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-04 21:26:45 +00:00
options: remove some more stuff The "classic" sub-option stuff is not really needed anymore. The only remaining use can be emulated in a simpler way. But note that this breaks the --screenshot option (instead of the "flat" options like --screenshot-...). This was undocumented and discouraged, so it shouldn't affect anyone.
2014-06-13 00:17:31 +00:00
OPT_SUBSTRUCT("screenshot", screenshot_image_opts, image_writer_conf, 0),
OPT_STRING("screenshot-template", screenshot_template, 0),
screenshot: add jpg support The screenshot image file type can now be selected with the --screenshot-filetype option. The --screenshot-jpeg-quality option controls the compression setting of the written JPEG image file.
2011-10-06 18:46:02 +00:00
input: make option struct local Similar to previous commits. This also renames --doubleclick-time to --input-doubleclick-time, and --key-fifo-size to --input-key-fifo-size. We could keep the old names, but these options are very obscure, and renaming them seems better for consistency.
2014-06-10 23:54:03 +00:00
OPT_SUBSTRUCT("input", input_opts, input_config, 0),
m_config: refactor some things Change how m_config is initialized. Make it more uniform; now all m_config structs are intialized in exactly the same way. Make sure there's only a single m_option[] array defining the options, and keep around the pointer to the optstruct default value, and the optstruct size as well. This will allow reconstructing the option default values in the following commit. In particular, stop pretending that the handling of some special options (like --profile, --v, and some others) is in any way elegant, and make them explicit hacks. This is really more readable and easier to understand than what was before, and simplifies the code.
2013-07-27 19:26:00 +00:00
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
OPT_PRINT("list-properties", property_print_help),
options: add --list-protocols option
2014-06-30 10:49:01 +00:00
OPT_PRINT("list-protocols", stream_print_proto_list),
options: simplify handling of some help options
2013-12-26 18:22:40 +00:00
OPT_PRINT("help", print_help),
OPT_PRINT("h", print_help),
OPT_PRINT("version", print_version),
OPT_PRINT("V", print_version),
a helpful new message about vd. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14777 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-23 01:37:03 +00:00
options: fix for compilation when encoding disabled HAVE_* flags are always defined so ifdef will never work. They should be checked with their values.
2014-06-11 13:55:39 +00:00
#if HAVE_ENCODING
encode: make option struct local Similar to previous commits.
2014-06-11 00:04:02 +00:00
OPT_SUBSTRUCT("", encode_opts, encode_config, 0),
cfg-mplayer: do not include encode options when encoding disabled Normally, we always want to enable encoding, as it uses stock ffmpeg APIs and has no other dependencies or disadvantages. However, supporting older releases of ffmpeg and Libav (which equal to outdated git snapshots fix security and crash fixes applied) force us to disable some advanced ffmpeg API usage, which includes encoding.
2012-11-14 01:34:42 +00:00
#endif
encode: video encoding now supported using mencoder-like options
2012-09-14 15:51:26 +00:00
options: compatibility hack for --slave-broken Seems some programs were still relying on it. Whatever, it's not hard to support. CC: @mpv-player/stable
2014-08-24 18:34:04 +00:00
OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL),
encode: make option struct local Similar to previous commits.
2014-06-11 00:04:02 +00:00
{0}
new command line/config file parser git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@148 b3059339-0415-0410-9bf9-f77b7e298cf2
2001-03-18 23:32:31 +00:00
};
Add multiple inclusion guards to all header files that lack them. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-01 21:35:58 +00:00
core: make options.c compile standalone This also removes the split between "mplayer" and "common" opts (common opts used to be shared between mencoder and mplayer).
2013-06-07 20:57:00 +00:00
const struct MPOpts mp_default_opts = {
options: add --no-terminal switch Mostly useful for internal reasons. This code will be enabled by default if mpv is started via the client API.
2014-02-06 15:49:50 +00:00
.use_terminal = 1,
msg: remove global state
2013-12-21 22:11:12 +00:00
.msg_color = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.audio_driver_list = NULL,
.audio_decoders = "-spdif:*", // never select spdif by default
.video_decoders = NULL,
core: add --deinterlace option, restore it with resume functionality The --deinterlace option does on playback start what the "deinterlace" property normally does at runtime. You could do this before by using the --vf option or by messing with the vo_vdpau default options, but this new option is supposed to be a "foolproof" way. The main motivation for adding this is so that the deinterlace property can be restored when using the video resume functionality (quit_watch_later command). Implementation-wise, this is a bit messy. The video chain is rebuilt in mpcodecs_reconfig_vo(), where we don't have access to MPContext, so the usual mechanism for enabling deinterlacing can't be used. Further, mpcodecs_reconfig_vo() is called by the video decoder, which doesn't have access to MPContext either. Moving this call to mplayer.c isn't currently possible either (see below). So we just do this before frames are filtered, which potentially means setting the deinterlacing every frame. Fortunately, setting deinterlacing is stable and idempotent, so this is hopefully not a problem. We also add a counter that is incremented on each reconfig to reduce the amount of additional work per frame to nearly zero. The reason we can't move mpcodecs_reconfig_vo() to mplayer.c is because of hardware decoding: we need to check whether the video chain works before we decide that we can use hardware decoding. Changing it so that this can be decided in advance without building a filter chain sounds like a good idea and should be done, but we aren't there yet.
2013-09-13 16:06:08 +00:00
.deinterlace = -1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.fixed_vo = 1,
.softvol = SOFTVOL_AUTO,
.softvol_max = 200,
.mixer_init_volume = -1,
.mixer_init_mute = -1,
.volstep = 3,
options: fix --gapless-audio default value It was intended to be set to "weak" (and that was even documented), but the actual setting was "no". Closes #890. CC: @mpv-player/stable
2014-06-30 16:24:20 +00:00
.gapless_audio = -1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.vo = {
.video_driver_list = NULL,
.monitor_pixel_aspect = 1.0,
.screen_id = -1,
.fsscreen_id = -1,
.panscan = 0.0f,
.keepaspect = 1,
.border = 1,
.WinID = -1,
x11: replace--[x11-]fstype option with --x11-netwm Simplifies the code a lot. You can still use --x11-netwm=no to disable NetWM for whatever reasons.
2014-05-15 22:47:13 +00:00
.x11_netwm = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
},
input: allow disabling window dragging with --no-window-dragging Requested in github issue #608.
2014-05-20 00:40:00 +00:00
.allow_win_drag = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.wintitle = "mpv - ${media-title}",
.heartbeat_interval = 30.0,
x11: enable screensaver when paused, rename/change --stop-xscreensaver Use the recently introduced screensaver VOCTRLs to control the screensaver in the X11 backend. This means the behavior when paused changes: the old code always kept the screensaver disabled, but now the screensaver is reenabled on pausing. Rename the --stop-xscreensaver option to --stop-screensaver and make it more generic. Now it affects all backends that respond to the screensaver VOCTRLs.
2013-06-13 22:24:41 +00:00
.stop_screensaver = 1,
options: cosmetics: move cursor_autohide_delay definition No functional changes.
2013-09-08 00:07:20 +00:00
.cursor_autohide_delay = 1000,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.gamma_gamma = 1000,
.gamma_brightness = 1000,
.gamma_contrast = 1000,
.gamma_saturation = 1000,
.gamma_hue = 1000,
.osd_level = 1,
.osd_duration = 1000,
.osd_bar_align_y = 0.5,
.osd_bar_w = 75.0,
.osd_bar_h = 3.125,
.osd_scale = 1,
osd: add option for "unscaled" OSD
2013-12-10 18:58:57 +00:00
.osd_scale_by_window = 1,
player: reorganize how lua scripts are loaded Make loading of scripts independent of Lua. Move some of the loading code from lua.c to scripting.c, and make it easier to add new scripting backends.
2014-05-12 23:14:07 +00:00
#if HAVE_LUA
options: enable OSC by default Can can disable it with --osc=no.
2013-10-14 19:09:54 +00:00
.lua_load_osc = 1,
player: reorganize how lua scripts are loaded Make loading of scripts independent of Lua. Move some of the loading code from lua.c to scripting.c, and make it easier to add new scripting backends.
2014-05-12 23:14:07 +00:00
#endif
lua: add option to disable auto-loading of lua scripts
2014-02-28 21:25:48 +00:00
.auto_load_scripts = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.loop_times = -1,
.ordered_chapters = 1,
.chapter_merge_threshold = 100,
command: more intuitive chapter seek behavior If close to chapter start, skipping back goes to previous chapter (no change). If more than <threshold> seconds in, skipping back will now go to the beginning of the current chapter instead. The threshold is set by the new option --chapter-seek-threshold and defaults to 5 seconds. A negative value disables the new functionality.
2013-08-14 01:25:50 +00:00
.chapter_seek_threshold = 5.0,
options: add --hr-seek-framedrop option This allows disabling of decoder framedrop during hr-seek. It's basically another useless option, but it will help exploring whether this framedropping really makes seeking faster, or whether disabling it helps with precise seeking (especially frame backstepping).
2014-05-07 20:01:17 +00:00
.hr_seek_framedrop = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.load_config = 1,
.position_resume = 1,
cache: redo options and default settings Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
2014-05-19 21:27:09 +00:00
.stream_cache = {
.size = -1,
.def_size = 25000,
.initial = 0,
.seek_min = 500,
stream: add a file cache For remarks, pretty much see the manpage additions. Could help with network streams that require too much seeking (maybe), or might be extended to help with the use case of watching and downloading a file at the same time. In general, it might be a useless feature and could be removed again.
2014-06-22 00:50:52 +00:00
.file_max = 1024 * 1024,
cache: redo options and default settings Some options change from percentages to number of kilobytes; there are no cache options using percentages anymore. Raise the default values. The cache is now 25000 kilobytes, although if your connection is slow enough, the maximum is probably never reached. (Although all the memory will still be used as seekback-cache.) Remove the separate --audio-file-cache option, and use the cache default settings for it.
2014-05-19 21:27:09 +00:00
},
demux: enable thread by default And change the defaults for the other queue options to reduce latency.
2014-08-16 15:09:08 +00:00
.demuxer_thread = 1,
.demuxer_min_packs = 0,
.demuxer_min_bytes = 0,
demux: add option to control the readahead buffer by a duration value --demuxer-readahead-secs now controls how much the demuxer should readahead by an amount of seconds. This is based on the raw packet timestamps. It's not always very exact. For example, h264 in Matroska does not store any linear timestamps (only PTS values which are going to be reordered by the decoder), so this heuristic is usually off by several hundred milliseconds. The decision whether to readahead is basically OR-ed with the other --demuxer-readahead-packets options. Change the manpage descriptions to subtly convey these semantics.
2014-08-16 15:07:36 +00:00
.demuxer_min_secs = 0.2,
network: fix rtsp playback By default, libavformat uses UDP for rtsp playback. This doesn't work very well. Apparently the reason is that the buffer sizes libavformat chooses for UDP are way too small, and switching to TCP gets rid of this issue entirely (thanks go to Reimar Döffinger for figuring this out). In theory, you can set buffer sizes as libavformat options, but that doesn't seem to help. Add an option to select the rtsp transport, and make TCP the default. Also remove an outdated comment from stream.c.
2013-09-22 00:40:29 +00:00
.network_rtsp_transport = 2,
player: redo how stream caching and pausing on low cache works Add the --cache-secs option, which literally overrides the value of --demuxer-readahead-secs if the stream cache is active. The default value is very high (10 seconds), which means it can act as network cache. Remove the old behavior of trying to pause once the byte cache runs low. Instead, do something similar wit the demuxer cache. The nice thing is that we can guess how many seconds of video it has cached, and we can make better decisions. But for now, apply a relatively naive heuristic: if the cache is below 0.5 secs, pause, and wait until at least 2 secs are available. Note that due to timestamp reordering, the estimated cached duration of video might be inaccurate, depending on the file format. If the file format has DTS, it's easy, otherwise the duration will seemingly jump back and forth.
2014-08-26 23:13:20 +00:00
.demuxer_min_secs_cache = 10,
.cache_pausing = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.chapterrange = {-1, -1},
.edition_id = -1,
.default_max_pts_correction = -1,
options: simplify --correct-pts handling Remove the (now unused) code for determining correct-pts mode based on the demuxer in use. Change its description in the manpage to reflect what this option does now.
2013-07-26 00:06:58 +00:00
.correct_pts = 1,
video: disable PTS sorting fallback by default It appears PTS sorting was useful only for avi files (and VfW-muxed mkv). Maybe it was historically also important for decoders with broken or non-existent PTS reordering (win32 codecs?). But now that we handle demuxers which outputs DTS only correctly, it just seems dead weight. Disable it by default. The --pts-association-mode option is now forced to always use the decoder's PTS value. You can still enable the old default (auto) or force sorting. But we will probably remove this option entirely at some point. Make demux_mkv export timestamps at DTS when it's in VfW mode. This is needed to get correct timestamps with the new default mode. demux_lavf already does that.
2013-11-25 22:14:54 +00:00
.user_pts_assoc_mode = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.initial_audio_sync = 1,
video: enable framedropping by default
2014-08-17 00:51:13 +00:00
.frame_dropping = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.term_osd = 2,
player: add --term-osd-bar, which shows a status bar on the terminal Feature request from github issue #451. Disabled by default, will probably stay this way.
2014-01-15 15:14:37 +00:00
.term_osd_bar_chars = "[-+-]",
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.consolecontrols = 1,
.play_frames = -1,
.keep_open = 0,
.audio_id = -1,
.video_id = -1,
.sub_id = -1,
player: fix initial selection with --secondary-sid Also, make sure that a track can't be selected twice. While this might work in some situations, it certainly won't work with subtitles demuxed from a stream. Fixes #425.
2013-12-25 10:24:37 +00:00
.sub2_id = -2,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.audio_display = 1,
.sub_visibility = 1,
.sub_pos = 100,
options: add -sub-speed option Should we actually get into trouble for unproper handling of frame-based subtitle formats, this might be the simplest way to work this around. Also is a bit more intuitive than -subfps, which might use an unknown, misdetected, or non-sense video FPS. Still pretty silly, though.
2013-06-24 22:03:37 +00:00
.sub_speed = 1.0,
quvi: disable subtitle fetching by default This is slow and unreliable, basically unusable.
2014-01-30 23:46:52 +00:00
.quvi_fetch_subtitles = 0,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.audio_output_channels = MP_CHMAP_INIT_STEREO,
audio: make internal audio format 0 an invalid format Having to use -1 for that is generally quite annoying. Audio formats are created from bitmasks, and it can't be excluded that 0 is not a valid format. Fix this by adjusting AF_FORMAT_I so that it is never 0. Along with AF_FORMAT_F and the special formats, all valid formats are covered and guaranteed to be non-0. It's possible that this commit will cause some regressions, as the check for invalid audio formats changes a bit.
2013-08-25 16:23:40 +00:00
.audio_output_format = 0, // AF_FORMAT_UNKNOWN
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.playback_speed = 1.,
.movie_aspect = -1.,
.field_dominance = -1,
options: merge ---sub-auto-match with --sub-auto There's no reason why these should be separate.
2014-05-04 08:31:24 +00:00
.sub_auto = 0,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.osd_bar_visible = 1,
configure: uniform the defines to #define HAVE_xxx (0|1) The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
2013-07-16 11:28:28 +00:00
#if HAVE_LIBASS
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.ass_enabled = 1,
#endif
.sub_scale = 1,
.ass_vsfilter_aspect_compat = 1,
sd_add: add terrible hack for (xy-)vsfilter compatibility Much has been said about this topic, we don't need to say even more. See additions to options.rst.
2013-07-14 23:48:25 +00:00
.ass_vsfilter_color_compat = 1,
sd_ass: scale blur by original video size if requested
2013-06-30 16:46:29 +00:00
.ass_vsfilter_blur_compat = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.ass_style_override = 1,
options: allow selecting the libass shaper I'm using the word "languages" instead of "scripts" in the manpage, but I think that's easier to understand with a smaller amount of descriptions.
2013-09-25 19:42:29 +00:00
.ass_shaper = 1,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
.use_embedded_fonts = 1,
options: remove use of an inverted option value Now MPOpts.sub_fix_timing corresponds to the commandline switch directly, instead of storing the inverted value.
2014-06-13 00:06:03 +00:00
.sub_fix_timing = 1,
sub: add detection via BOM Useful for Windows stuff. Actually, ENCA support should catch this, but, well, whatever, everyone seems to hate ENCA. Detection with BOM is trivial, although it needs some hackery to integrate it with the existing autodetection support. For one, change the default value of --sub-codepage to make this easier. Probably fixes issue #937 (the second part).
2014-07-22 21:40:48 +00:00
.sub_cp = "auto",
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
video: allow hardware decoding only for certain codecs In particular, this disables mpeg4. There are some files out there that use GMC, a usually rarely used and ineffective feature, which is not supported by most hardware decoders. In these cases the hw decoder outputs garbage, while software decoding works perfectly fine. We can't really fallback to software decoding in these cases, because we don't know that something is wrong in the first place. I can't see any advantages of hw decoding of mpeg4, so it's better to disable it.
2013-12-05 20:23:15 +00:00
.hwdec_codecs = "h264,vc1,wmv3",
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
options: turn --idx, --forceidx into --index Also clarify the semantics. It seems --idx didn't do anything. Possibly it used to change how the now removed legacy demuxers like demux_avi used to behave. Or maybe it was accidental. --forceidx basically becomes --index=force. It's possible that new index modes will be added in the future, so I'm keeping it extensible, instead of e.g. creating --force-index.
2014-06-13 00:05:37 +00:00
.index_mode = 1,
Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups.
2013-07-07 21:54:11 +00:00
Revert "Remove DVD and Bluray support" This reverts commit 4b93210e0c244a65ef10a566abed2ad25ecaf9a1. *shrug*
2014-07-14 23:49:02 +00:00
.dvd_angle = 1,
demux_mf: remove global option variables
2014-06-10 20:48:11 +00:00
.mf_fps = 1.0,
core: merge defaultopts.c into cfg-mplayer.h There isn't really any reason why this should be in a separate source file.
2013-06-07 20:31:26 +00:00
};
Add MPLAYER_ prefix to multiple inclusion guards. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
#endif /* MPLAYER_CFG_MPLAYER_H */
Reference in New Issue Copy Permalink