From c77913b77504f11b63503ed94c7cdc944a8adff5 Mon Sep 17 00:00:00 2001 From: Desmis Date: Thu, 26 Oct 2017 10:50:23 +0200 Subject: [PATCH] Change thresholds for Blur and noise --- rtengine/improccoordinator.cc | 4 ++-- rtengine/iplocallab.cc | 12 ++++++------ rtengine/procparams.cc | 2 +- rtgui/locallab.cc | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index edd3e858e..4b78960d2 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -904,7 +904,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) int t_currentspot = 1; int t_radius = 1; int t_strength = 0; - int t_sensibn = 19; + int t_sensibn = 40; int t_inversrad = 0; int t_str = 0; int t_chrrt = 0; @@ -1844,7 +1844,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) int t_currentspot = 1; int t_radius = 1; int t_strength = 0; - int t_sensibn = 19; + int t_sensibn = 40; int t_inversrad = 0; int t_str = 0; int t_chrrt = 0; diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index ccc5ded6b..6f3734e17 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -2172,8 +2172,8 @@ void ImProcFunctions::BlurNoise_Local (int call, int sp, LabImage * tmp1, LabIma const float bmo = - amo * huemoins; - constexpr float pb = 4.f; - constexpr float pa = (1.f - pb) / 40.f; + constexpr float pb = 7.f; + constexpr float pa = (1.f - pb) / 70.f; const float ahu = 1.f / (2.8f * lp.sensbn - 280.f); const float bhu = 1.f - ahu * 2.8f * lp.sensbn; @@ -2332,13 +2332,13 @@ void ImProcFunctions::BlurNoise_Local (int call, int sp, LabImage * tmp1, LabIma kch = ak * deltachro + bk; } - if (lp.sensbn < 40.f ) { + if (lp.sensbn < 70.f ) { float khu = 0.f; - kch = pow (kch, pa * lp.sensbn + pb); //increase under 40 + kch = pow (kch, pa * lp.sensbn + pb); //increase under 90 // algo with detection of hue ==> artifacts for noisy images ==> denoise before - if (lp.qualmet >= 1 && lp.sensbn < 20.f) { //to try... + if (lp.qualmet >= 1 && lp.sensbn < 70.f) { //to try... //hue detection if ((hueref + dhue) < rtengine::RT_PI && rhue < hueplus && rhue > huemoins) { //transition are good if (rhue >= hueplus - delhu ) { @@ -2400,7 +2400,7 @@ void ImProcFunctions::BlurNoise_Local (int call, int sp, LabImage * tmp1, LabIma } } - if (lp.sensbn <= 20.f) { //to try... + if (lp.sensbn <= 70.f) { //to try... if (deltaE < 2.8f * lp.sensbn) { fach = khu; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 87d693634..f6a1aecb5 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -1025,7 +1025,7 @@ void LocallabParams::setDefaults() sensih = 19; retrab = 500; sensicb = 19; - sensibn = 19; + sensibn = 40; sensitm = 19; sensisha = 19; transit = 60; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index dbb2f453a..75ed00b6b 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -79,7 +79,7 @@ Locallab::Locallab (): sensiex (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_SENSI"), 0, 100, 1, 19))), radius (Gtk::manage ( new Adjuster (M ("TP_LOCALLAB_RADIUS"), 1, 100, 1, 1) )), strength (Gtk::manage ( new Adjuster (M ("TP_LOCALLAB_STRENGTH"), 0, 100, 1, 0) )), - sensibn (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_SENSIBN"), 0, 100, 1, 19))), + sensibn (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_SENSIBN"), 0, 100, 1, 40))), transit (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_TRANSIT"), 5, 95, 1, 60))), stren (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_STREN"), -50, 100, 1, 0))), gamma (Gtk::manage (new Adjuster (M ("TP_LOCALLAB_GAM"), 80, 150, 1, 100))),