[166] Merge remote-tracking branch 'bullmoose20/nightly' into nightly

VERSION

@@ -1 +1 @@
-1.18.3-develop163
+1.18.3-develop166

defaults/overlays/resolution.yml

@@ -15,21 +15,27 @@ external_templates:
         conditions:
           - type: edition_dovetail
             value:
+              - 4K-HDR10PLUS
               - 4K-DV
               - 4K-HDR
               - 4K
+              - 1080P-HDR10PLUS
               - 1080P-DV
               - 1080P-HDR
               - 1080P
+              - 720P-HDR10PLUS
               - 720P-DV
               - 720P-HDR
               - 720P
+              - 576P-HDR10PLUS
               - 576P-DV
               - 576P-HDR
               - 576P
+              - 480P-HDR10PLUS
               - 480P-DV
               - 480P-HDR
               - 480P
+              - HDR10PLUS
               - DV
               - HDR
           - type: resolution_dovetail
@@ -183,6 +189,10 @@ templates:
         conditions:
           - alt: hdr
             value: true
+      hdr10plus:
+        conditions:
+          - alt: hdr10plus
+            value: '(?i)\bHDR10(\+|P(lus)?\b)'
     optional:
       - all
       - use_<<key>>
@@ -205,9 +215,13 @@ templates:
         hdr: <<hdr>>
     filters:
       has_dolby_vision: <<dolby_vision>>
+      - filepath.regex: <<hdr10plus>>
 
 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]
@@ -217,6 +231,9 @@ overlays:
   4K-Dovetail:
     variables: {key: 4k, alt: "", weight: 130, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
+  1080P-HDR10PLUS-Dovetail:
+    variables: {key: 1080p, alt: hdr10plus, weight: 125, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   1080P-DV-Dovetail:
     variables: {key: 1080p, alt: dv, weight: 120, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -226,6 +243,9 @@ overlays:
   1080P-Dovetail:
     variables: {key: 1080p, alt: "", weight: 100, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
+  720P-HDR10PLUS-Dovetail:
+    variables: {key: 720p, alt: hdr10plus, weight: 95, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   720P-DV-Dovetail:
     variables: {key: 720p, alt: dv, weight: 90, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -235,6 +255,9 @@ overlays:
   720P-Dovetail:
     variables: {key: 720p, alt: "", weight: 70, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
+  576P-HDR10PLUS-Dovetail:
+    variables: {key: 576p, alt: hdr10plus, weight: 65, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   576P-DV-Dovetail:
     variables: {key: 576p, alt: dv, weight: 60, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -244,6 +267,9 @@ overlays:
   576P-Dovetail:
     variables: {key: 576p, alt: "", weight: 40, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
+  480P-HDR10PLUS-Dovetail:
+    variables: {key: 480p, alt: hdr10plus, weight: 35, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   480P-DV-Dovetail:
     variables: {key: 480p, alt: dv, weight: 30, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -253,6 +279,9 @@ overlays:
   480P-Dovetail:
     variables: {key: 480p, alt: "", weight: 10, type: resolution_dovetail, allowed_libraries: movie}
     template: [name: resolution, name: standard]
+  HDR10PLUS-Dovetail:
+    variables: {key: "", alt: hdr10plus, weight: 7, type: resolution_dovetail, allowed_libraries: movie}
+    template: [name: resolution, name: standard]
   DV-Dovetail:
     variables: {key: "", alt: dv, weight: 5, type: resolution_dovetail, all: true, allowed_libraries: movie}
     template: [name: resolution, name: standard]
@@ -330,6 +359,9 @@ overlays:
     variables: {key: ulysses, weight: 6, search: Ulysses, 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]
@@ -339,6 +371,9 @@ overlays:
   4K:
     variables: {key: 4k, alt: "", weight: 130, type: resolution}
     template: [name: resolution, name: standard]
+  1080P-HDR10PLUS:
+    variables: {key: 1080p, alt: hdr10plus, weight: 125, type: resolution}
+    template: [name: resolution, name: standard]
   1080P-DV:
     variables: {key: 1080p, alt: dv, weight: 120, type: resolution}
     template: [name: resolution, name: standard]
@@ -348,6 +383,9 @@ overlays:
   1080P:
     variables: {key: 1080p, alt: "", weight: 100, type: resolution}
     template: [name: resolution, name: standard]
+  720P-HDR10PLUS:
+    variables: {key: 720p, alt: hdr10plus, weight: 95, type: resolution}
+    template: [name: resolution, name: standard]
   720P-DV:
     variables: {key: 720p, alt: dv, weight: 90, type: resolution}
     template: [name: resolution, name: standard]
@@ -357,6 +395,9 @@ overlays:
   720P:
     variables: {key: 720p, alt: "", weight: 70, type: resolution}
     template: [name: resolution, name: standard]
+  576P-HDR10PLUS:
+    variables: {key: 576p, alt: hdr10plus, weight: 65, type: resolution}
+    template: [name: resolution, name: standard]
   576P-DV:
     variables: {key: 576p, alt: dv, weight: 60, type: resolution}
     template: [name: resolution, name: standard]
@@ -366,6 +407,9 @@ overlays:
   576P:
     variables: {key: 576p, alt: "", weight: 40, type: resolution}
     template: [name: resolution, name: standard]
+  480P-HDR10PLUS:
+    variables: {key: 480p, alt: hdr10plus, weight: 35, type: resolution}
+    template: [name: resolution, name: standard]
   480P-DV:
     variables: {key: 480p, alt: dv, weight: 30, type: resolution}
     template: [name: resolution, name: standard]
@@ -375,6 +419,9 @@ overlays:
   480P:
     variables: {key: 480p, alt: "", weight: 10, type: resolution}
     template: [name: resolution, name: standard]
+  HDR10PLUS:
+    variables: {key: "", alt: hdr10plus, weight: 7, type: resolution}
+    template: [name: resolution, name: standard]
   DV:
     variables: {key: "", alt: dv, weight: 5, type: resolution, all: true}
     template: [name: resolution, name: standard]
@@ -451,5 +498,3 @@ overlays:
   Ulysses:
     variables: {key: ulysses, weight: 6, search: Ulysses, type: edition, allowed_libraries: movie}
     template: [name: edition, name: standard]
-    
-