Skip to content

Tone equalizer 2025-04-06 preview version #18656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+3,149 −1,234
Open

Tone equalizer 2025-04-06 preview version #18656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d478c7d
2025-04-06 preview version with post-shift, post_scale, auto-align an…
cincrement Apr 6, 2025
078d734
Fixes, hopefully including the MacOS build problem. Some cosmetic con…
cincrement Apr 6, 2025
6750bfb
May 1st version that fixes most problems.
cincrement May 1, 2025
dfc3df6
Changed the points suggested by @TurboGit including:
cincrement May 18, 2025
1b4b7f4
UI rework
cincrement Jun 8, 2025
eccb2d1
Fix for the shadows/highlights bug.
cincrement Jun 12, 2025
fc16aa7
Version with align button
cincrement Aug 22, 2025
915fb10
Somewhat working version
cincrement Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions data/darktableconfig.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3079,6 +3079,13 @@
<shortdescription>height of color balance rgb graph in per cent</shortdescription>
<longdescription>height of color balance rgb graph in per cent</longdescription>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/toneequal/graphheight</name>
<type min="200" max="400">int</type>
<default>300</default>
<shortdescription>height of tone equalizer graph in per cent</shortdescription>
<longdescription>height of tone equalizer graph in per cent</longdescription>
</dtconfig>
<dtconfig>
<name>plugins/darkroom/histogram/mode</name>
<type>
Expand Down
198 changes: 153 additions & 45 deletions src/common/luminance_mask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ typedef enum dt_iop_luminance_mask_method_t
DT_TONEEQ_LIGHTNESS, // $DESCRIPTION: "HSL lightness"
DT_TONEEQ_VALUE, // $DESCRIPTION: "HSV value / RGB max"
DT_TONEEQ_NORM_1, // $DESCRIPTION: "RGB sum"
DT_TONEEQ_NORM_2, // $DESCRIPTION: "RGB euclidean norm")
DT_TONEEQ_NORM_2, // $DESCRIPTION: "RGB euclidean norm"
DT_TONEEQ_NORM_POWER, // $DESCRIPTION: "RGB power norm"
DT_TONEEQ_GEOMEAN, // $DESCRIPTION: "RGB geometric mean"
DT_TONEEQ_LAST
DT_TONEEQ_REC709W, // $DESCRIPTION: "Rec. 709 weights"
DT_TONEEQ_LAST,
DT_TONEEQ_CUSTOM, // $DESCRIPTION: "Custom"
} dt_iop_luminance_mask_method_t;

/**
Expand Down Expand Up @@ -78,11 +80,9 @@ static float linear_contrast(const float pixel, const float fulcrum, const float

DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_mean(const float *const restrict image,
static float pixel_rgb_mean(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// mean(RGB) is the intensity

Expand All @@ -92,67 +92,67 @@ static void pixel_rgb_mean(const float *const restrict image,
for(int c = 0; c < 3; ++c)
lum += image[k + c];

luminance[k / 4] = linear_contrast(exposure_boost * lum / 3.0f, fulcrum, contrast_boost);
return lum / 3.0f;

//luminance[k / 4] = linear_contrast(exposure_boost * lum / 3.0f, fulcrum, contrast_boost);
}


DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_value(const float *const restrict image,
static float pixel_rgb_value(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// max(RGB) is equivalent to HSV value

const float lum = exposure_boost * MAX(MAX(image[k], image[k + 1]), image[k + 2]);
luminance[k / 4] = linear_contrast(lum, fulcrum, contrast_boost);
const float lum = MAX(MAX(image[k], image[k + 1]), image[k + 2]);
return lum;

//luminance[k / 4] = linear_contrast(lum, fulcrum, contrast_boost);
}


DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_lightness(const float *const restrict image,
static float pixel_rgb_lightness(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// (max(RGB) + min(RGB)) / 2 is equivalent to HSL lightness

const float max_rgb = MAX(MAX(image[k], image[k + 1]), image[k + 2]);
const float min_rgb = MIN(MIN(image[k], image[k + 1]), image[k + 2]);
luminance[k / 4] = linear_contrast(exposure_boost * (max_rgb + min_rgb) / 2.0f, fulcrum, contrast_boost);
return (max_rgb + min_rgb) / 2.0f;

//luminance[k / 4] = linear_contrast(exposure_boost * (max_rgb + min_rgb) / 2.0f, fulcrum, contrast_boost);
}

DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_norm_1(const float *const restrict image,
static float pixel_rgb_norm_1(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// vector norm L1

float lum = 0.0f;

DT_OMP_SIMD(reduction(+:lum) aligned(image:64))
for(int c = 0; c < 3; ++c)
lum += fabsf(image[k + c]);
DT_OMP_SIMD(reduction(+:lum) aligned(image:64))
for(int c = 0; c < 3; ++c)
lum += fabsf(image[k + c]);

luminance[k / 4] = linear_contrast(exposure_boost * lum, fulcrum, contrast_boost);
return lum;

// luminance[k / 4] = linear_contrast(exposure_boost * lum, fulcrum, contrast_boost);
}


DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_norm_2(const float *const restrict image,
static float pixel_rgb_norm_2(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// vector norm L2 : euclidean norm

Expand All @@ -162,17 +162,17 @@ static void pixel_rgb_norm_2(const float *const restrict image,
for(int c = 0; c < 3; ++c)
result += image[k + c] * image[k + c];

luminance[k / 4] = linear_contrast(exposure_boost * sqrtf(result), fulcrum, contrast_boost);
return sqrtf(result);

// luminance[k / 4] = linear_contrast(exposure_boost * sqrtf(result), fulcrum, contrast_boost);
}


DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_norm_power(const float *const restrict image,
static float pixel_rgb_norm_power(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// weird norm sort of perceptual. This is black magic really, but it looks good.

Expand All @@ -189,16 +189,16 @@ static void pixel_rgb_norm_power(const float *const restrict image,
denominator += RGB_square;
}

luminance[k / 4] = linear_contrast(exposure_boost * numerator / denominator, fulcrum, contrast_boost);
return numerator / denominator;

// luminance[k / 4] = linear_contrast(exposure_boost * numerator / denominator, fulcrum, contrast_boost);
}

DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static void pixel_rgb_geomean(const float *const restrict image,
static float pixel_rgb_geomean(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float exposure_boost,
const float fulcrum, const float contrast_boost)
const size_t k)
{
// geometric_mean(RGB). Kind of interesting for saturated colours (maps them to shadows)

Expand All @@ -210,7 +210,35 @@ static void pixel_rgb_geomean(const float *const restrict image,
lum *= fabsf(image[k + c]);
}

luminance[k / 4] = linear_contrast(exposure_boost * powf(lum, 1.0f / 3.0f), fulcrum, contrast_boost);
return powf(lum, 1.0f / 3.0f);

// luminance[k / 4] = linear_contrast(exposure_boost * powf(lum, 1.0f / 3.0f), fulcrum, contrast_boost);
}

DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static float pixel_rgb_r709w(const float *const restrict image,
float *const restrict luminance,
const size_t k)
{
const float lum = 0.2126 * image[k] + 0.7152 * image[k + 1] + 0.0722 * image[k + 2];
return lum;
// luminance[k / 4] = linear_contrast(lum, fulcrum, contrast_boost);
}


DT_OMP_DECLARE_SIMD(aligned(image, luminance:64) uniform(image, luminance))
__DT_CLONE_TARGETS__
static float pixel_rgb_custom(const float *const restrict image,
float *const restrict luminance,
const size_t k,
const float r_weight,
const float g_weight,
const float b_weight)
{
const float lum = MAX(MIN_FLOAT, r_weight * image[k] + g_weight * image[k + 1] + b_weight * image[k + 2]);
return lum;
// luminance[k / 4] = linear_contrast(lum, fulcrum, contrast_boost);
}


Expand All @@ -221,11 +249,16 @@ static void pixel_rgb_geomean(const float *const restrict image,
#define LOOP(fn) \
{ \
_Pragma ("omp parallel for simd default(none) schedule(static) \
dt_omp_firstprivate(num_elem, in, out, exposure_boost, fulcrum, contrast_boost)\
dt_omp_firstprivate(num_elem, in, out, exposure_boost, fulcrum, contrast_boost, r_weight, g_weight, b_weight)\
reduction(min:min_lum) reduction(max:max_lum) \
aligned(in, out:64)" ) \
for(size_t k = 0; k < num_elem; k += 4) \
{ \
fn(in, out, k, exposure_boost, fulcrum, contrast_boost); \
const float lum = COMPUTE_LUM(fn); \
const float lum_boosted = linear_contrast(exposure_boost * lum, fulcrum, contrast_boost); \
min_lum = MIN(min_lum, lum_boosted); \
max_lum = MAX(max_lum, lum_boosted); \
out[k / 4] = lum_boosted; \
} \
break; \
}
Expand All @@ -234,7 +267,11 @@ static void pixel_rgb_geomean(const float *const restrict image,
{ \
for(size_t k = 0; k < num_elem; k += 4) \
{ \
fn(in, out, k, exposure_boost, fulcrum, contrast_boost); \
const float lum = COMPUTE_LUM(fn); \
const float lum_boosted = linear_contrast(exposure_boost * lum, fulcrum, contrast_boost); \
min_lum = MIN(min_lum, lum_boosted); \
max_lum = MAX(max_lum, lum_boosted); \
out[k / 4] = lum_boosted; \
} \
break; \
}
Expand All @@ -249,11 +286,23 @@ static inline void luminance_mask(const float *const restrict in,
const dt_iop_luminance_mask_method_t method,
const float exposure_boost,
const float fulcrum,
const float contrast_boost)
const float contrast_boost,
const float r_weight,
const float g_weight,
const float b_weight,
float *image_min_ev,
float *image_max_ev)
{
const size_t num_elem = width * height * 4;
float min_lum = INFINITY;
float max_lum = -INFINITY;

printf("luminance_mask: method=%d, exposure_boost=%f, fulcrum=%f, contrast_boost=%f, r_weight=%f, g_weight=%f, b_weight=%f\n",
method, exposure_boost, fulcrum, contrast_boost, r_weight, g_weight, b_weight);

switch(method)
{
#define COMPUTE_LUM(fn) fn(in, out, k)
case DT_TONEEQ_MEAN:
LOOP(pixel_rgb_mean);

Expand All @@ -275,12 +324,71 @@ static inline void luminance_mask(const float *const restrict in,
case DT_TONEEQ_GEOMEAN:
LOOP(pixel_rgb_geomean);

case DT_TONEEQ_REC709W:
LOOP(pixel_rgb_r709w);

#undef COMPUTE_LUM
#define COMPUTE_LUM(fn) fn(in, out, k, r_weight, g_weight, b_weight)
case DT_TONEEQ_CUSTOM:
LOOP(pixel_rgb_custom);

default:
break;
}

*image_min_ev = log2f(min_lum);
*image_max_ev = log2f(max_lum);
}




// __DT_CLONE_TARGETS__
// static inline void luminance_mask2(const float *const restrict in,
// float *const restrict out,
// const size_t width,
// const size_t height,
// const dt_iop_luminance_mask_method_t method,
// const float exposure_boost,
// const float fulcrum,
// const float contrast_boost
// const float r_weight,
// const float g_weight,
// const float b_weight)
// {

// const size_t num_elem = width * height * 4;
// switch(method)
// {
// case DT_TONEEQ_MEAN:
// LOOP(pixel_rgb_mean);

// case DT_TONEEQ_LIGHTNESS:
// LOOP(pixel_rgb_lightness);

// case DT_TONEEQ_VALUE:
// LOOP(pixel_rgb_value);

// case DT_TONEEQ_NORM_1:
// LOOP(pixel_rgb_norm_1);

// case DT_TONEEQ_NORM_2:
// LOOP(pixel_rgb_norm_2);

// case DT_TONEEQ_NORM_POWER:
// LOOP(pixel_rgb_norm_power);

// case DT_TONEEQ_GEOMEAN:
// LOOP(pixel_rgb_geomean);

// case DT_TONEEQ_REC709W:
// LOOP(pixel_rgb_r709w);

// default:
// break;
// }
// }

// clang-format off
// modelines: These editor modelines have been set for all relevant files by tools/update_modelines.py
// vim: shiftwidth=2 expandtab tabstop=2 cindent
Expand Down
Loading