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

HDR tone mapping: normalize luminance relative to the brightest point in the input

Browse Source 
(Also tweaked the default value for the "amount" slider)

Fixes #4255
This commit is contained in:
Alberto Griggio 2018-01-08 14:54:55 +01:00
parent 1006dd1ebf
commit 7f89c362d0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/procparams.cc
View File

@ -1468,7 +1468,7 @@ bool EPDParams::operator !=(const EPDParams& other) const
FattalToneMappingParams::FattalToneMappingParams() : FattalToneMappingParams::FattalToneMappingParams() :
enabled(false), enabled(false),
threshold(0), threshold(0),
amount(1) amount(30)
{ {
} }

13
rtengine/tmo_fattal02.cc
View File

@ -1121,13 +1121,20 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
const float min_luminance = 1.f; const float min_luminance = 1.f;
TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working); TMatrix ws = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
float max_Y = 0.f;
int max_x = 0, max_y = 0;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if (multiThread) #pragma omp parallel for if (multiThread)
#endif #endif
for (int y = 0; y < h; y++) { for (int y = 0; y < h; y++) {
for (int x = 0; x < w; x++) { for (int x = 0; x < w; x++) {
Yr (x, y) = std::max (luminance (rgb->r (y, x), rgb->g (y, x), rgb->b (y, x), ws), min_luminance); // clip really black pixels Yr (x, y) = std::max (luminance (rgb->r (y, x), rgb->g (y, x), rgb->b (y, x), ws), min_luminance); // clip really black pixels
if (Yr(x, y) > max_Y) {
max_Y = Yr(x, y);
max_x = x;
max_y = y;
}
} }
} }
@ -1171,6 +1178,8 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
const float hr = float(h2) / float(h); const float hr = float(h2) / float(h);
const float wr = float(w2) / float(w); const float wr = float(w2) / float(w);
const float scale = std::max(L(max_x * wr + 1, max_y * hr + 1), epsilon) * (65535.f / Yr(max_x, max_y));
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for if(multiThread) #pragma omp parallel for if(multiThread)
#endif #endif
@ -1181,7 +1190,7 @@ void ImProcFunctions::ToneMapFattal02 (Imagefloat *rgb)
int xx = x * wr + 1; int xx = x * wr + 1;
float Y = Yr (x, y); float Y = Yr (x, y);
float l = std::max (L (xx, yy), epsilon) * (65535.f / Y); float l = std::max (L (xx, yy), epsilon) * (65535.f / Y) / scale;
rgb->r (y, x) = std::max (rgb->r (y, x), 0.f) * l; rgb->r (y, x) = std::max (rgb->r (y, x), 0.f) * l;
rgb->g (y, x) = std::max (rgb->g (y, x), 0.f) * l; rgb->g (y, x) = std::max (rgb->g (y, x), 0.f) * l;
rgb->b (y, x) = std::max (rgb->b (y, x), 0.f) * l; rgb->b (y, x) = std::max (rgb->b (y, x), 0.f) * l;

5
rtgui/fattaltonemap.cc
View File

@ -26,10 +26,7 @@ using namespace rtengine::procparams;
FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_TM_FATTAL_LABEL"), true, true) FattalToneMapping::FattalToneMapping(): FoldableToolPanel(this, "fattal", M("TP_TM_FATTAL_LABEL"), true, true)
{ {
amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 30., 0.0));
// setEnabledTooltipMarkup(M("TP_EPD_TOOLTIP"));
amount = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_AMOUNT"), 1., 100., 1., 0.0));
threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0)); threshold = Gtk::manage(new Adjuster (M("TP_TM_FATTAL_THRESHOLD"), -100., 100., 1., 0.0));
amount->setAdjusterListener(this); amount->setAdjusterListener(this);