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

Cleanup and removed stopwatch, #6143

Browse Source
This commit is contained in:
Ingo Weyrich 2021-02-28 14:16:20 +01:00
parent 1f9a8b69a2
commit 045bc1cd9a
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rtengine/ipwavelet.cc
View File

@ -1327,11 +1327,10 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
} }
// } // }
if (execut && exitifzero) { if (execut && exitifzero) {
StopWatch Stop1("levels loop");
for (int dir = 1; dir < 4; dir++) { for (int dir = 1; dir < 4; dir++) {
for (int level = 0; level < levref; level++) { for (int level = 0; level < levref; level++) {
int Wlvl_L = Ldecomp->level_W(level); const int Wlvl_L = Ldecomp->level_W(level);
int Hlvl_L = Ldecomp->level_H(level); const int Hlvl_L = Ldecomp->level_H(level);
const float* const WavCoeffs_L = Ldecomp->level_coeffs(level)[dir];//first decomp denoised const float* const WavCoeffs_L = Ldecomp->level_coeffs(level)[dir];//first decomp denoised
const float* const WavCoeffs_L2 = Ldecomp2->level_coeffs(level)[dir];//second decomp before denoise const float* const WavCoeffs_L2 = Ldecomp2->level_coeffs(level)[dir];//second decomp before denoise
const int k4 = cp.complex == 1 ? 4 : 3; const int k4 = cp.complex == 1 ? 4 : 3;
@ -1355,32 +1354,12 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
} }
//find local contrast //find local contrast
float tempmean = 0.f; constexpr float weights[4] = {0.f, 0.5f, 0.7f, 1.f};
float tempsig = 0.f; const float weightL = weights[rtengine::LIM(cp.mixmet, 0, 3)];
float tempmax = 0.f; const float tempmean = intp(weightL, meand[level], mean[level]);
float weightL = 1.f; const float tempsig = intp(weightL, sigmad[level], sigma[level]);
if(cp.mixmet == 0){ const float tempmax = intp(weightL, MaxPd[level], MaxP[level]);
weightL = 0.f;
tempmean = mean[level];
tempsig = sigma[level];
tempmax = MaxP[level];
} else if(cp.mixmet == 1){
weightL = 0.5f;
tempmean = 0.5f * mean[level] + 0.5f * meand[level] ;
tempsig = 0.5f * sigma[level] + 0.5f * sigmad[level] ;
tempmax = 0.5f * MaxP[level] + 0.5f * MaxPd[level] ;
} else if(cp.mixmet == 2){
weightL = 0.7f;
tempmean = 0.3f * mean[level] + 0.7f * meand[level] ;
tempsig = 0.3f * sigma[level] + 0.7f * sigmad[level] ;
tempmax = 0.3f * MaxP[level] + 0.7f * MaxPd[level] ;
} else if(cp.mixmet == 3){
weightL = 1.f;
tempmean = meand[level];
tempsig = sigmad[level];
tempmax = MaxPd[level];
}
if (MaxP[level] > 0.f && mean[level] != 0.f && sigma[level] != 0.f) { //curve if (MaxP[level] > 0.f && mean[level] != 0.f && sigma[level] != 0.f) { //curve
constexpr float insigma = 0.666f; //SD constexpr float insigma = 0.666f; //SD
const float logmax = log(tempmax); //log Max const float logmax = log(tempmax); //log Max