From c335e84230916d7d7a38288031516e8b2ec1c36b Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Sat, 10 Jun 2017 14:01:25 +0200 Subject: video: refactor HDR implementation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List of changes: 1. Kill nom_peak, since it's a pointless non-field that stores nothing of value and is _always_ derived from ref_white anyway. 2. Kill ref_white/--target-brightness, because the only case it really existed for (PQ) actually doesn't need to be this general: According to ITU-R BT.2100, PQ *always* assumes a reference monitor with a white point of 100 cd/m². 3. Improve documentation and comments surrounding this stuff. 4. Clean up some of the code in general. Move stuff where it belongs. --- DOCS/interface-changes.rst | 4 ++++ DOCS/man/input.rst | 4 ---- DOCS/man/options.rst | 7 ------- DOCS/man/vf.rst | 15 ++++++++------- 4 files changed, 12 insertions(+), 18 deletions(-) (limited to 'DOCS') diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index a8340dc409..2821e80d9d 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -29,6 +29,10 @@ Interface changes `--sub-ass-override=signfs` setting to `--sub-ass-override=scale`. - change default of --video-aspect-method to "bitstream". The "hybrid" method (old default) is deprecated. + - remove property "video-params/nom-peak" + - remove option --target-brightness + - replace vf_format's `peak` suboption by `sig-peak`, which is relative to + the reference white level instead of in cd/m^2 --- mpv 0.25.0 --- - remove opengl-cb dxva2 dummy hwdec interop (see git "vo_opengl: remove dxva2 dummy hwdec backend") diff --git a/DOCS/man/input.rst b/DOCS/man/input.rst index ed3dc2311f..e0e9cf28fd 100644 --- a/DOCS/man/input.rst +++ b/DOCS/man/input.rst @@ -1456,9 +1456,6 @@ Property list ``video-params/gamma`` The gamma function in use as string. (Exact values subject to change.) - ``video-params/nom-peak`` - The video encoding's nominal peak brightness as float. - ``video-params/sig-peak`` The video file's tagged signal peak as float. @@ -1489,7 +1486,6 @@ Property list "colorlevels" MPV_FORMAT_STRING "primaries" MPV_FORMAT_STRING "gamma" MPV_FORMAT_STRING - "nom-peak" MPV_FORMAT_DOUBLE "sig-peak" MPV_FORMAT_DOUBLE "chroma-location" MPV_FORMAT_STRING "rotate" MPV_FORMAT_INT64 diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index 080bf73582..0be1242063 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -4634,13 +4634,6 @@ The following video options are currently all specific to ``--vo=opengl`` and The user should independently guarantee this before using these signal formats for display. -``--target-brightness=<1..100000>`` - Specifies the display's approximate brightness in cd/m^2. When playing HDR - content on a SDR display (or SDR content on an HDR display), video colors - will be tone mapped to this target brightness using the algorithm specified - by ``--hdr-tone-mapping``. The default of 250 cd/m^2 corresponds to a - typical consumer display. - ``--hdr-tone-mapping=`` Specifies the algorithm used for tone-mapping HDR images onto the target display. Valid values are: diff --git a/DOCS/man/vf.rst b/DOCS/man/vf.rst index c7f4c84d0a..90488d2429 100644 --- a/DOCS/man/vf.rst +++ b/DOCS/man/vf.rst @@ -367,13 +367,14 @@ Available mpv-only filters are: :std-b67: ARIB STD-B67 (Hybrid Log-gamma) curve :v-log: Panasonic V-Log transfer curve - ```` - Reference peak illumination for the video file. This is mostly - interesting for HDR, but it can also be used tone map SDR content - to a darker or brighter exposure. - - The default of 0.0 will default to the display's reference brightness - for SDR and the source's reference brightness for HDR. + ```` + Reference peak illumination for the video file, relative to the + signal's reference white level. This is mostly interesting for HDR, but + it can also be used tone map SDR content to simulate a different + exposure. Normally inferred from tags such as MaxCLL or mastering + metadata. + + The default of 0.0 will default to the source's nominal peak luminance. ```` Set the stereo mode the video is assumed to be encoded in. Takes the -- cgit v1.2.3