github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-07 01:47:00 +01:00
Code Releases Activity
50db7b7f75
mpv/core/defaultopts.c

78 lines
2.1 KiB
C
Raw Normal View History

Move options "vo" and "ao" to common struct
2008-04-01 16:35:10 +02:00
#include <stddef.h>
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 07:10:48 +02:00
#include "config.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 05:19:29 +02:00
#include "defaultopts.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 01:06:43 +01:00
#include "core/options.h"
#include "audio/mixer.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 05:19:29 +02:00
void set_default_mplayer_options(struct MPOpts *opts)
{
*opts = (const struct MPOpts){
Move options "vo" and "ao" to common struct
2008-04-01 16:35:10 +02:00
.audio_driver_list = NULL,
.video_driver_list = NULL,
Make -fixed-vo the default Lack of -fixed-vo causes the output window to be recreated not only when changing files but also when switching the video stream, and that happens when moving from one ordered chapter source to another. Having the window disappear and reappear (likely at another location if it was ever moved) is just too annoying.
2009-03-30 04:06:17 +02:00
.fixed_vo = 1,
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 21:41:22 +02:00
.softvol = SOFTVOL_AUTO,
mixer: make softvol default, and raise softvol-max to 200 mplayer is not a mixer control panel.
2012-07-29 22:22:28 +02:00
.softvol_max = 200,
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 13:06:37 +01:00
.ao_buffersize = -1,
core: show quvi page title in window title, clean up libquvi handling Clean up handling of libquvi (which resolves URLs of streaming sites into URLs to the actual media playable by mpv). Move the code out of open.c to quvi.c, and invoke it explicitly from mplayer.c, instead of trying to resolve every filename passed to open_stream(). This allows easily passing metadata from the quvi context to the frontend. Expose QUVIPROP_PAGETITLE as "media-title" property, and use that instead of "filename" for the mplayer window title. (For YouTube, this is the video title.) It's cleaner too. Handle a potential reliability issue: check quvi_getprop return values. Since open.c contains barely anything but the open_stream() stub, move that to stream.c and delete open.c.
2012-10-13 17:09:35 +02:00
.vo_wintitle = "mpv - ${media-title}",
Move aspect.c options to option struct
2008-05-01 10:14:29 +02:00
.monitor_pixel_aspect = 1.0,
.vo_panscanrange = 1.0,
options, x11+cocoa: add option --cursor-autohide-delay Add option --cursor-autohide-delay to control the number of milliseconds with no user interaction before the mouse cursor is hidden. There are two negative values with useful special meanings: * A value of -1 prevents the cursor from hiding (useful for users with multiple displays). * A value of -2 prevents the cursor from showing upon activity. The default is 1 second to keep the behaviour consistent with the past X11 backend implementation. Remove the vo_mouse_autohide field as it was always true.
2011-12-08 11:17:59 +01:00
.cursor_autohide_delay = 1000,
Move vo_gamma_* to options struct
2008-04-25 06:12:05 +02:00
.vo_gamma_gamma = 1000,
.vo_gamma_brightness = 1000,
.vo_gamma_contrast = 1000,
.vo_gamma_saturation = 1000,
.vo_gamma_hue = 1000,
mplayer: unbreak OSD with CONFIG_ENCODING undefined Basically, the encoding code path wanted to set osdlevel=0 as default, while normal playback needs osdlevel=1. For this purpose, osdlevel was set to -1 (i.e. invalid) initially to detect whether the --osdlevel option was explicitly set. When encoding was not configured (CONFIG_ENCODING undefined), the osdlevel value was not set from -1 to 1 properly, and the OSD remained invisible by default. Fix this by getting rid of this logic. It shouldn't be needed, since osdlevel=1 never shows any OSD messages without user interaction. Should this ever change, we could still check whether encoding is in progress, or add another option to allow OSD rendering during encoding.
2012-09-17 09:03:45 +02:00
.osd_level = 1,
options: Move osd_level and osd_duration to options struct
2009-03-30 01:06:58 +02:00
.osd_duration = 1000,
Move loop_times to option struct
2008-04-21 04:18:40 +02:00
.loop_times = -1,
Add option -noordered-chapters.
2009-04-08 01:37:27 +02:00
.ordered_chapters = 1,
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 15:56:05 +01:00
.chapter_merge_threshold = 100,
options: move -cache-min and cache-seek-min to option struct
2010-11-11 16:36:09 +01:00
.stream_cache_min_percent = 20.0,
.stream_cache_seek_min_percent = 50.0,
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 19:09:31 +02:00
.chapterrange = {-1, -1},
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 13:28:34 +01:00
.edition_id = -1,
Move correct_pts to options struct
2008-04-16 06:11:12 +02:00
.user_correct_pts = -1,
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 18:27:01 +01:00
.initial_audio_sync = 1,
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 19:48:50 +01:00
.term_osd = 2,
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 22:10:58 +01:00
.consolecontrols = 1,
Move key_fifo_size & doubleclick_time to options struct
2008-04-29 14:44:03 +02:00
.doubleclick_time = 300,
Move audio_id and video_id to options struct
2008-04-23 06:01:31 +02:00
.audio_id = -1,
.video_id = -1,
Merge svn changes up to r29752 As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
2009-10-06 03:28:59 +02:00
.sub_id = -1,
subs: always use sub decoder framework for libass rendering Remove subtitle selection code setting osd->ass_track directly and vf_ass/vf_vo code rendering the track directly with libass. Instead, do track selection and rendering with dec_sub.c functions. Before, mpctx->set_of_ass_tracks[] contained bare libass tracks generated from external subtitle files. For use with dec_sub.c, it now contains struct sh_sub instances with decoder already initialized. This commit breaks the sub_step command ('g' and 'y' keys) for libass-rendered subtitles. It could be fixed, but it's so useless - especially as with the existing implementation there's no practical way to get subtitle delay back to normal after using it - that I didn't bother. Conflicts: command.c mp_core.h mplayer.c
2012-08-25 20:22:39 +02:00
.sub_visibility = 1,
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 15:24:17 +01:00
.extension_parsing = 1,
options: move audio_output_channels, audio_output_format to struct
2010-10-31 06:26:40 +01:00
.audio_output_channels = 2,
.audio_output_format = -1, // AF_FORMAT_UNKNOWN
Move playback_speed to options struct
2008-04-21 05:55:23 +02:00
.playback_speed = 1.,
options: fix -a52drc default value (should be 1) Commit 3f076c0fb3 ("options: move -a52drc to option struct") from yesterday left out setting the default value of the option, effectively changing the default from 1 to 0. Add the missing part to change it back to 1.
2010-06-03 14:34:35 +02:00
.drc_level = 1.,
Move movie_aspect to options struct
2008-04-24 06:36:43 +02:00
.movie_aspect = -1.,
Move flip and softzoom to options struct
2008-04-24 06:14:05 +02:00
.flip = -1,
options: move sub_name, sub_auto and vobsub_name to struct
2011-02-08 00:35:51 +01:00
.sub_auto = 1,
subtitles: options: enable -ass by default There are still some problems with -ass. For example some other subtitle options won't work the same way or at all with it enabled, and inserting the video filter for VOs that lack native rendering support won't work with different colorspaces. However I think that the benefit from styling support outweights those disadvantages, and also that the "discoverability" of features is better this way; it will be easier for people who encounter problems to find -noass than for people who see no styling to find out that they could add it with -ass. Enable -ass by default. Also fix other outdated information in the manpage entries for -ass and -fontconfig.
2011-01-26 04:50:23 +01:00
#ifdef CONFIG_ASS
.ass_enabled = 1,
#endif
options: move libass-related options to struct
2011-09-03 12:47:56 +02:00
.ass_font_scale = 1,
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 21:47:36 +02:00
.ass_vsfilter_aspect_compat = 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 02:23:29 +02:00
.ass_style_override = 1,
options: move libass-related options to struct
2011-09-03 12:47:56 +02:00
.use_embedded_fonts = 1,
subtitles: options: enable -ass by default There are still some problems with -ass. For example some other subtitle options won't work the same way or at all with it enabled, and inserting the video filter for VOs that lack native rendering support won't work with different colorspaces. However I think that the benefit from styling support outweights those disadvantages, and also that the "discoverability" of features is better this way; it will be easier for people who encounter problems to find -noass than for people who see no styling to find out that they could add it with -ass. Enable -ass by default. Also fix other outdated information in the manpage entries for -ass and -fontconfig.
2011-01-26 04:50:23 +01:00
defaultopts.c: Minor simplification This happens to avoid a compiler bug in the current GCC development branch.
2009-04-09 03:18:39 +02:00
.lavc_param = {
Move -lavdopts to options struct
2008-04-24 02:59:21 +02:00
.workaround_bugs = 1, // autodetect
.error_concealment = 3,
},
defaultopts.c: Minor simplification This happens to avoid a compiler bug in the current GCC development branch.
2009-04-09 03:18:39 +02:00
.input = {
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 03:47:50 +02:00
.key_fifo_size = 7,
Move input options to option struct
2008-04-30 17:57:02 +02:00
.ar_delay = 100,
.ar_rate = 8,
.use_joystick = 1,
.use_lirc = 1,
.use_lircc = 1,
options: fix -ar default back to enabled if available Due to a missed config variable rename -noar was always the default. Make it default to enabled if available as it was before.
2009-02-16 22:16:11 +01:00
#ifdef CONFIG_APPLE_REMOTE
Move input options to option struct
2008-04-30 17:57:02 +02:00
.use_ar = 1,
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 07:10:48 +02:00
#endif
Merge svn changes up to r29117
2009-04-01 01:26:34 +02:00
.default_bindings = 1,
Move input options to option struct
2008-04-30 17:57:02 +02:00
}
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 05:19:29 +02:00
};
}
Copy Permalink