From 4b38916e945b763e2c3aaf3f46ff6638a8a7f534 Mon Sep 17 00:00:00 2001 From: bullmoose20 Date: Tue, 4 Apr 2023 19:20:14 -0400 Subject: [PATCH] [164] snorkrat additions for 4khdr10plus --- VERSION | 2 +- .../overlays/images/resolution/4khdr10plus.png | Bin 0 -> 5334 bytes defaults/overlays/resolution.yml | 15 ++++++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 defaults/overlays/images/resolution/4khdr10plus.png diff --git a/VERSION b/VERSION index b7a00633..79fdab29 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.3-develop163 +1.18.3-develop164 diff --git a/defaults/overlays/images/resolution/4khdr10plus.png b/defaults/overlays/images/resolution/4khdr10plus.png new file mode 100644 index 0000000000000000000000000000000000000000..ad6216d2101e8867fde1eb79dae5e6ec6c5d3a86 GIT binary patch literal 5334 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 literal 0 HcmV?d00001 diff --git a/defaults/overlays/resolution.yml b/defaults/overlays/resolution.yml index e3ecbe22..99d08739 100644 --- a/defaults/overlays/resolution.yml +++ b/defaults/overlays/resolution.yml @@ -15,6 +15,7 @@ external_templates: conditions: - type: edition_dovetail value: + - 4K-HDR10PLUS - 4K-DV - 4K-HDR - 4K @@ -179,6 +180,10 @@ templates: conditions: - alt: hdr value: true + hdr10plus: + conditions: + - alt: hdr10plus + value: '(?i)HDR10\+|HDR10PLUS' optional: - all - use_<> @@ -201,9 +206,13 @@ templates: hdr: <> filters: has_dolby_vision: <> + - filepath.regex: <> overlays: + 4K-HDR10PLUS-Dovetail: + variables: {key: 4k, alt: hdr10plus, weight: 160, type: resolution_dovetail, allowed_libraries: movie} + template: [name: resolution, name: standard] 4K-DV-Dovetail: variables: {key: 4k, alt: dv, weight: 150, type: resolution_dovetail, allowed_libraries: movie} template: [name: resolution, name: standard] @@ -314,6 +323,9 @@ overlays: variables: {key: criterion, weight: 10, search: Criterion, type: edition_dovetail, allowed_libraries: movie} template: [name: edition, name: standard] + 4K-HDR10PLUS: + variables: {key: 4k, alt: hdr10plus, weight: 160, type: resolution} + template: [name: resolution, name: standard] 4K-DV: variables: {key: 4k, alt: dv, weight: 150, type: resolution} template: [name: resolution, name: standard] @@ -423,6 +435,3 @@ overlays: Criterion: variables: {key: criterion, weight: 10, search: Criterion, type: edition, allowed_libraries: movie} template: [name: edition, name: standard] - - -