liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve levels dynamic compression with balance

Browse Source
This commit is contained in:
Desmis 2020-01-07 10:02:27 +01:00
parent ce72a9ac2c
commit d248e17d0d
5 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtdata/languages/default
View File

@ -1124,7 +1124,7 @@ HISTORY_MSG_884;Local - Contrast Dynamic Range Laplacian
HISTORY_MSG_885;Local - Contrast Dynamic Range Wavelet
HISTORY_MSG_886;Local - Contrast Wavelet Curve Compression
HISTORY_MSG_887;Local - Contrast Wavelet Compression Residual
HISTORY_MSG_888;Local - Contrast Wavelet Threshold
HISTORY_MSG_888;Local - Contrast Wavelet Balance Threshold
HISTORY_MSG_CLAMPOOG;Clip out-of-gamut colors
HISTORY_MSG_COLORTONING_LABGRID_VALUE;CT - Color correction
HISTORY_MSG_COLORTONING_LABREGION_AB;CT - Color correction
@ -2596,7 +2596,7 @@ TP_LOCALLAB_TARGET_GRAY;Target Gray Point
TP_LOCALLAB_THRES;Threshold structure
TP_LOCALLAB_THRESDELTAE;Threshold ΔE-scope
TP_LOCALLAB_THRESRETI;Threshold
TP_LOCALLAB_THRESWAV;Threshold
TP_LOCALLAB_THRESWAV;Balance Threshold
TP_LOCALLAB_TLABEL2;TM Effective Tm=%1 TM=%2
TP_LOCALLAB_TLABEL;TM Datas Min=%1 Max=%2 Mean=%3 Sigma=%4 (Threshold)
TP_LOCALLAB_TLABEL_TOOLTIP;Transmission map result.\nMin and Max are used by Variance.\nTm=Min TM=Max of Transmission Map.\nYou can act on Threshold to normalize

2
rtengine/improcfun.h
View File

@ -210,7 +210,7 @@ public:
void EPDToneMapResid(float * WavCoeffs_L0, unsigned int Iterates, int skip, struct cont_params& cp, int W_L, int H_L, float max0, float min0);
void CompressDR(float *Source, int W_L, int H_L, float Compression, float DetailBoost);
void Compresslevels(float **Source, int W_L, int H_L, float compression, float detailattenuator, float thres);//, float maxp, float maxn);
void Compresslevels(float **Source, int W_L, int H_L, float compression, float detailattenuator, float thres, float mean, float maxp, float meanN, float maxN, float madL);
void ContrastResid(float * WavCoeffs_L0, struct cont_params &cp, int W_L, int H_L, float max0, float min0);
void EPDToneMap(LabImage *lab, unsigned int Iterates = 0, int skip = 1);

76
rtengine/iplocallab.cc
View File

@ -7045,12 +7045,13 @@ void ImProcFunctions::wavcbd(wavelet_decomposition &wdspot, int level_bl, int ma
}
void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float compression, float detailattenuator, float thres)//, float maxp, float maxn)
void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float compression, float detailattenuator, float thres, float mean, float maxp, float meanN, float maxN, float madL)
{
//J.Desmis 12-2019
float exponent;
// printf("maxp=%f maxn=%f\n", maxp, maxn);
// printf("maxp=%f maxn=%f\n", maxp, maxn);
if (detailattenuator > 0.f && detailattenuator < 0.05f) {
float betemp = expf(-(2.f - detailattenuator + 0.693147f)) - 1.f; //0.69315 = log(2)
exponent = 1.2f * xlogf(-betemp);
@ -7068,9 +7069,20 @@ void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float com
}
exponent += 1.f;
if(thres == 0.f) {
thres = 0.00001f;
}
float ap = (thres - 1.f) / (maxp - mean);
float bp = 1.f - ap * mean;
float a0 = (1.33f * thres - 1.f) / (1.f - mean);
float b0 = 1.f - a0 * mean;
float apn = (thres - 1.f) / (maxN - meanN);
float bpn = 1.f - apn * meanN;
float a0n = (1.33f * thres - 1.f) / (1.f - meanN);
float b0n = 1.f - a0n * meanN;
#ifdef _OPENMP
#pragma omp parallel for
@ -7078,10 +7090,25 @@ void ImProcFunctions::Compresslevels(float **Source, int W_L, int H_L, float com
for (int y = 0; y < H_L; y++) {
for (int x = 0; x < W_L; x++) {
float expone = 1.f;
if (Source[y][x] >= 0.f) {
Source[y][x] = xexpf(xlogf(Source[y][x] + thres) * exponent);
if (Source[y][x] > mean) {
expone = 1.f + (exponent - 1.f) * (ap * Source[y][x] + bp);
} else {
expone = 1.f + (exponent - 1.f) * (a0 * Source[y][x] + b0);
}
Source[y][x] = xexpf(xlogf(Source[y][x] + 0.05f * madL) * expone);
} else if (Source[y][x] < 0.f) {
Source[y][x] = -xexpf(xlogf(-Source[y][x] + thres) * exponent);
if (-Source[y][x] > mean) {
expone = 1.f + (exponent - 1.f) * (apn * -Source[y][x] + bpn);
} else {
expone = 1.f + (exponent - 1.f) * (a0n * -Source[y][x] + b0n);
}
Source[y][x] = -xexpf(xlogf(-Source[y][x] + 0.05f * madL) * expone);
}
}
}
@ -7095,6 +7122,7 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel
const LocwavCurve & loccomprewavCurve, bool & loccomprewavutili,
float radlevblur, int process, FattalToneMappingParams &fatParams, float chromablu, float thres)
{
float madL[10][3];
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
@ -7105,7 +7133,7 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel
int W_L = wdspot.level_W(level);
int H_L = wdspot.level_H(level);
float **wav_L = wdspot.level_coeffs(level);
madL[level][dir - 1] = Mad(wav_L[dir], W_L * H_L);//evaluate noise by level
for (int y = 0; y < H_L; y++) {
for (int x = 0; x < W_L; x++) {
float val = wav_L[dir][y * W_L + x];
@ -7159,13 +7187,15 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel
float MaxP[10];
float MaxN[10];
Evaluate2(wdspot, mean, meanN, sigma, sigmaN, MaxP, MaxN);
// printf("levbl=%i maxlvl=%i\n", level_bl, maxlvl);
for (int dir = 1; dir < 4; dir++) {
for (int level = level_bl; level < maxlvl; ++level) {
int W_L = wdspot.level_W(level);
int H_L = wdspot.level_H(level);
if (loccomprewavCurve && loccomprewavutili) {
float klev =(loccomprewavCurve[level * 55.5f] - 0.75f);
float klev = (loccomprewavCurve[level * 55.5f] - 0.75f);
if (klev < 0.f) {
klev *= 2.6666f;//compression increase contraste
@ -7180,11 +7210,11 @@ void ImProcFunctions::wavcont(wavelet_decomposition &wdspot, float ****templevel
detailattenuator = 0.0f;
}
float thresref = mean[level];
float thresreal = 0.1f * thres * thresref;//small values to take into account noise and artifacts
// printf("mean=%f sig=%f\n", mean[level], sigma[level]);
// float thresref = mean[level];
// float thresreal = 0.1f * thres * thresref;//small values to take into account noise and artifacts
// printf("mean=%f sig=%f\n", mean[level], sigma[level]);
Compresslevels(templevel[dir - 1][level], W_L, H_L, compression, detailattenuator, thresreal);//, MaxP[level], MaxN[level]);
Compresslevels(templevel[dir - 1][level], W_L, H_L, compression, detailattenuator, thres, mean[level], MaxP[level], meanN[level], MaxN[level], madL[level][dir - 1]);
}
}
}
@ -7373,15 +7403,15 @@ void ImProcFunctions::wavcontrast4(float ** tmp, float ** tmpa, float ** tmpb, f
if (wavcurvelev || wavcurvecomp || wavcurvecompre) {//compress dynamic and blur
/*
float mean[10];
float meanN[10];
float sigma[10];
float sigmaN[10];
float MaxP[10];
float MaxN[10];
Evaluate2(*wdspot, mean, meanN, sigma, sigmaN, MaxP, MaxN);
*/
/*
float mean[10];
float meanN[10];
float sigma[10];
float sigmaN[10];
float MaxP[10];
float MaxN[10];
Evaluate2(*wdspot, mean, meanN, sigma, sigmaN, MaxP, MaxN);
*/
fatParams.enabled = wavcurvecomp;
templevel = new float***[dir];
@ -11402,7 +11432,7 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
bool reduH = false;
bool reduW = false;
// if (bfw >= mSP && bfh >= mSP) {
// if (bfw >= mSP && bfh >= mSP) {
if (bfw >= mSPwav && bfh >= mSPwav) {//avoid too small spot for wavelet

2
rtengine/procparams.cc
View File

@ -2729,7 +2729,7 @@ LocallabParams::LocallabSpot::LocallabSpot() :
residcomp(0.0),
sigma(1.0),
offset(1.0),
threswav(0.05),
threswav(1.4),
chromalev(1.0),
chromablu(1.0),
fatdet(40.0),

2
rtgui/locallab.cc
View File

@ -582,7 +582,7 @@ residchro(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCHRO"), -100., 100., 1.,
residcomp(Gtk::manage(new Adjuster(M("TP_LOCALLAB_RESIDCOMP"), -1., 1., 0.01, 0.))),
sigma(Gtk::manage(new Adjuster(M("TP_LOCALLAB_SIGMAWAV"), 0.2, 2.5, 0.01, 1.))),
offset(Gtk::manage(new Adjuster(M("TP_LOCALLAB_OFFSETWAV"), 0.33, 1.66, 0.01, 1., Gtk::manage(new RTImage("circle-black-small.png")), Gtk::manage(new RTImage("circle-white-small.png"))))),
threswav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESWAV"), 0.001, 1., 0.001, 0.05))),
threswav(Gtk::manage(new Adjuster(M("TP_LOCALLAB_THRESWAV"), 0.9, 2., 0.01, 1.4))),
chromalev(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROMALEV"), 0.01, 2., 0.01, 1.))),
chromablu(Gtk::manage(new Adjuster(M("TP_LOCALLAB_CHROMABLU"), 0.01, 2., 0.01, 1.))),
fatdet(Gtk::manage(new Adjuster(M("TP_LOCALLAB_FATDETAIL"), -100., 300., 1., 0.))),