mirror of
https://github.com/mpv-player/mpv
synced 2024-09-28 17:52:52 +02:00
82b8f89bae
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.
140 lines
3.1 KiB
C
140 lines
3.1 KiB
C
#ifndef MPLAYER_OPTIONS_H
|
|
#define MPLAYER_OPTIONS_H
|
|
|
|
typedef struct MPOpts {
|
|
char **video_driver_list;
|
|
char **audio_driver_list;
|
|
int fixed_vo;
|
|
int vo_ontop;
|
|
int gapless_audio;
|
|
int ao_buffersize;
|
|
int screen_size_x;
|
|
int screen_size_y;
|
|
int vo_screenwidth;
|
|
int vo_screenheight;
|
|
int force_window_position;
|
|
char *vo_winname;
|
|
char *vo_wintitle;
|
|
float force_monitor_aspect;
|
|
float monitor_pixel_aspect;
|
|
int vidmode;
|
|
int fullscreen;
|
|
int vo_dbpp;
|
|
float vo_panscanrange;
|
|
|
|
// 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;
|
|
|
|
int osd_level;
|
|
int osd_duration;
|
|
int osd_fractions;
|
|
char *vobsub_name;
|
|
int auto_quality;
|
|
int benchmark;
|
|
char *stream_dump_name;
|
|
int capture_dump;
|
|
int loop_times;
|
|
int ordered_chapters;
|
|
int chapter_merge_threshold;
|
|
int quiet;
|
|
int noconfig;
|
|
float stream_cache_min_percent;
|
|
float stream_cache_seek_min_percent;
|
|
int chapterrange[2];
|
|
int edition_id;
|
|
int correct_pts;
|
|
int user_correct_pts;
|
|
int user_pts_assoc_mode;
|
|
int initial_audio_sync;
|
|
int hr_seek;
|
|
int autosync;
|
|
int softsleep;
|
|
int rtc;
|
|
char *rtc_device;
|
|
int term_osd;
|
|
char *term_osd_esc;
|
|
char *playing_msg;
|
|
int player_idle_mode;
|
|
int consolecontrols;
|
|
int doubleclick_time;
|
|
int list_properties;
|
|
int audio_id;
|
|
int video_id;
|
|
int sub_id;
|
|
char **audio_lang;
|
|
char **sub_lang;
|
|
int hr_mp3_seek;
|
|
|
|
char *audio_stream;
|
|
int audio_stream_cache;
|
|
char *sub_stream;
|
|
char *demuxer_name;
|
|
char *audio_demuxer_name;
|
|
char *sub_demuxer_name;
|
|
int extension_parsing;
|
|
|
|
int audio_output_channels;
|
|
int audio_output_format;
|
|
float playback_speed;
|
|
float drc_level;
|
|
struct m_obj_settings *vf_settings;
|
|
int softzoom;
|
|
float movie_aspect;
|
|
float screen_size_xy;
|
|
int flip;
|
|
int vd_use_slices;
|
|
char **sub_name;
|
|
char **sub_paths;
|
|
int sub_auto;
|
|
int ass_enabled;
|
|
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;
|
|
char *avopt;
|
|
} lavc_param;
|
|
|
|
struct lavfdopts {
|
|
unsigned int probesize;
|
|
unsigned int analyzeduration;
|
|
char *format;
|
|
char *cryptokey;
|
|
char *avopt;
|
|
} lavfdopts;
|
|
|
|
struct input_conf {
|
|
char *config_file;
|
|
int key_fifo_size;
|
|
unsigned int ar_delay;
|
|
unsigned int ar_rate;
|
|
char *js_dev;
|
|
char *ar_dev;
|
|
char *in_file;
|
|
int use_joystick;
|
|
int use_lirc;
|
|
int use_lircc;
|
|
int use_ar; // apple remote
|
|
int default_bindings;
|
|
} input;
|
|
} MPOpts;
|
|
|
|
#endif
|