[105] Merge branch 'techdiver/techdiver-1.0' into nightly

defaults/overlays/resolution.yml

@@ -15,6 +15,7 @@ external_templates:
         conditions:
           - type: edition_dovetail
             value:
+              - 4K-DV-HDR
               - 4K-Plus
               - 4K-DV
               - 4K-HDR
@@ -201,6 +202,10 @@ templates:
         conditions:
           - alt: plus
             value: '(?i)\bhdr10(\+|p(lus)?\b)'
+      dolby_vision_hdr_hybrid:
+        conditions:
+          - alt: dv_hdr_hybrid
+            value: '(?i)\bdv(\.hdr10?\b)'
     optional:
       - all
       - use_<<key>>
@@ -223,10 +228,15 @@ templates:
         hdr: <<hdr>>
     filters:
       has_dolby_vision: <<dolby_vision>>
-      filepath.regex: <<plus>>
+      filepath.regex:
+        - <<plus>>
+        - <<dolby_vision_hdr_hybrid>>
 
 overlays:
 
+  4K-DV-HDR-Dovetail:
+    variables: {key: 4k, alt: dv_hdr_hybrid, weight: 170, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   4K-Plus-Dovetail:
     variables: {key: 4k, alt: plus, weight: 160, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -367,6 +377,9 @@ overlays:
     variables: {key: ulysses, weight: 6, search: Ulysses, type: edition_dovetail, allowed_libraries: movie}
     template: [name: edition, name: standard]
 
+  4K-DV-HDR:
+    variables: {key: 4k, alt: dv_hdr_hybrid, weight: 170, type: resolution}
+    template: [name: resolution, name: standard]
   4K-Plus:
     variables: {key: 4k, alt: plus, weight: 160, type: resolution}
     template: [name: resolution, name: standard]

docs/defaults/overlays/resolution.md

@@ -14,6 +14,7 @@ Recommendations: Editions overlay is designed to use the Editions field within P
 
 | Resolution   | Key          | Weight |
 |:-------------|:-------------|:-------|
+| 4K DV/HDR    | `4k_dv_hdr_hybrid`    | `170`  |
 | 4K HDR10+    | `4k_plus`    | `160`  |
 | 4K DV        | `4k_dv`      | `150`  |
 | 4K HDR       | `4k_hdr`     | `140`  |