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

first version of new shadows/highlights tool

Browse Source
This commit is contained in:
Alberto Griggio 2018-04-13 17:30:29 +02:00
parent f8c06863fe
commit 25b066e257
8 changed files with 184 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rtengine/CMakeLists.txt
View File

@ -120,6 +120,7 @@ set(RTENGINESOURCEFILES
histmatching.cc histmatching.cc
pdaflinesfilter.cc pdaflinesfilter.cc
gamutwarning.cc gamutwarning.cc
ipshadowshighlights.cc
) )
if(LENSFUN_HAS_LOAD_DIRECTORY) if(LENSFUN_HAS_LOAD_DIRECTORY)

34
rtengine/dcrop.cc
View File

@ -800,24 +800,24 @@ void Crop::update (int todo)
} }
// blurmap for shadow & highlights // blurmap for shadow & highlights
if ((todo & M_BLURMAP) && params.sh.enabled) { // if ((todo & M_BLURMAP) && params.sh.enabled) {
double radius = sqrt (double (skips (parent->fw, skip) * skips (parent->fw, skip) + skips (parent->fh, skip) * skips (parent->fh, skip))) / 2.0; // double radius = sqrt (double (skips (parent->fw, skip) * skips (parent->fw, skip) + skips (parent->fh, skip) * skips (parent->fh, skip))) / 2.0;
double shradius = params.sh.radius; // double shradius = params.sh.radius;
if (!params.sh.hq) { // if (!params.sh.hq) {
shradius *= radius / 1800.0; // shradius *= radius / 1800.0;
} // }
if (!cshmap) { // if (!cshmap) {
cshmap = new SHMap (cropw, croph, true); // cshmap = new SHMap (cropw, croph, true);
} // }
cshmap->update (baseCrop, shradius, parent->ipf.lumimul, params.sh.hq, skip); // cshmap->update (baseCrop, shradius, parent->ipf.lumimul, params.sh.hq, skip);
if (parent->shmap->min_f < 65535.f) { // don't call forceStat with wrong values // if (parent->shmap->min_f < 65535.f) { // don't call forceStat with wrong values
cshmap->forceStat (parent->shmap->max_f, parent->shmap->min_f, parent->shmap->avg); // cshmap->forceStat (parent->shmap->max_f, parent->shmap->min_f, parent->shmap->avg);
} // }
} // }
// shadows & highlights & tone curve & convert to cielab // shadows & highlights & tone curve & convert to cielab
@ -1330,9 +1330,9 @@ bool Crop::setCropSizes (int rcx, int rcy, int rcw, int rch, int skip, bool inte
cbuffer[i] = cbuf_real + cropw * i + cropw; cbuffer[i] = cbuf_real + cropw * i + cropw;
} }
if (params.sh.enabled) { // if (params.sh.enabled) {
cshmap = new SHMap (cropw, croph, true); // cshmap = new SHMap (cropw, croph, true);
} // }
if (editType == ET_PIPETTE) { if (editType == ET_PIPETTE) {
PipetteBuffer::resize (cropw, croph); PipetteBuffer::resize (cropw, croph);

28
rtengine/improccoordinator.cc
View File

@ -415,20 +415,20 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
readyphase++; readyphase++;
progress ("Preparing shadow/highlight map...", 100 * readyphase / numofphases); progress ("Preparing shadow/highlight map...", 100 * readyphase / numofphases);
if ((todo & M_BLURMAP) && params.sh.enabled) { // if ((todo & M_BLURMAP) && params.sh.enabled) {
double radius = sqrt (double (pW * pW + pH * pH)) / 2.0; // double radius = sqrt (double (pW * pW + pH * pH)) / 2.0;
double shradius = params.sh.radius; // double shradius = params.sh.radius;
if (!params.sh.hq) { // if (!params.sh.hq) {
shradius *= radius / 1800.0; // shradius *= radius / 1800.0;
} // }
if (!shmap) { // if (!shmap) {
shmap = new SHMap (pW, pH, true); // shmap = new SHMap (pW, pH, true);
} // }
shmap->update (oprevi, shradius, ipf.lumimul, params.sh.hq, scale); // shmap->update (oprevi, shradius, ipf.lumimul, params.sh.hq, scale);
} // }
@ -966,9 +966,9 @@ void ImProcCoordinator::setScale (int prevscale)
previmg = new Image8 (pW, pH); previmg = new Image8 (pW, pH);
workimg = new Image8 (pW, pH); workimg = new Image8 (pW, pH);
if (params.sh.enabled) { // if (params.sh.enabled) {
shmap = new SHMap (pW, pH, true); // shmap = new SHMap (pW, pH, true);
} // }
allocated = true; allocated = true;
} }

42
rtengine/improcfun.cc
View File

@ -2047,7 +2047,7 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
s_th = params->sh.stonalwidth * (shmap->avg - shmap->min_f) / 100; s_th = params->sh.stonalwidth * (shmap->avg - shmap->min_f) / 100;
} }
bool processSH = params->sh.enabled && shmap && (params->sh.highlights > 0 || params->sh.shadows > 0); bool processSH = false; //params->sh.enabled && shmap && (params->sh.highlights > 0 || params->sh.shadows > 0);
TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working); TMatrix wprof = ICCStore::getInstance()->workingSpaceMatrix (params->icm.working);
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.working); TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params->icm.working);
@ -2437,30 +2437,30 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
} }
} }
if (processSH) { // if (processSH) {
for (int i = istart, ti = 0; i < tH; i++, ti++) { // for (int i = istart, ti = 0; i < tH; i++, ti++) {
for (int j = jstart, tj = 0; j < tW; j++, tj++) { // for (int j = jstart, tj = 0; j < tW; j++, tj++) {
float r = rtemp[ti * TS + tj]; // float r = rtemp[ti * TS + tj];
float g = gtemp[ti * TS + tj]; // float g = gtemp[ti * TS + tj];
float b = btemp[ti * TS + tj]; // float b = btemp[ti * TS + tj];
float mapval = 1.f + shmap->map[i][j]; // float mapval = 1.f + shmap->map[i][j];
float factor = 1.f; // float factor = 1.f;
if (mapval > h_th) { // if (mapval > h_th) {
factor = (h_th + (100.0 - shHighlights) * (mapval - h_th) / 100.0) / mapval; // factor = (h_th + (100.0 - shHighlights) * (mapval - h_th) / 100.0) / mapval;
} else if (mapval < s_th) { // } else if (mapval < s_th) {
factor = (s_th - (100.0 - shShadows) * (s_th - mapval) / 100.0) / mapval; // factor = (s_th - (100.0 - shShadows) * (s_th - mapval) / 100.0) / mapval;
} // }
rtemp[ti * TS + tj] = factor * r; // rtemp[ti * TS + tj] = factor * r;
gtemp[ti * TS + tj] = factor * g; // gtemp[ti * TS + tj] = factor * g;
btemp[ti * TS + tj] = factor * b; // btemp[ti * TS + tj] = factor * b;
} // }
} // }
} // }
highlightToneCurve(hltonecurve, rtemp, gtemp, btemp, istart, tH, jstart, tW, TS, exp_scale, comp, hlrange); highlightToneCurve(hltonecurve, rtemp, gtemp, btemp, istart, tH, jstart, tW, TS, exp_scale, comp, hlrange);
shadowToneCurve(shtonecurve, rtemp, gtemp, btemp, istart, tH, jstart, tW, TS); shadowToneCurve(shtonecurve, rtemp, gtemp, btemp, istart, tH, jstart, tW, TS);
@ -3647,6 +3647,8 @@ void ImProcFunctions::rgbProc (Imagefloat* working, LabImage* lab, PipetteBuffer
delete vCurve; delete vCurve;
} }
shadowsHighlights(lab);
if (params->localContrast.enabled) { if (params->localContrast.enabled) {
// Alberto's local contrast // Alberto's local contrast
localContrast(lab); localContrast(lab);

1
rtengine/improcfun.h
View File

@ -344,6 +344,7 @@ public:
void ToneMapFattal02(Imagefloat *rgb); void ToneMapFattal02(Imagefloat *rgb);
void localContrast(LabImage *lab); void localContrast(LabImage *lab);
void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread); void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread);
void shadowsHighlights(LabImage *lab);
Image8* lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings=true); Image8* lab2rgb (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, bool consider_histogram_settings=true);
Imagefloat* lab2rgbOut (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, GammaValues *ga = nullptr); Imagefloat* lab2rgbOut (LabImage* lab, int cx, int cy, int cw, int ch, const procparams::ColorManagementParams &icm, GammaValues *ga = nullptr);

111
rtengine/ipshadowshighlights.cc Normal file
View File

@ -0,0 +1,111 @@
/* -*- C++ -*-
*
* This file is part of RawTherapee.
*
* Copyright 2018 Alberto Griggio <alberto.griggio@gmail.com>
*
* RawTherapee is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef _OPENMP
#include <omp.h>
#endif
#include "improcfun.h"
#include "gauss.h"
namespace rtengine {
void ImProcFunctions::shadowsHighlights(LabImage *lab)
{
if (!params->sh.enabled || (!params->sh.highlights && !params->sh.shadows)){
return;
}
const int width = lab->W;
const int height = lab->H;
array2D<float> mask(width, height);
const float sigma = params->sh.radius * 5.f / scale;
const auto apply =
[&](int amount, int tonalwidth, bool hl) -> void
{
// first highlights
const float thresh = tonalwidth * 327.68f;
const float scale = hl ? (thresh > 0.f ? 0.9f / thresh : 1.f) : thresh * 0.9f;
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int y = 0; y < height; ++y) {
for (int x = 0; x < width; ++x) {
float l = lab->L[y][x];
if (hl) {
mask[y][x] = (l > thresh) ? 1.f : std::pow(l * scale, 4);
} else {
mask[y][x] = l <= thresh ? 1.f : std::pow(scale / l, 4);
}
}
}
#ifdef _OPENMP
#pragma omp parallel
#endif
{
gaussianBlur(mask, mask, width, height, sigma);
}
const float base = std::pow(4.f, float(amount)/100.f);
const float gamma = hl ? base : 1.f / base;
LUTf f(32768);
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int l = 0; l < 32768; ++l) {
f[l] = std::pow(l / 32768.f, gamma) * 32768.f;
}
#ifdef _OPENMP
#pragma omp parallel for if (multiThread)
#endif
for (int y = 0; y < height; ++y) {
for (int x = 0; x < width; ++x) {
float l = lab->L[y][x];
float blend = mask[y][x];
float orig = 1.f - blend;
if (l >= 0.f && l < 32768.f) {
lab->L[y][x] = f[l] * blend + l * orig;
if (!hl && l > 1.f) {
// when pushing shadows, scale also the chromaticity
float s = max(lab->L[y][x] / l * 0.5f, 1.f) * blend;
float a = lab->a[y][x];
float b = lab->b[y][x];
lab->a[y][x] = a * s + a * orig;
lab->b[y][x] = b * s + b * orig;
}
}
}
}
};
if (params->sh.highlights > 0) {
apply(params->sh.highlights, params->sh.htonalwidth, true);
}
if (params->sh.shadows > 0) {
apply(params->sh.shadows, params->sh.stonalwidth, false);
}
}
} // namespace rtengine

18
rtengine/rtthumbnail.cc
View File

@ -1187,17 +1187,17 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
// update blurmap // update blurmap
SHMap* shmap = nullptr; SHMap* shmap = nullptr;
if (params.sh.enabled) { // if (params.sh.enabled) {
shmap = new SHMap (fw, fh, false); // shmap = new SHMap (fw, fh, false);
double radius = sqrt (double (fw * fw + fh * fh)) / 2.0; // double radius = sqrt (double (fw * fw + fh * fh)) / 2.0;
double shradius = params.sh.radius; // double shradius = params.sh.radius;
if (!params.sh.hq) { // if (!params.sh.hq) {
shradius *= radius / 1800.0; // shradius *= radius / 1800.0;
} // }
shmap->update (baseImg, shradius, ipf.lumimul, params.sh.hq, 16); // shmap->update (baseImg, shradius, ipf.lumimul, params.sh.hq, 16);
} // }
// RGB processing // RGB processing
double expcomp = params.toneCurve.expcomp; double expcomp = params.toneCurve.expcomp;

18
rtengine/simpleprocess.cc
View File

@ -884,17 +884,17 @@ private:
// update blurmap // update blurmap
SHMap* shmap = nullptr; SHMap* shmap = nullptr;
if (params.sh.enabled) { // if (params.sh.enabled) {
shmap = new SHMap (fw, fh, true); // shmap = new SHMap (fw, fh, true);
double radius = sqrt (double (fw * fw + fh * fh)) / 2.0; // double radius = sqrt (double (fw * fw + fh * fh)) / 2.0;
double shradius = params.sh.radius; // double shradius = params.sh.radius;
if (!params.sh.hq) { // if (!params.sh.hq) {
shradius *= radius / 1800.0; // shradius *= radius / 1800.0;
} // }
shmap->update (baseImg, shradius, ipf.lumimul, params.sh.hq, 1); // shmap->update (baseImg, shradius, ipf.lumimul, params.sh.hq, 1);
} // }
// RGB processing // RGB processing