RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 00:42:57 +00:00
Code Issues Releases Wiki Activity
a43a4aafd0
mpv/options.h

157 lines
3.6 KiB
C
Raw Normal View History

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
#ifndef MPLAYER_OPTIONS_H
#define MPLAYER_OPTIONS_H
typedef struct MPOpts {
Move options "vo" and "ao" to common struct
2008-04-01 14:35:10 +00:00
char **video_driver_list;
char **audio_driver_list;
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
int fixed_vo;
Move vo_ontop to options struct Add a 'struct vo *vo' argument to the x11_common.c functions that access the variable so it's available as vo->opts->vo_ontop. To keep VOs using the old API working create a global vo variable that is set to the currently used old vo. "vo_ontop" will be #defined to "global_vo->opts->vo_ontop", and x11_common.h will add defines like the following when it is included by old VOs: #define vo_x11_ontop() vo_x11_ontop(global_vo) so that they will call the function according to the new declaration.
2008-04-19 04:45:16 +00:00
int vo_ontop;
audio: add -gapless-audio option If the option is enabled and all audio has been buffered to the AO, then the player will move to the next file without waiting for the buffered audio to drain, while leaving the AO initialized. If the playback of the next file starts quickly enough (before the AO buffer empties) then it should continue writing audio to the same AO with no gap in between.
2010-11-12 12:06:37 +00:00
int gapless_audio;
int ao_buffersize;
Move opt_screen_size_[x|y] to options struct
2008-04-24 04:23:15 +00:00
int screen_size_x;
int screen_size_y;
Move vo_screenwidth,vo_screenheight to options struct
2008-04-20 23:18:28 +00:00
int vo_screenwidth;
int vo_screenheight;
VO: Don't force window position in X11 VOs Disable by default the code that forcefully moved the video output window to the middle of the screen whenever it was reconfigured or created. That behavior was really annoying when switching video streams within a file, and overriding the window manager like that is not good default behavior for the initial creation of a window either. Add a new option "-force-window-position" that can be used to restore the old behavior.
2009-03-20 13:22:15 +00:00
int force_window_position;
options: move -name and -title to option struct
2010-11-04 03:41:11 +00:00
char *vo_winname;
char *vo_wintitle;
Move aspect.c options to option struct
2008-05-01 08:14:29 +00:00
float force_monitor_aspect;
float monitor_pixel_aspect;
Move vidmode to options struct
2008-04-24 04:01:53 +00:00
int vidmode;
Move fullscreen to options struct
2008-04-24 03:58:16 +00:00
int fullscreen;
Move vo_dbpp to options struct
2008-04-20 21:37:12 +00:00
int vo_dbpp;
Move aspect.c options to option struct
2008-05-01 08:14:29 +00:00
float vo_panscanrange;
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
int requested_colorspace;
int requested_input_range;
int requested_output_range;
Move vo_gamma_* to options struct
2008-04-25 04:12:05 +00:00
// ranges -100 - 100, 1000 if the vo default should be used
int vo_gamma_gamma;
int vo_gamma_brightness;
int vo_gamma_contrast;
int vo_gamma_saturation;
int vo_gamma_hue;
options: Move osd_level and osd_duration to options struct
2009-03-29 23:06:58 +00:00
int osd_level;
int osd_duration;
OSD: support displaying fractional part of current position Add option -osd-fractions which enables display of fractional seconds when showing the current playback time on OSD. Based on a patch from Christian <herr.mitterlehner@gsmpaaiml.com> but with several modifications.
2011-04-12 15:11:12 +00:00
int osd_fractions;
options: move sub_name, sub_auto and vobsub_name to struct
2011-02-07 23:35:51 +00:00
char *vobsub_name;
options: more mplayer.c options moved to option struct Following options were moved: autoq, benchmark, [no]term-osd, term-osd-esc, playing-msg, [no]idle, [no]consolecontrols, list-properties.
2010-11-13 21:10:58 +00:00
int auto_quality;
int benchmark;
options: move -dumpfile to option struct
2010-11-02 01:05:39 +00:00
char *stream_dump_name;
Add a simple capture feature (-capture) If a specified key is pressed during playback, the current stream is captured to a file, similar to what -dumpstream achieves. original patch by Pásztor Szilárd, don tricon hu Taken from the following svn commits, but with several fixes and modifications (one obvious user-visible difference is that the default key binding is 'C', not 'c'): git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32524 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32529 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32530 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 01:17:41 +00:00
int capture_dump;
Move loop_times to option struct
2008-04-21 02:18:40 +00:00
int loop_times;
Add option -noordered-chapters.
2009-04-07 23:37:27 +00:00
int ordered_chapters;
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
int chapter_merge_threshold;
options: move various mplayer.c options to option struct Following options were moved: [no]quiet, [no]autosync, softsleep, [no]rtc, rtc-device.
2010-11-12 20:04:16 +00:00
int quiet;
options: move -noconfig to option struct, simplify
2011-01-11 15:28:10 +00:00
int noconfig;
options: move -cache-min and cache-seek-min to option struct
2010-11-11 15:36:09 +00:00
float stream_cache_min_percent;
float stream_cache_seek_min_percent;
options: move -chapter values to option struct -chapter can optionally take a range with a start and an end. Add a new option type which supports such values and use that instead of a custom per-option function. This commit also fixes a build configuration bug: before the availability of the -chapter option depended on DVD functionality being enabled in the binary, even though the option works with other sources too.
2010-04-24 17:09:31 +00:00
int chapterrange[2];
Support for multiple editions in Matroska Add code to intelligently choose an appropriate Matroska edition when there are several. Will choose, in descending order of preference: the edition chosen by the user through the option "-edition <edition id>" if it exists, the first edition with EditionFlagDefault set to 1 if there is one, or the first edition.
2009-12-01 12:28:34 +00:00
int edition_id;
options.h: Field order cosmetics Move correct_pts and user_correct_pts next to each other. loop_times was accidentally added between them.
2008-04-25 10:30:44 +00:00
int correct_pts;
Move correct_pts to options struct
2008-04-16 04:11:12 +00:00
int user_correct_pts;
core: Add support for decoder reordering of pts values Add a mode where libavcodec's reordered_opaque feature is used to associate container packet timestamps with decoded frames. This should improve behavior at least for MPEG files with interlaced h264; the previous code does not cope well with the libavformat demuxer producing two field packets with separate timestamps but the libavcodec h264 decoder only producing a single output frame for those two packets (so half the timestamps have no associated output frame). The current libavformat mpeg demuxer seems to finally work with interlaced h264 files and produce valid timestamps which are useful with a mode like this. By default MPlayer now selects between this new mode and the old one automatically based on the number of timestamp problems they cause; by default the new mode is used if both seem to work. The new option -pts-association-mode can be used to force a particular mode. If correct-pts mode is disabled this has no effect on timing. Also remove the "EXPERIMENTAL" marker from the manpage description of -correct-pts.
2009-11-21 18:53:10 +00:00
int user_pts_assoc_mode;
core: do initial A-V sync by modifying audio stream Add code to enforce matching pts with video when (re)starting the audio stream, by either cutting away the first samples or inserting silence at the beginning. New option -noinitial-audio-sync can be used to disable this and return to old behavior.
2010-11-13 17:27:01 +00:00
int initial_audio_sync;
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
int hr_seek;
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
float hr_seek_demuxer_offset;
options: move various mplayer.c options to option struct Following options were moved: [no]quiet, [no]autosync, softsleep, [no]rtc, rtc-device.
2010-11-12 20:04:16 +00:00
int autosync;
int softsleep;
int rtc;
char *rtc_device;
options: more mplayer.c options moved to option struct Following options were moved: autoq, benchmark, [no]term-osd, term-osd-esc, playing-msg, [no]idle, [no]consolecontrols, list-properties.
2010-11-13 21:10:58 +00:00
int term_osd;
char *term_osd_esc;
char *playing_msg;
int player_idle_mode;
int consolecontrols;
Move key_fifo_size & doubleclick_time to options struct
2008-04-29 12:44:03 +00:00
int doubleclick_time;
options: more mplayer.c options moved to option struct Following options were moved: autoq, benchmark, [no]term-osd, term-osd-esc, playing-msg, [no]idle, [no]consolecontrols, list-properties.
2010-11-13 21:10:58 +00:00
int list_properties;
core: improve --loop handling Make per-file loop option start from --ss position, not always 0. Do looping in more cases; before looping was only done when encountering real end of file, now it also happens for example at --endpos or --frames limits. Also move the --ss option to the option struct.
2011-07-28 08:39:43 +00:00
double seek_to_sec;
Move audio_id and video_id to options struct
2008-04-23 04:01:31 +00:00
int audio_id;
int video_id;
Move dvdsub_id to options struct Name the field "sub_id" as it's not specific to DVD subs. Remove some other unused extern declarations together with dvdsub_id from demux_mkv.c and demux_lavf.c.
2008-04-23 04:41:17 +00:00
int sub_id;
options: change -alang and -slang to use string list type There is no reason to use manual language list splitting when an automatic split function is already available. Some types change from "unsigned char" to "char", but this shouldn't cause issues since [as]lang settings are unlikely to have characters above 127.
2011-02-18 14:32:40 +00:00
char **audio_lang;
char **sub_lang;
options: move [no]hr-mp3-seek to option struct
2010-11-11 15:34:53 +00:00
int hr_mp3_seek;
options: move some demux options to option struct Following options were moved: audiofile, audiofile-cache, subfile, demuxer, audio-demuxer, sub-demuxer, [no]extbased.
2010-11-11 14:24:17 +00:00
char *audio_stream;
int audio_stream_cache;
char *sub_stream;
char *demuxer_name;
char *audio_demuxer_name;
char *sub_demuxer_name;
int extension_parsing;
options: move audio_output_channels, audio_output_format to struct
2010-10-31 05:26:40 +00:00
int audio_output_channels;
int audio_output_format;
Move playback_speed to options struct
2008-04-21 03:55:23 +00:00
float playback_speed;
options: move -a52drc to option struct Also allow a range up to 2.
2010-06-02 15:30:51 +00:00
float drc_level;
Move vf_settings to options struct
2008-04-25 10:58:12 +00:00
struct m_obj_settings *vf_settings;
Move flip and softzoom to options struct
2008-04-24 04:14:05 +00:00
int softzoom;
Move movie_aspect to options struct
2008-04-24 04:36:43 +00:00
float movie_aspect;
Move screen_size_xy to options struct
2008-04-24 04:28:20 +00:00
float screen_size_xy;
Move flip and softzoom to options struct
2008-04-24 04:14:05 +00:00
int flip;
Move vd_use_slices to options struct
2008-04-24 05:20:59 +00:00
int vd_use_slices;
options: move sub_name, sub_auto and vobsub_name to struct
2011-02-07 23:35:51 +00:00
char **sub_name;
subs: options: add -sub-paths
2011-03-03 10:31:12 +00:00
char **sub_paths;
options: move sub_name, sub_auto and vobsub_name to struct
2011-02-07 23:35:51 +00:00
int sub_auto;
options: Move ass_enabled to options struct
2009-12-02 15:36:59 +00:00
int ass_enabled;
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
float ass_font_scale;
float ass_line_spacing;
int ass_top_margin;
int ass_bottom_margin;
int ass_use_margins;
options, subs: add --ass-vsfilter-aspect-compat Add option --ass-vsfilter-aspect-compat and corresponding property ass_vsfilter_aspect_compat. The setting controls whether to enable the emulation of traditional VSFilter behavior where subtitles are stretched if the video is anamorphic (previously always enabled for native SSA/ASS subtitles). Enabled by default. Add 'V' as a new default keybinding to toggle the property.
2011-08-04 19:47:36 +00:00
int ass_vsfilter_aspect_compat;
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
int use_embedded_fonts;
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
char **ass_force_style_list;
options: move libass-related options to struct
2011-09-03 10:47:56 +00:00
char *ass_color;
char *ass_border_color;
char *ass_styles_file;
int ass_hinting;
Move -lavdopts to options struct
2008-04-24 00:59:21 +00:00
struct lavc_param {
int workaround_bugs;
int error_resilience;
int error_concealment;
int gray;
int vstats;
int idct_algo;
int debug;
int vismv;
int skip_top;
int skip_bottom;
int fast;
char *lowres_str;
char *skip_loop_filter_str;
char *skip_idct_str;
char *skip_frame_str;
int threads;
int bitexact;
Merge svn changes up to r26783 Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
2008-05-15 18:19:35 +00:00
char *avopt;
Move -lavdopts to options struct
2008-04-24 00:59:21 +00:00
} lavc_param;
options: move lavfdopts to option struct
2010-04-23 19:08:18 +00:00
struct lavfdopts {
unsigned int probesize;
unsigned int analyzeduration;
char *format;
char *cryptokey;
char *avopt;
} lavfdopts;
Move input options to option struct
2008-04-30 15:57:02 +00:00
struct input_conf {
char *config_file;
input: rework event reading and command queuing Rework much of the logic related to reading from event sources and queuing commands. The two biggest architecture changes are: - The code buffering keycodes in mp_fifo.c is gone. Instead key input is now immediately fed to input.c and interpreted as commands, and then the commands are buffered instead. - mp_input_get_cmd() now always tries to read every available event from every event source and convert them to (buffered) commands. Before it would only process new events until one new command became available. Some relevant behavior changes: - Before commands could be lost when stream code called mp_input_check_interrupt() which read commands (to see if they were of types that triggered aborts during slow IO tasks) and then threw them away. This was especially an issue if cache was enabled and slow to read. Fixed - now it's possible to check whether there are queued commands which will abort playback of the current file without throwing other commands away. - mp_input_check_interrupt() now prints a message if it returns true. This is especially useful because the failures caused by aborted stream reads can trigger error messages from other code that was doing the read; the new message makes it more obvious what the cause of the subsequent error messages is. - It's now possible to again avoid making stdin non-blocking (which caused some issues) without reintroducing extra latency. The change will be done in a subsequent commit. - Event sources that do not support select() should now have somewhat lower latency in certain situations as they will be checked both before and after select()/sleep in input reading; before the sleep always happened first even if such sources already had queued input. Before the key fifo was also handled in this manner (first key triggered select, but if multiple were read then rest could be delayed; however in most cases this didn't add latency in practice as after central code started doing command handling it queried for further commands with a max sleep time of 0). - Key fifo limiting is more accurate now: it now counts actual commands intead of keycodes, and all queued keys are read immediately from input devices so they can be counted correctly. - Since keypresses are now interpreted immediately, commands which change keybindings will no longer affect following keypresses that have already been read before the command is executed. This should not be an issue in practice with current keybinding behavior.
2011-07-17 01:47:50 +00:00
int key_fifo_size;
Move input options to option struct
2008-04-30 15:57:02 +00:00
unsigned int ar_delay;
unsigned int ar_rate;
char *js_dev;
Merge svn changes up to r26979 Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
2008-06-04 05:10:48 +00:00
char *ar_dev;
Move input options to option struct
2008-04-30 15:57:02 +00:00
char *in_file;
int use_joystick;
int use_lirc;
int use_lircc;
int use_ar; // apple remote
Merge svn changes up to r29117
2009-03-31 23:26:34 +00:00
int default_bindings;
Move input options to option struct
2008-04-30 15:57:02 +00:00
} input;
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
} MPOpts;
#endif
Reference in New Issue Copy Permalink