From 34bead485987b416685e73ca918610fff75d618d Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 27 Jan 2016 21:07:17 +0100 Subject: vo_opengl: replace tscale-interpolates-only with interpolation-threshold The previous approach was too naive, and can e.g. ruin playback if scheduling switches e.g. between 1 and 2 vsync per frame. --- DOCS/interface-changes.rst | 4 +++- DOCS/man/vo.rst | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'DOCS') diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index 5b9b45faeb..8a38bcc1ce 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -28,7 +28,9 @@ Interface changes - VO opengl custom shaders must now use "sample_pixel" as function name, instead of "sample" - change VO opengl scaler-resizes-only default to enabled - - add VO opengl "tscale-interpolates-only" suboption + - add VO opengl "interpolation-threshold" suboption (introduces new default + behavior, which can change e.g. ``--video-sync=display-vdrop`` to the + worse, but is usually what you want) - make "volume" and "mute" properties changeable even if no audio output is active (this gives not-ideal behavior if --softvol=no is used) - add "volume-max" and "mixer-active" properties diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 0725cf19e6..58bd91cd55 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -549,9 +549,19 @@ Available video output drivers are: manifest themselves as short flashes or fringes of black, mostly around moving edges) in exchange for potentially adding more blur. - ``tscale-interpolates-only=`` - If set, then don't perform interpolation if the playback rate matches - the display refresh rate (default: yes). + ``interpolation-threshold=<0..1,-1>`` + Threshold below which frame ratio interpolation gets disabled (default: + ``0.0001``). This is calculated as ``abs(disphz/vfps - 1) < threshold``, + where ``vfps`` is the speed-adjusted display FPS, and ``disphz`` the + display refresh rate. + + The default is intended to almost always enable interpolation if the + playback rate is even slightly different from the display refresh rate. + But note that if you use e.g. ``--video-sync=display-vdrop``, small + deviations in the rate can disable interpolation and introduce a + discontinuity every other minute. + + Set this to ``-1`` to disable this logic. ``dscale-radius``, ``cscale-radius``, ``tscale-radius``, etc. Set filter parameters for ``dscale``, ``cscale`` and ``tscale``, -- cgit v1.2.3