Optimize code for exposure-vibrance and denoise-impulse
This commit is contained in:
Desmis
parent
f8987c0cb6
commit
74ffd741f9
@ -255,9 +255,9 @@ public:
|
||||
void transform(Imagefloat* original, Imagefloat* transformed, int cx, int cy, int sx, int sy, int oW, int oH, int fW, int fH, const FramesMetaData *metadata, int rawRotationDeg, bool fullImage);
|
||||
float resizeScale(const ProcParams* params, int fw, int fh, int &imw, int &imh);
|
||||
void lab2monitorRgb(LabImage* lab, Image8* image);
|
||||
void resize (Imagefloat* src, Imagefloat* dst, float dScale);
|
||||
void resize(Imagefloat* src, Imagefloat* dst, float dScale);
|
||||
void Lanczos(const LabImage* src, LabImage* dst, float scale);
|
||||
void Lanczos (const Imagefloat* src, Imagefloat* dst, float scale);
|
||||
void Lanczos(const Imagefloat* src, Imagefloat* dst, float scale);
|
||||
|
||||
void deconvsharpening(float** luminance, float** buffer, int W, int H, const SharpeningParams &sharpenParam);
|
||||
void deconvsharpeningloc(float** luminance, float** buffer, int W, int H, float** loctemp, int damp, double radi, int ite, int amo);
|
||||
@ -311,15 +311,14 @@ public:
|
||||
void InverseContrast_Local(float ave, struct local_contra & lco, const struct local_params & lp, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, LabImage * original, LabImage * transformed, int cx, int cy, int sk);
|
||||
|
||||
void vibrancelocal(int bfw, int bfh, LabImage* lab, LabImage* dest, bool & localskutili, LUTf & sklocalcurve);
|
||||
void Expose_Local(float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk);
|
||||
void Expo_vibr_Local(int senstype, float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk);
|
||||
void exlabLocal(const local_params& lp, int bfh, int bfw, LabImage* bufexporig, LabImage* lab, LUTf & hltonecurve, LUTf & shtonecurve, LUTf & tonecurve);
|
||||
void Exclude_Local(int sen, float **deltaso, float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, LabImage * rsv, int cx, int cy, int sk);
|
||||
void vibrance_Local(float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk);
|
||||
// void vibrance_Local(float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk);
|
||||
|
||||
//void DeNoise_Local(int call, const struct local_params& lp, LabImage* original, LabImage* transformed, const LabImage &tmp1, int cx, int cy);
|
||||
// void ColorLight_Local(int call, LabImage * bufcolorig, float **buflight, float **bufchro, float **bufchroslid, float ** bufhh, float ** buflightslid, bool &LHutili, bool &HHutili, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, LUTf & lllocalcurve, const LocLHCurve & loclhCurve, const LocHHCurve & lochhCurve, const local_params& lp, LabImage* original, LabImage* transformed, int cx, int cy);
|
||||
void DeNoise_Local(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, const LabImage &tmp1, int cx, int cy, int sk);
|
||||
void DeNoise_Local_imp(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, LabImage* tmp1, int cx, int cy, int sk);
|
||||
void DeNoise_Local(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk);
|
||||
// void DeNoise_Local_imp(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, LabImage* tmp1, int cx, int cy, int sk);
|
||||
|
||||
|
||||
void fftw_denoise(int GW, int GH, int max_numblox_W, int min_numblox_W, float **tmp1, array2D<float> *Lin, int numThreads, const struct local_params & lp, int chrom);
|
||||
@ -409,8 +408,8 @@ public:
|
||||
void localContrast(LabImage *lab);
|
||||
void colorToningLabGrid(LabImage *lab, int xstart, int xend, int ystart, int yend, bool MultiThread);
|
||||
|
||||
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);
|
||||
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);
|
||||
// CieImage *ciec;
|
||||
|
||||
bool transCoord(int W, int H, int x, int y, int w, int h, int& xv, int& yv, int& wv, int& hv, double ascaleDef = -1, const LensCorrection *pLCPMap = nullptr);
|
||||
|
||||
@ -1873,7 +1873,7 @@ void ImProcFunctions::addGaNoise(LabImage *lab, LabImage *dst, const float mean,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
void ImProcFunctions::DeNoise_Local_imp(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, LabImage* tmp1, int cx, int cy, int sk)
|
||||
{
|
||||
// local denoise
|
||||
@ -2053,7 +2053,7 @@ void ImProcFunctions::DeNoise_Local_imp(int call, const struct local_params& lp,
|
||||
float factorx = localFactor;
|
||||
float difL, difa, difb;
|
||||
|
||||
if (call == 2 /*|| call == 1 || call == 3 */) { //simpleprocess
|
||||
if (call == 2 ) { //simpleprocess
|
||||
difL = tmp1->L[loy - begy][lox - begx] - original->L[y][x];
|
||||
difa = tmp1->a[loy - begy][lox - begx] - original->a[y][x];
|
||||
difb = tmp1->b[loy - begy][lox - begx] - original->b[y][x];
|
||||
@ -2076,7 +2076,7 @@ void ImProcFunctions::DeNoise_Local_imp(int call, const struct local_params& lp,
|
||||
case 2: { // inside selection => full effect, no transition
|
||||
float difL, difa, difb;
|
||||
|
||||
if (call == 2 /*|| call == 1 || call == 3 */) { //simpleprocess
|
||||
if (call == 2 ) { //simpleprocess
|
||||
difL = tmp1->L[loy - begy][lox - begx] - original->L[y][x];
|
||||
difa = tmp1->a[loy - begy][lox - begx] - original->a[y][x];
|
||||
difb = tmp1->b[loy - begy][lox - begx] - original->b[y][x];
|
||||
@ -2104,12 +2104,12 @@ void ImProcFunctions::DeNoise_Local_imp(int call, const struct local_params& lp,
|
||||
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
void ImProcFunctions::DeNoise_Local(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, const LabImage &tmp1, int cx, int cy, int sk)
|
||||
void ImProcFunctions::DeNoise_Local(int call, const struct local_params& lp, int levred, float hueplus, float huemoins, float hueref, float dhueden, LabImage* original, LabImage* transformed, LabImage &tmp1, int cx, int cy, int sk)
|
||||
{
|
||||
// local denoise
|
||||
// local denoise and impulse
|
||||
//simple algo , perhaps we can improve as the others, but noise is here and not good for hue detection
|
||||
// BENCHFUN
|
||||
const float ach = (float)lp.trans / 100.f;
|
||||
@ -5616,6 +5616,7 @@ void ImProcFunctions::Sharp_Local(int call, float **loctemp, const float hueplus
|
||||
|
||||
void ImProcFunctions::Exclude_Local(int sen, float **deltaso, float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, LabImage * rsv, int cx, int cy, int sk)
|
||||
{
|
||||
//perhaps we can group with expo_vib_Local ?? but I prefer keep as that for now
|
||||
|
||||
BENCHFUN {
|
||||
const float ach = (float)lp.trans / 100.f;
|
||||
@ -6052,11 +6053,11 @@ void ImProcFunctions::Exclude_Local(int sen, float **deltaso, float **buflight,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
void ImProcFunctions::vibrance_Local(float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk)
|
||||
{
|
||||
|
||||
//local exposure
|
||||
//local vibran
|
||||
BENCHFUN {
|
||||
const float ach = (float)lp.trans / 100.f;
|
||||
float varsens = lp.sensv;
|
||||
@ -6317,16 +6318,6 @@ void ImProcFunctions::vibrance_Local(float **buflight, float **bufchro, const fl
|
||||
kzon = true;
|
||||
}
|
||||
|
||||
/*
|
||||
//printf("re=%f", realstrch);
|
||||
if (realstrch > maxc) {
|
||||
maxc = realstrch;
|
||||
}
|
||||
|
||||
if (realstrch < minc) {
|
||||
minc = realstrch;
|
||||
}
|
||||
*/
|
||||
//shape detection for hue chroma and luma
|
||||
if (varsens <= 20.f) { //to try...
|
||||
|
||||
@ -6461,16 +6452,26 @@ void ImProcFunctions::vibrance_Local(float **buflight, float **bufchro, const fl
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
|
||||
void ImProcFunctions::Expose_Local(float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk)
|
||||
void ImProcFunctions::Expo_vibr_Local(int senstype, float **buflight, float **bufchro, const float hueplus, const float huemoins, const float hueref, const float dhue, const float chromaref, const float lumaref, const struct local_params & lp, LabImage * original, LabImage * transformed, const LabImage * const tmp1, int cx, int cy, int sk)
|
||||
{
|
||||
|
||||
//local exposure
|
||||
//local exposure and vibrance
|
||||
BENCHFUN {
|
||||
const float ach = (float)lp.trans / 100.f;
|
||||
float varsens = lp.sensex;
|
||||
|
||||
if (senstype == 1) //exposure
|
||||
{
|
||||
varsens = lp.sensex;
|
||||
}
|
||||
|
||||
if (senstype == 2) //vibrance
|
||||
{
|
||||
varsens = lp.sensv;
|
||||
}
|
||||
|
||||
//chroma
|
||||
constexpr float amplchsens = 2.5f;
|
||||
constexpr float achsens = (amplchsens - 1.f) / (100.f - 20.f); //20. default locallab.sensih
|
||||
@ -9872,7 +9873,25 @@ void ImProcFunctions::Lab_Local(int call, int maxspot, int sp, LUTf & huerefs, L
|
||||
ImProcFunctions::impulse_nr(bufwv, thr);
|
||||
}
|
||||
|
||||
DeNoise_Local_imp(call, lp, levred, hueplus, huemoins, huerefblur, dhueden, original, transformed, bufwv, cx, cy, sk);
|
||||
LabImage tmp1(bufwv->W, bufwv->H);
|
||||
//copy bufwv to tmp1 to use same algo for Denoise_local and DeNoise_Local_imp
|
||||
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for schedule(dynamic,16)
|
||||
#endif
|
||||
|
||||
for (int ir = 0; ir < bufwv->H; ir++)
|
||||
for (int jr = 0; jr < bufwv->W; jr++) {
|
||||
tmp1.L[ir][jr] = bufwv->L[ir][jr];
|
||||
tmp1.a[ir][jr] = bufwv->a[ir][jr];
|
||||
tmp1.b[ir][jr] = bufwv->b[ir][jr];
|
||||
}
|
||||
|
||||
|
||||
|
||||
// DeNoise_Local_imp(call, lp, levred, hueplus, huemoins, huerefblur, dhueden, original, transformed, bufwv, cx, cy, sk);
|
||||
DeNoise_Local(call, lp, levred, hueplus, huemoins, huerefblur, dhueden, original, transformed, tmp1, cx, cy, sk);
|
||||
|
||||
delete bufwv;
|
||||
}
|
||||
|
||||
@ -11609,8 +11628,8 @@ void ImProcFunctions::Lab_Local(int call, int maxspot, int sp, LUTf & huerefs, L
|
||||
}
|
||||
}
|
||||
|
||||
Expose_Local(buflight, bufl_ab, hueplus, huemoins, hueref, dhueex, chromaref, lumaref, lp, original, transformed, bufexpfin, cx, cy, sk);
|
||||
|
||||
Expo_vibr_Local(1, buflight, bufl_ab, hueplus, huemoins, hueref, dhueex, chromaref, lumaref, lp, original, transformed, bufexpfin, cx, cy, sk);
|
||||
//call Expo_vibr_Local with first parameter = 1 for exposure
|
||||
}
|
||||
|
||||
if (call <= 3) {
|
||||
@ -11728,7 +11747,8 @@ void ImProcFunctions::Lab_Local(int call, int maxspot, int sp, LUTf & huerefs, L
|
||||
}
|
||||
}
|
||||
|
||||
vibrance_Local(buflight, bufl_ab, hueplus, huemoins, hueref, dhuev, chromaref, lumaref, lp, original, transformed, bufexpfin, cx, cy, sk);
|
||||
Expo_vibr_Local(2, buflight, bufl_ab, hueplus, huemoins, hueref, dhuev, chromaref, lumaref, lp, original, transformed, bufexpfin, cx, cy, sk);
|
||||
//call Expo_vibr_Local with first parameter = 2 for vibrance
|
||||
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user