diff options
-rw-r--r-- | DOCS/man/en/changes.rst | 7 | ||||
-rw-r--r-- | DOCS/man/en/input.rst | 4 | ||||
-rw-r--r-- | DOCS/man/en/options.rst | 60 | ||||
-rw-r--r-- | DOCS/man/en/vo.rst | 10 | ||||
-rwxr-xr-x | TOOLS/mpv_identify.sh | 2 | ||||
-rw-r--r-- | options/options.c | 10 | ||||
-rw-r--r-- | options/options.h | 2 | ||||
-rw-r--r-- | player/command.c | 2 | ||||
-rw-r--r-- | video/out/cocoa_common.m | 4 |
9 files changed, 53 insertions, 48 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 32f13e32a6..ac97515f2c 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -148,6 +148,7 @@ Command Line Switches ``-af volnorm`` ``--af=drc`` (renamed) ``-afm hwac3`` ``--ad=spdif:ac3,spdif:dts`` ``-ao alsa:device=hw=0.3`` ``--ao=alsa:device=[hw:0,3]`` + ``-aspect`` ``--video-aspect`` ``-ass-bottom-margin`` ``--vf=sub=bottom:top`` ``-ass`` ``--sub-ass`` ``-audiofile-cache`` ``--audio-file-cache`` @@ -162,6 +163,7 @@ Command Line Switches ``-font`` ``--osd-font`` ``-forcedsubsonly`` ``--sub-forced-only`` ``-format`` ``--audio-format`` + ``-fstype`` ``--x11-fstype`` ``-hardframedrop`` ``--framedrop=hard`` ``-lavdopts ...`` ``--vd-lavc-...`` ``-lavfdopts`` ``--demuxer-lavf-...`` @@ -170,6 +172,7 @@ Command Line Switches ``-mixer-channel`` AO suboptions (``alsa``, ``oss``) ``-mixer`` AO suboptions (``alsa``, ``oss``) ``-mouse-movements`` ``--input-cursor`` + ``-name`` ``--x11-name`` ``-noar`` ``--no-input-appleremote`` ``-noautosub`` ``--no-sub-auto`` ``-noconsolecontrols`` ``--no-input-terminal`` @@ -240,9 +243,9 @@ input.conf and Slave Commands +--------------------------------+----------------------------------------+ | ``pt_step -1 [0|1]`` | ``playlist_prev [weak|force] (same)`` | +--------------------------------+----------------------------------------+ - | ``switch_ratio [<ratio>]`` | ``set aspect <ratio>`` | + | ``switch_ratio [<ratio>]`` | ``set video-aspect <ratio>`` | | | | - | | ``set aspect 0`` (to reset aspect) | + | | ``set video-aspect 0`` (reset aspect) | +--------------------------------+----------------------------------------+ | ``step_property_osd <prop>`` | ``cycle <prop> <step>`` (wraps), | | ``<step> <dir>`` | ``add <prop> <step>`` (clamps). | diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst index d776082191..80655ee369 100644 --- a/DOCS/man/en/input.rst +++ b/DOCS/man/en/input.rst @@ -982,8 +982,8 @@ Property list (or to be exactly, the size the video filters output). ``2`` will set the double size, ``0.5`` halves the size. -``aspect`` (RW) - Video aspect, see ``--aspect``. +``video-aspect`` (RW) + Video aspect, see ``--video-aspect``. ``osd-width``, ``osd-height`` Last known OSD width (can be 0). This is needed if you want to use the diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index cb1ce8cd54..7c9a782c33 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -97,22 +97,6 @@ OPTIONS configuration files specifying a list of fallbacks may make sense. See `AUDIO OUTPUT DRIVERS`_ for details and descriptions of available drivers. -``--aspect=<ratio>`` - Override movie aspect ratio, in case aspect information is incorrect or - missing in the file being played. See also ``--no-aspect``. - - Two values have special meaning: - - :0: disable aspect ratio handling, pretend the video has square pixels - :-1: use the video stream or container aspect (default) - - But note that handling of these special values might change in the future. - - .. admonition:: Examples - - - ``--aspect=4:3`` or ``--aspect=1.3333`` - - ``--aspect=16:9`` or ``--aspect=1.7777`` - ``--sub-ass``, ``--no-sub-ass`` Render ASS subtitles natively (enabled by default). @@ -896,8 +880,8 @@ OPTIONS This option does not work properly with all window managers. ``all`` in particular will usually only work with - ``--fstype=-fullscreen`` or ``--fstype=none``, and even then only with - some window managers. + ``--x11-fstype=-fullscreen`` or ``--x11-fstype=none``, and even then + only with some window managers. .. admonition:: Note (OS X) @@ -909,7 +893,7 @@ OPTIONS *OBSOLETE*, use the ``--fs`` option. Try this option if you still experience fullscreen problems. -``--fstype=<type1,type2,...>`` +``--x11-fstype=<type1,type2,...>`` (X11 only) Specify a priority list of fullscreen modes to be used. You can negate the modes by prefixing them with '-'. If you experience problems like the @@ -918,7 +902,7 @@ OPTIONS .. note:: - See ``--fstype=help`` for a full list of available modes. + See ``--x11-fstype=help`` for a full list of available modes. The available types are: @@ -941,13 +925,13 @@ OPTIONS .. admonition:: Examples - ``--fstype=layer,stays_on_top,above,fullscreen`` + ``--x11-fstype=layer,stays_on_top,above,fullscreen`` Default order, will be used as a fallback if incorrect or unsupported modes are specified. - ``--fstype=fullscreen`` + ``--x11-fstype=fullscreen`` Fixes fullscreen switching on OpenBox 1.x. -``--native-fs`` +``--fs-missioncontrol`` (OS X only) Use OS X Mission Control's fullscreen feature instead of the custom one provided by mpv. This can potentially break a lot of stuff like @@ -1377,7 +1361,7 @@ OPTIONS previous setting (e.g. in the config file). Overrides the ``--monitorpixelaspect`` setting if enabled. - See also ``--monitorpixelaspect`` and ``--aspect``. + See also ``--monitorpixelaspect`` and ``--video-aspect``. .. admonition:: Examples @@ -1387,7 +1371,7 @@ OPTIONS ``--monitorpixelaspect=<ratio>`` Set the aspect of a single pixel of your monitor or TV screen (default: 1). A value of 1 means square pixels (correct for (almost?) all LCDs). See - also ``--monitoraspect`` and ``--aspect``. + also ``--monitoraspect`` and ``--video-aspect``. ``--no-msgcolor`` Disable colorful console output on terminals. @@ -1429,7 +1413,7 @@ OPTIONS Set startup audio mute status. ``auto`` (default) will not change the mute status. Also see ``--volume``. -``--name`` +``--x11-name`` Set the window class name for X11-based video output methods. ``--native-keyrepeat`` @@ -1438,10 +1422,6 @@ OPTIONS depends on the VO backend and how it handles keyboard input. Does not apply to terminal input.) -``--no-aspect`` - Ignore aspect ratio information from video file and assume the video has - square pixels. See also ``--aspect``. - ``--no-cache`` Turn off input stream caching. See ``--cache``. @@ -2727,6 +2707,26 @@ OPTIONS This option is disabled if the ``--no-keepaspect`` option is used. +``--video-aspect=<ratio>`` + Override movie aspect ratio, in case aspect information is incorrect or + missing in the file being played. See also ``--no-video-aspect``. + + Two values have special meaning: + + :0: disable aspect ratio handling, pretend the video has square pixels + :-1: use the video stream or container aspect (default) + + But note that handling of these special values might change in the future. + + .. admonition:: Examples + + - ``--video-aspect=4:3`` or ``--video-aspect=1.3333`` + - ``--video-aspect=16:9`` or ``--video-aspect=1.7777`` + +``--no-video-aspect`` + Ignore aspect ratio information from video file and assume the video has + square pixels. See also ``--video-aspect``. + ``--video-pan-x=<value>``, ``--video-pan-y=<value>`` Moves the displayed video rectangle by the given value in the X or Y direction. The unit is in fractions of the size of the scaled video (the diff --git a/DOCS/man/en/vo.rst b/DOCS/man/en/vo.rst index 7a107b8564..57fe41f5b7 100644 --- a/DOCS/man/en/vo.rst +++ b/DOCS/man/en/vo.rst @@ -338,8 +338,9 @@ Available video output drivers are: disabled. ``stereo=<value>`` - Select a method for stereo display. You may have to use ``--aspect`` to - fix the aspect value. Experimental, do not expect too much from it. + Select a method for stereo display. You may have to use + ``--video-aspect`` to fix the aspect value. Experimental, do not expect + too much from it. no Normal 2D display @@ -684,8 +685,9 @@ Available video output drivers are: Set the effect strength for the ``lscale``/``cscale`` filters that support it. ``stereo=<value>`` - Select a method for stereo display. You may have to use ``--aspect`` to - fix the aspect value. Experimental, do not expect too much from it. + Select a method for stereo display. You may have to use + ``--video-aspect`` to fix the aspect value. Experimental, do not expect + too much from it. 0 Normal 2D display diff --git a/TOOLS/mpv_identify.sh b/TOOLS/mpv_identify.sh index b1c17f75c2..b8081ec969 100755 --- a/TOOLS/mpv_identify.sh +++ b/TOOLS/mpv_identify.sh @@ -86,7 +86,7 @@ __midentify__allprops=" video-bitrate video-codec video-format - aspect + video-aspect fps width height diff --git a/options/options.c b/options/options.c index 12cdda3e98..809a1838e0 100644 --- a/options/options.c +++ b/options/options.c @@ -384,8 +384,8 @@ const m_option_t mp_opts[] = { {"ssf", (void *) scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, // -1 means auto aspect (prefer container size until aspect change) // 0 means square pixels - OPT_FLOATRANGE("aspect", movie_aspect, 0, -1.0, 10.0), - OPT_FLOAT_STORE("no-aspect", movie_aspect, 0, 0.0), + OPT_FLOATRANGE("video-aspect", movie_aspect, 0, -1.0, 10.0), + OPT_FLOAT_STORE("no-video-aspect", movie_aspect, 0, 0.0), OPT_CHOICE("field-dominance", field_dominance, 0, ({"auto", -1}, {"top", 0}, {"bottom", 1})), @@ -472,7 +472,7 @@ const m_option_t mp_opts[] = { OPT_SIZE_BOX("autofit-larger", vo.autofit_larger, 0), OPT_FLAG("force-window-position", vo.force_window_position, 0), // vo name (X classname) and window title strings - OPT_STRING("name", vo.winname, 0), + OPT_STRING("x11-name", vo.winname, 0), OPT_STRING("title", wintitle, 0), // set aspect ratio of monitor - useful for 16:9 TV-out OPT_FLOATRANGE("monitoraspect", vo.force_monitor_aspect, 0, 0.0, 9.0), @@ -513,7 +513,7 @@ const m_option_t mp_opts[] = { OPT_INT64("wid", vo.WinID, CONF_GLOBAL), #if HAVE_X11 - OPT_STRINGLIST("fstype", vo.fstype_list, 0), + OPT_STRINGLIST("x11-fstype", vo.fstype_list, 0), #endif OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0), OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0), @@ -525,7 +525,7 @@ const m_option_t mp_opts[] = { ({"all", -2}, {"current", -1})), #if HAVE_COCOA - OPT_FLAG("native-fs", vo.native_fs, 0), + OPT_FLAG("fs-missioncontrol", vo.fs_missioncontrol, 0), #endif OPT_INTRANGE("brightness", gamma_brightness, 0, -100, 100), diff --git a/options/options.h b/options/options.h index 551b5911b6..4561af06b2 100644 --- a/options/options.h +++ b/options/options.h @@ -40,7 +40,7 @@ typedef struct mp_vo_opts { float monitor_pixel_aspect; int force_window_position; - int native_fs; + int fs_missioncontrol; } mp_vo_opts; typedef struct MPOpts { diff --git a/player/command.c b/player/command.c index ca07ded694..413181b530 100644 --- a/player/command.c +++ b/player/command.c @@ -2405,7 +2405,7 @@ static const m_option_t mp_properties[] = { CONF_RANGE, 0.125, 8 }, { "fps", mp_property_fps, CONF_TYPE_FLOAT, 0, 0, 0, NULL }, - { "aspect", mp_property_aspect, CONF_TYPE_FLOAT, + { "video-aspect", mp_property_aspect, CONF_TYPE_FLOAT, CONF_RANGE, -1, 10, NULL }, M_OPTION_PROPERTY_CUSTOM("vid", mp_property_video), { "program", mp_property_program, CONF_TYPE_INT, diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index bbee03b498..0e5d247256 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -326,7 +326,7 @@ static void create_window(struct vo *vo, uint32_t d_width, uint32_t d_height, vo_set_level(vo, opts->ontop); - if (opts->native_fs) { + if (opts->fs_missioncontrol) { [s->window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary]; } @@ -550,7 +550,7 @@ static void vo_cocoa_fullscreen(struct vo *vo) vo_cocoa_update_screen_info(vo); - if (opts->native_fs) { + if (opts->fs_missioncontrol) { [s->window setFullScreen:opts->fullscreen]; } else { [s->view setFullScreen:opts->fullscreen]; |