From 6f1486b397d632feaa71f88b980491aea7b69256 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 17 Sep 2012 08:38:19 +0200 Subject: 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. --- DOCS/man/en/options.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 431ff1a7de..59ce49a308 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -643,11 +643,14 @@ --fps= Override video framerate. Useful if the original value is wrong or missing. ---framedrop +--framedrop= Skip displaying some frames to maintain A/V sync on slow systems. Video filters are not applied to such frames. For B-frames even decoding is - skipped completely. May produce unwatchably choppy output. See also - ``--hardframedrop``. + skipped completely. May produce unwatchably choppy output. With ``hard``, + decoding and output of any frame can be skipped, and will lead to an even + worse playback experience. + + Practical use of this feature is questionable. Disabled by default. --frames= Play/convert only first frames, then quit. @@ -753,9 +756,6 @@ ``--no-grabpointer`` tells the player to not grab the mouse pointer after a video mode change (``--vm``). Useful for multihead setups. ---hardframedrop - More intense frame dropping (breaks decoding). Leads to image distortion! - --heartbeat-cmd Command that is executed every 30 seconds during playback via *system()* - i.e. using the shell. -- cgit v1.2.3 From 10437c35df5d3944625fa6cee05e565b0791fe15 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 17 Sep 2012 08:45:35 +0200 Subject: 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. --- DOCS/man/en/options.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 59ce49a308..70b791c1ba 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1294,7 +1294,7 @@ --osd-fractions Show OSD times with fractions of seconds. ---osdlevel=<0-3> +--osd-level=<0-3> Specifies which mode the OSD should start in. :0: subtitles only -- cgit v1.2.3 From 1a5a7a49293c2c70a5caf9d51dad7bd5aa938471 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 18 Sep 2012 15:50:24 +0200 Subject: 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. --- DOCS/man/en/options.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 70b791c1ba..da7ed79e03 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -87,8 +87,8 @@ :``--afm=ffmpeg``: Try FFmpeg's libavcodec codecs first. :``--afm=acm,dshow``: Try Win32 codecs first. ---aid= - Select audio channel. ``auto`` selects the default, ``off`` disables audio. +--aid= + Select audio channel. ``auto`` selects the default, ``no`` disables audio. See also ``--alang``. --alang= @@ -789,7 +789,7 @@ backwards since it has to rewind to the beginning to find an exact frame position. ---hr-seek= +--hr-seek= Select when to use precise seeks that are not limited to keyframes. Such seeks require decoding video from the previous keyframe up to the target position and so can take some time depending on decoding performance. For @@ -797,11 +797,11 @@ default choice to use for seeks; it's possible to explicitly override that default in the definition of key bindings and in slave mode commands. - :off: Never use precise seeks. + :no: Never use precise seeks. :absolute: Use precise seeks if the seek is to an absolute position in the file, such as a chapter seek, but not for relative seeks like the default behavior of arrow keys (default). - :always: Use precise seeks whenever possible. + :yes: Use precise seeks whenever possible. --hr-seek-demuxer-offset= This option exists to work around failures to do precise seeks (as in @@ -1139,8 +1139,8 @@ *NOTE*: This option is obsolete now that MPlayer has OpenDML support. ---loop= - Loops playback times. ``inf`` means forever and ``off`` disables +--loop= + Loops playback times. ``inf`` means forever and ``no`` disables looping. --mc= @@ -1694,9 +1694,9 @@ --shuffle Play files in random order. ---sid= +--sid= Display the subtitle stream specified by (0-31). ``auto`` selects the - default, ``off`` disables subtitles. + default, ``no`` disables subtitles. See also ``--slang``, ``--vobsubid``, ``--no-sub``. --slang= @@ -2256,8 +2256,8 @@ :``--vfm=xanim``: Try XAnim codecs first. ---vid= - Select video channel. ``auto`` selects the default, ``off`` disables video. +--vid= + Select video channel. ``auto`` selects the default, ``no`` disables video. --vm Try to change to a different video mode. Supported by the x11 and xv video -- cgit v1.2.3 From dec53f760e12254e4baa4f7cee59010b3b10b6be Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 18 Sep 2012 20:07:24 +0200 Subject: commands: add more property-option bridge uses, rename some options Make more properties use the property-to-option bridge to reduce code size and to enforce consistency. Some options are renamed to the same as the properties (the property names are better in all cases). Do some other minor cleanups. One bigger issue was memory management of strings: M_PROPERTY_TO_STRING assumed the strings were statically allocated, and no dynamic allocations could be returned. Fix this in case the need for such properties arises in the future. Get rid of m_property_string_ro(), because it's not always clear that the "action" parameter is M_PROPERTY_SET and the string argument will be used. --- DOCS/man/en/options.rst | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index da7ed79e03..342626d5d2 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -472,7 +472,7 @@ will stay hidden. Supported by video output drivers which use X11 or OS X Cocoa. ---delay= +--audio-delay= audio delay in seconds (positive or negative float value). Negative values delay the audio, and positive values delay the video. @@ -624,7 +624,7 @@ there is a change in video parameters, video stream or file. This used to be the default behavior. Currently only affects X11 VOs. ---forcedsubsonly +--sub-forced-only Display only forced subtitles for the DVD subtitle stream selected by e.g. ``--slang``. @@ -659,6 +659,7 @@ Specifies the character set that will be passed to FriBiDi when decoding non-UTF-8 subtitles (default: ISO8859-8). +--fullscreen --fs Fullscreen playback (centers movie, and paints black bands around it). @@ -1312,9 +1313,6 @@ controls how much of the image is cropped. May not work with all video output drivers. - *NOTE*: Values between -1 and 0 are allowed as well, but highly - experimental and may crash or worse. Use at your own risk! - --panscanrange=<-19.0-99.0> (experimental) Change the range of the pan-and-scan functionality (default: 1). Positive @@ -1894,7 +1892,7 @@ - ``--subcp=enca:pl:cp1250`` guess the encoding for Polish, fall back on cp1250. ---subdelay= +--sub-delay= Delays subtitles by seconds. Can be negative. --subfile= @@ -1941,7 +1939,7 @@ *NOTE*: > movie fps speeds the subtitles up for frame-based subtitle files and slows them down for time-based ones. ---subpos=<0-100> +--sub-pos=<0-100> Specify the position of subtitles on the screen. The value is the vertical position of the subtitle in % of the screen height. Can be useful with ``--vf=expand``. -- cgit v1.2.3 From 65074ec1f074d22101b4c8bd95eb4a0354401246 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 27 Sep 2012 03:20:12 +0200 Subject: manpage: document input.conf related things This directly corresponds to DOCS/OUTDATED-tech/slave.txt. Changes from the recent commits are included too. --- DOCS/man/en/options.rst | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 342626d5d2..453c8e052f 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1326,15 +1326,33 @@ See also ``--user``. --playing-msg= - Print out a string before starting playback. The following expansions are - supported: + Print out a string before starting playback. The string is expanded for + properties, e.g. ``--playing-msg=file: ${filename}`` will print the string + ``file: `` followed by the currently played filename. + + The following expansions are supported: ${NAME} - Expand to the value of the property ``NAME``. - ?(NAME:TEXT) - Expand ``TEXT`` only if the property ``NAME`` is available. - ?(!NAME:TEXT) - Expand ``TEXT`` only if the property ``NAME`` is not available. + Expands to the value of the property ``NAME``. If ``NAME`` starts with + ``=``, use the raw value of the property. If retrieving the property + fails, expand to an error string. (Use ``${NAME:}`` with a trailing + ``:`` to expand to an empty string instead.) + ${NAME:STR} + Expands to the value of the property ``NAME``, or ``STR`` if the + property can't be retrieved. ``STR`` is expanded recursively. + ${!NAME:STR} + Expands to ``STR`` (recursively) if the property ``NAME`` can't be + retrieved. + ${?NAME:STR} + Expands to ``STR`` (recursively) if the property ``NAME`` is available. + $$ + Expands to ``$``. + $} + Expands to ``}``. (To produce this character inside rexursive + expansion.) + $> + Disable property expansion and special handling of ``$`` for the rest + of the string. --playlist= Play files according to a playlist file (ASX, Winamp, SMIL, or @@ -1980,7 +1998,7 @@ the line used for the OSD and clear it (default: ``^[[A\r^[[K``). --title - Set the window title. The string can contain property names. + Set the window title. Properties are expanded (see ``--playing-msg``). --tv= This option tunes various properties of the TV capture module. For -- cgit v1.2.3 From fd56c168aedb41a7d98dc4af32644d970eb81331 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 2 Oct 2012 03:12:09 +0200 Subject: options: add --status-msg Replaces the status line with a custom string. This is probably useful for hacking old slave mode applications into working again. Even if not, this might be generally useful. --- DOCS/man/en/options.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 453c8e052f..875b9c4b4a 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1354,6 +1354,10 @@ Disable property expansion and special handling of ``$`` for the rest of the string. +--status-msg= + Print out a custom string during playback instead of the standard status + line. Expands properties. See ``--playing-msg``. + --playlist= Play files according to a playlist file (ASX, Winamp, SMIL, or one-file-per-line format). -- cgit v1.2.3 From c9df2c8bd83b31375a79ab2bc4f854a53ff019c1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 Oct 2012 02:23:29 +0200 Subject: 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. --- DOCS/man/en/options.rst | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'DOCS/man/en/options.rst') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 875b9c4b4a..6151e0d21a 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -176,6 +176,14 @@ rendering text subtitles. The syntax of the file is exactly like the ``[V4 Styles]`` / ``[V4+ Styles]`` section of SSA/ASS. +--ass-style-override= + Control whether user style overrides should be applied. + + :yes: Apply all the ``--ass-*`` style override options. Changing the default + for any of these options can lead to incorrect subtitle rendering. + (Default.) + :no: Render subtitles as forced by subtitle scripts. + --ass-top-margin= Adds a black band at the top of the frame. The SSA/ASS renderer can place toptitles there (with ``--ass-use-margins``). -- cgit v1.2.3