add vibrance

app.py

@@ -43,8 +43,8 @@ def set_tone_mapping_params(
 
 
 @interactive(apply_tone_curve_on_luma=(True,))
-def s_curve_tone_mapping(
-    img: np.ndarray,
+def tone_map(
+    hsv: np.ndarray,
     apply_tone_curve_on_luma: bool = True,
     global_params={}
 ) -> np.ndarray:
@@ -53,14 +53,15 @@ def s_curve_tone_mapping(
     contrast = global_params.get("contrast", 0.)
     exposure = global_params.get("exposure", 0.)
     if not apply_tone_curve_on_luma:
-        return apply_s_curve_tone_mapping(
-            img,
-            shadow_boost,
-            highlight_boost,
-            contrast,
-            exposure
+        return rgb_to_hsv(
+            apply_s_curve_tone_mapping(
+                hsv_to_rgb(hsv),
+                shadow_boost,
+                highlight_boost,
+                contrast,
+                exposure
+            )
         )
-    hsv = rgb_to_hsv(img)
     luma_tone_mapped = apply_s_curve_tone_mapping(
         hsv[..., -1],
         shadow_boost,
@@ -69,7 +70,26 @@ def s_curve_tone_mapping(
         exposure
     )
     hsv[..., -1] = luma_tone_mapped
-    return hsv_to_rgb(hsv)
+    return hsv
+
+
+@interactive(vibrance=(0, [0, 100]))
+def modify_vibrance(hsv_in, vibrance: float = 0.):
+    gain_luma = np.interp(hsv_in[..., 2], [0., 0.5, 1.], [0., 0., 1.])
+    gain_sat = np.interp(hsv_in[..., 1], [0., 0.5, 1.], [0., 0., 1.])**2
+    red_thresh = 30.
+    pink_thresh = 8.
+    overlap = 10.
+
+    gain_hue = np.interp(
+        hsv_in[..., 0],
+        [0., red_thresh, red_thresh+overlap,
+         360-pink_thresh-overlap, 360-pink_thresh, 360],
+        [0., 0., 1., 1., 0., 0.]
+    )**2
+    gain = 1. + gain_luma * gain_sat * gain_hue*(vibrance / 100)
+    hsv_in[..., 1] = np.clip(gain*hsv_in[..., 1], 0, 1)
+    return hsv_in
 
 
 def s_curve_visualization(global_params={}) -> Curve:
@@ -115,7 +135,10 @@ def pick_image(
 def image_editing_pipeline(sample_image):
     input_image = pick_image(sample_image)
     set_tone_mapping_params()
-    tc_image = s_curve_tone_mapping(input_image)
+    hsv_in = rgb_to_hsv(input_image)
+    hsv_tc = tone_map(hsv_in)
+    hsv_out = modify_vibrance(hsv_tc)
+    tc_image = hsv_to_rgb(hsv_out)
     tone_curve = s_curve_visualization()
     histogram_curve = histogram(tc_image)
     return tc_image, histogram_curve, tone_curve