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

Improve scope more progressive for Blurnoise and transit_shapedetect

Browse Source
This commit is contained in:
Desmis 2019-04-10 11:11:44 +02:00
parent 4e6b1a6770
commit a7c43b7072
1 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
rtengine/iplocallab.cc
View File

@ -1200,6 +1200,33 @@ static void balancedeltaE(float kL, float &kab)
kab = abal * kL + bbal; kab = abal * kL + bbal;
} }
static void calcreducdE(float dE, float maxdE, float mindE, float maxdElim, float mindElim, float iterat, float limscope, int scope, float &reducdE)
{
if (dE > maxdE) {
reducdE = 0.f;
} else if (dE > mindE && dE <= maxdE) {
const float ar = 1.f / (mindE - maxdE);
const float br = - ar * maxdE;
reducdE = pow(ar * dE + br, iterat);
} else {
reducdE = 1.f;
}
if (scope > limscope) {//80 arbitrary value, if we change we must change limscope
if (dE > maxdElim) {
reducdE = 0.f;
} else if (dE > mindElim && dE <= maxdElim) {
const float arlim = 1.f / (mindElim - maxdElim);
const float brlim = - arlim * maxdElim;
const float reducdElim = pow(arlim * dE + brlim, iterat);
const float aalim = (1.f - reducdElim) / 20.f;
const float bblim = 1.f - 100.f * aalim;
reducdE = aalim * scope + bblim;
} else {
reducdE = 1.f;
}
}
}
void ImProcFunctions::DeNoise_Local(int call, const struct local_params& lp, int levred, float hueref, float lumaref, float chromaref, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk) void ImProcFunctions::DeNoise_Local(int call, const struct local_params& lp, int levred, float hueref, float lumaref, float chromaref, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk)
{ {
//warning, but I hope used it next //warning, but I hope used it next
@ -1443,10 +1470,14 @@ void ImProcFunctions::BlurNoise_Local(LabImage * tmp1, const float hueref, const
#pragma omp parallel if (multiThread) #pragma omp parallel if (multiThread)
#endif #endif
{ {
const int limscope = 80;
const int begy = int (lp.yc - lp.lyT); const int begy = int (lp.yc - lp.lyT);
const int begx = int (lp.xc - lp.lxL); const int begx = int (lp.xc - lp.lxL);
const float mindE = 2.f + MINSCOPE * lp.sensbn * lp.thr; const float mindE = 2.f + MINSCOPE * lp.sensbn * lp.thr;
const float maxdE = 5.f + MAXSCOPE * lp.sensbn * (1 + 0.1f * lp.thr); const float maxdE = 5.f + MAXSCOPE * lp.sensbn * (1 + 0.1f * lp.thr);
const float mindElim = 2.f + MINSCOPE * limscope * lp.thr;
const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * lp.thr);
// printf("mdE=%f Mde=%f mde80=%f Mde80=%f sensbn=%i\n", mindE, maxdE, mindE80, maxdE80, lp.sensbn);
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp for schedule(dynamic,16) #pragma omp for schedule(dynamic,16)
@ -1479,18 +1510,7 @@ void ImProcFunctions::BlurNoise_Local(LabImage * tmp1, const float hueref, const
const float dE = sqrt(kab * (SQR(refa - origblur->a[y][x]) + SQR(refb - origblur->b[y][x])) + kL * SQR(refL - origblur->L[y][x])); const float dE = sqrt(kab * (SQR(refa - origblur->a[y][x]) + SQR(refb - origblur->b[y][x])) + kL * SQR(refL - origblur->L[y][x]));
float reducdE; float reducdE;
if (lp.sensbn > 99) { calcreducdE(dE, maxdE, mindE, maxdElim, mindElim, lp.iterat, limscope, lp.sensbn , reducdE);
reducdE = 1.f;
} else if (dE > maxdE) {
reducdE = 0.f;
} else if (dE > mindE && dE <= maxdE) {
const float ar = 1.f / (mindE - maxdE);
const float br = - ar * maxdE;
reducdE = pow(ar * dE + br, lp.iterat);
} else {
reducdE = 1.f;
}
switch (zone) { switch (zone) {
@ -1714,6 +1734,11 @@ void ImProcFunctions::InverseBlurNoise_Local(const struct local_params & lp, co
#pragma omp parallel if (multiThread) #pragma omp parallel if (multiThread)
#endif #endif
{ {
const int limscope = 80;
const float mindE = 2.f + MINSCOPE * lp.sensbn * lp.thr;
const float maxdE = 5.f + MAXSCOPE * lp.sensbn * (1 + 0.1f * lp.thr);
const float mindElim = 2.f + MINSCOPE * limscope * lp.thr;
const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * lp.thr);
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp for schedule(dynamic,16) #pragma omp for schedule(dynamic,16)
@ -1735,33 +1760,9 @@ void ImProcFunctions::InverseBlurNoise_Local(const struct local_params & lp, co
} }
float rL = origblur->L[y][x] / 327.68f; float rL = origblur->L[y][x] / 327.68f;
float reducdE = 0.f;
float dE = sqrt(kab * SQR(refa - origblur->a[y][x] / 327.68f) + kab * SQR(refb - origblur->b[y][x] / 327.68f) + kL * SQR(lumaref - rL)); float dE = sqrt(kab * SQR(refa - origblur->a[y][x] / 327.68f) + kab * SQR(refb - origblur->b[y][x] / 327.68f) + kL * SQR(lumaref - rL));
float mindE = 2.f + MINSCOPE * lp.sensbn * lp.thr; float reducdE;
float maxdE = 5.f + MAXSCOPE * lp.sensbn * (1 + 0.1f * lp.thr); calcreducdE(dE, maxdE, mindE, maxdElim, mindElim, lp.iterat, limscope, lp.sensbn , reducdE);
float ar = 1.f / (mindE - maxdE);
float br = - ar * maxdE;
if (dE > maxdE) {
reducdE = 0.f;
}
if (dE > mindE && dE <= maxdE) {
reducdE = ar * dE + br;
}
if (dE <= mindE) {
reducdE = 1.f;
}
reducdE = pow(reducdE, lp.iterat);
if (lp.sensbn > 99) {
reducdE = 1.f;
}
switch (zone) { switch (zone) {
case 0: { // outside selection and outside transition zone => full effect, no transition case 0: { // outside selection and outside transition zone => full effect, no transition
float difL = tmp1->L[y][x] - original->L[y][x]; float difL = tmp1->L[y][x] - original->L[y][x];
@ -2759,7 +2760,7 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage *bufexpor
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel if (multiThread) #pragma omp parallel if (multiThread)
#endif #endif
{ {
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp for schedule(dynamic,16) #pragma omp for schedule(dynamic,16)
#endif #endif
@ -2780,10 +2781,11 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage *bufexpor
} }
const LabImage *maskptr = usemaskall ? origblurmask.get() : origblur.get(); const LabImage *maskptr = usemaskall ? origblurmask.get() : origblur.get();
const int limscope = 80;
const float mindE = 2.f + MINSCOPE * varsens * lp.thr; const float mindE = 2.f + MINSCOPE * varsens * lp.thr;
const float maxdE = 5.f + MAXSCOPE * varsens * (1 + 0.1f * lp.thr); const float maxdE = 5.f + MAXSCOPE * varsens * (1 + 0.1f * lp.thr);
const float ar = 1.f / (mindE - maxdE); const float mindElim = 2.f + MINSCOPE * limscope * lp.thr;
const float br = - ar * maxdE; const float maxdElim = 5.f + MAXSCOPE * limscope * (1 + 0.1f * lp.thr);
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel if (multiThread) #pragma omp parallel if (multiThread)
@ -2882,16 +2884,7 @@ void ImProcFunctions::transit_shapedetect(int senstype, const LabImage *bufexpor
} }
float reducdE; float reducdE;
calcreducdE(dE, maxdE, mindE, maxdElim, mindElim, lp.iterat, limscope, varsens , reducdE);
if (varsens > 99) {
reducdE = 1.f;
} else if (dE > maxdE) {
reducdE = 0.f;
} else if (dE > mindE && dE <= maxdE) {
reducdE = pow(ar * dE + br, lp.iterat);
} else { /*if (dE <= mindE)*/
reducdE = 1.f;
}
const float realstrdE = reducdE * cli; const float realstrdE = reducdE * cli;
const float realstradE = reducdE * cla; const float realstradE = reducdE * cla;