fix(hybrid): accept HDR10+ tracks as valid base layer for HYBRID mode

HYBRID mode previously required a plain HDR10 track, rejecting HDR10+ (HDR10P) even though it's a perfectly valid (and superior) base layer.
HDR10+ is now preferred over HDR10 when both are available, preserving dynamic metadata in the final DV Profile 8 output.

unshackle/core/tracks/hybrid.py

@@ -67,8 +67,8 @@ class Hybrid:
         has_hdr10 = any(video.range == Video.Range.HDR10 for video in self.videos)
         has_hdr10p = any(video.range == Video.Range.HDR10P for video in self.videos)
 
-        if not has_hdr10:
-            raise ValueError("No HDR10 track available for hybrid processing.")
+        if not has_hdr10 and not has_hdr10p:
+            raise ValueError("No HDR10 or HDR10+ track available for hybrid processing.")
 
         # If we have HDR10+ but no DV, we can convert HDR10+ to DV
         if not has_dv and has_hdr10p:
@@ -113,10 +113,11 @@ class Hybrid:
 
         # Edit L6 with actual luminance values from RPU, then L5 active area
         self.level_6()
-        hdr10_video = next((v for v in videos if v.range == Video.Range.HDR10), None)
-        hdr10_input = hdr10_video.path if hdr10_video else None
-        if hdr10_input:
-            self.level_5(hdr10_input)
+        base_video = next(
+            (v for v in videos if v.range in (Video.Range.HDR10, Video.Range.HDR10P)), None
+        )
+        if base_video and base_video.path:
+            self.level_5(base_video.path)
 
         self.injecting()
 
@@ -557,12 +558,6 @@ class Hybrid:
                 config.directories.temp / self.rpu_file,
             ]
 
-            # If we converted from HDR10+, optionally remove HDR10+ metadata during injection
-            # Default to removing HDR10+ metadata since we're converting to DV
-            if self.hdr10plus_to_dv:
-                inject_cmd.append("--drop-hdr10plus")
-                console.status("Removing HDR10+ metadata during injection")
-
             inject_cmd.extend(["-o", config.directories.temp / self.hevc_file])
 
             inject = subprocess.run(

unshackle/core/tracks/tracks.py

@@ -278,23 +278,30 @@ class Tracks:
         self.subtitles = list(filter(x, self.subtitles))
 
     def select_hybrid(self, tracks, quality):
-        hdr10_tracks = [
-            v
-            for v in tracks
-            if v.range == Video.Range.HDR10 and (v.height in quality or int(v.width * 9 / 16) in quality)
-        ]
-        hdr10 = []
+        # Prefer HDR10+ over HDR10 as the base layer (preserves dynamic metadata)
+        base_ranges = (Video.Range.HDR10P, Video.Range.HDR10)
+        base_tracks = []
+        for range_type in base_ranges:
+            base_tracks = [
+                v
+                for v in tracks
+                if v.range == range_type and (v.height in quality or int(v.width * 9 / 16) in quality)
+            ]
+            if base_tracks:
+                break
+
+        base_selected = []
         for res in quality:
-            candidates = [v for v in hdr10_tracks if v.height == res or int(v.width * 9 / 16) == res]
+            candidates = [v for v in base_tracks if v.height == res or int(v.width * 9 / 16) == res]
             if candidates:
-                best = max(candidates, key=lambda v: v.bitrate)  # assumes .bitrate exists
-                hdr10.append(best)
+                best = max(candidates, key=lambda v: v.bitrate)
+                base_selected.append(best)
 
         dv_tracks = [v for v in tracks if v.range == Video.Range.DV]
         lowest_dv = min(dv_tracks, key=lambda v: v.height) if dv_tracks else None
 
         def select(x):
-            if x in hdr10:
+            if x in base_selected:
                 return True
             if lowest_dv and x is lowest_dv:
                 return True