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

restore speed when not using auto itc wb and improve speed when using it

Browse Source
This commit is contained in:
Ingo Weyrich
2020-02-29 21:04:09 +01:00
parent 0a23e85868
commit cee41b9786
2 changed files with 77 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/improccoordinator.cc
View File

@@ -389,16 +389,11 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
} }
} }
// bool autowb0 = false; if (todo & (M_INIT | M_LINDENOISE | M_HDR)) {
// autowb0 = (params->wb.method == "autold" || params->wb.method == "aut" || params->wb.method == "autosdw" || params->wb.method == "autedgsdw" || params->wb.method == "autitcgreen" || params->wb.method == "autedgrob" || params->wb.method == "autedg" || params->wb.method == "autorobust"); if (params->wb.method == "autitcgreen") {
// autowb0 = (params->wb.method == "autold" || params->wb.method == "autitcgreen");//in some cases autowb0 does not work ....params->wb.method still at "camera" instead of auto !!!
// printf("autowb0=%s \n", params->wb.method.c_str());
// if (autowb0) {
imgsrc->getrgbloc(false, false, false, 0, 0, fh, fw, 0, 0, fh, fw); imgsrc->getrgbloc(false, false, false, 0, 0, fh, fw, 0, 0, fh, fw);
// } }
}
if ((todo & (M_RETINEX | M_INIT)) && params->retinex.enabled) { if ((todo & (M_RETINEX | M_INIT)) && params->retinex.enabled) {
bool dehacontlutili = false; bool dehacontlutili = false;

96
rtengine/rawimagesource.cc
View File

@@ -3664,8 +3664,8 @@ void RawImageSource::getAutoExpHistogram (LUTu & histogram, int& histcompr)
if (ri->getSensorType() == ST_BAYER) { if (ri->getSensorType() == ST_BAYER) {
// precalculate factors to avoid expensive per pixel calculations // precalculate factors to avoid expensive per pixel calculations
float refwb0 = refwb[ri->FC(i, start)]; float refwb0 = refwb[ri->FC(i, start)];
float refwb1 = refwb[ri->FC(i, start + 1)]; float refwb1 = refwb[ri->FC(i, start + 1)];
int j; int j;
for (j = start; j < end - 1; j += 2) { for (j = start; j < end - 1; j += 2) {
@@ -3678,12 +3678,12 @@ void RawImageSource::getAutoExpHistogram (LUTu & histogram, int& histcompr)
} }
} else if (ri->getSensorType() == ST_FUJI_XTRANS) { } else if (ri->getSensorType() == ST_FUJI_XTRANS) {
// precalculate factors to avoid expensive per pixel calculations // precalculate factors to avoid expensive per pixel calculations
float refwb0 = refwb[ri->XTRANSFC(i, start)]; float refwb0 = refwb[ri->XTRANSFC(i, start)];
float refwb1 = refwb[ri->XTRANSFC(i, start + 1)]; float refwb1 = refwb[ri->XTRANSFC(i, start + 1)];
float refwb2 = refwb[ri->XTRANSFC(i, start + 2)]; float refwb2 = refwb[ri->XTRANSFC(i, start + 2)];
float refwb3 = refwb[ri->XTRANSFC(i, start + 3)]; float refwb3 = refwb[ri->XTRANSFC(i, start + 3)];
float refwb4 = refwb[ri->XTRANSFC(i, start + 4)]; float refwb4 = refwb[ri->XTRANSFC(i, start + 4)];
float refwb5 = refwb[ri->XTRANSFC(i, start + 5)]; float refwb5 = refwb[ri->XTRANSFC(i, start + 5)];
int j; int j;
for (j = start; j < end - 5; j += 6) { for (j = start; j < end - 5; j += 6) {
@@ -4853,7 +4853,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
hiss Wbhis[siza]; hiss Wbhis[siza];
for (int nh = 0; nh < siza; nh++) { for (int nh = 0; nh < siza; nh++) {
Wbhis[nh].histnum = histxy[nh]; Wbhis[nh].histnum = histxy[nh];
Wbhis[nh].index = nh; Wbhis[nh].index = nh;
} }
@@ -5016,7 +5016,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
for (int j = 0; j < Nc ; ++j) { for (int j = 0; j < Nc ; ++j) {
reff_spect_xxyy_prov[2 * j][tt] = Tx[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // x from xyY reff_spect_xxyy_prov[2 * j][tt] = Tx[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // x from xyY
reff_spect_xxyy_prov[2 * j + 1][tt] = Ty[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // y from xyY reff_spect_xxyy_prov[2 * j + 1][tt] = Ty[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // y from xyY
} }
int kk = -1; int kk = -1;
@@ -5098,7 +5098,7 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
for (int j = 0; j < Nc ; ++j) { for (int j = 0; j < Nc ; ++j) {
reff_spect_xxyy_prov[2 * j][tt] = Tx[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // x from xyY reff_spect_xxyy_prov[2 * j][tt] = Tx[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // x from xyY
reff_spect_xxyy_prov[2 * j + 1][tt] = Ty[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // y from xyY reff_spect_xxyy_prov[2 * j + 1][tt] = Ty[j][tt] / (Tx[j][tt] + Ty[j][tt] + Tz[j][tt]); // y from xyY
} }
//degrade correllation with color high chroma, but not too much...seems not good, but keep in case of?? //degrade correllation with color high chroma, but not too much...seems not good, but keep in case of??
@@ -5142,13 +5142,13 @@ void RawImageSource::ItcWB(bool extra, double &tempref, double &greenref, double
int greengoodprov; int greengoodprov;
int goodrefprov; int goodrefprov;
float studprov; float studprov;
const int goodref0 = Tgstud[0].tempref; const int goodref0 = Tgstud[0].tempref;
const int greengood0 = Tgstud[0].greenref - 39;//39 green = 1 const int greengood0 = Tgstud[0].greenref - 39;//39 green = 1
const float stud0 = Tgstud[0].student; const float stud0 = Tgstud[0].student;
const int goodref1 = Tgstud[1].tempref; const int goodref1 = Tgstud[1].tempref;
const float stud1 = Tgstud[1].student; const float stud1 = Tgstud[1].student;
const int greengood1 = Tgstud[1].greenref - 39; const int greengood1 = Tgstud[1].greenref - 39;
const int goodref2 = Tgstud[2].tempref; const int goodref2 = Tgstud[2].tempref;
const int greengood2 = Tgstud[2].greenref - 39; const int greengood2 = Tgstud[2].greenref - 39;
const float stud2 = Tgstud[2].student; const float stud2 = Tgstud[2].student;
@@ -5243,16 +5243,57 @@ void RawImageSource::getrgbloc(bool local, bool gamma, bool cat02, int begx, in
//center data on normal values //center data on normal values
int nn = 0; int nn = 0;
for (int i = 0; i < H; i ++) if (!local) {
#ifdef _OPENMP
#pragma omp parallel sections
#endif
{
#ifdef _OPENMP
#pragma omp section
#endif
{
for (int i = 0; i < H; i ++) {
for (int j = 0; j < W; j++) {
redloc[i][j] = red[i][j];
}
}
}
#ifdef _OPENMP
#pragma omp section
#endif
{
for (int i = 0; i < H; i ++) {
for (int j = 0; j < W; j++) {
greenloc[i][j] = green[i][j];
}
}
}
#ifdef _OPENMP
#pragma omp section
#endif
{
for (int i = 0; i < H; i ++) {
for (int j = 0; j < W; j++) {
blueloc[i][j] = blue[i][j];
}
}
}
}
}
#ifdef _OPENMP
#pragma omp parallel for reduction(+:avgL, nn)
#endif
for (int i = 0; i < H; i ++) {
for (int j = 0; j < W; j++) { for (int j = 0; j < W; j++) {
int lox = cx + j; int lox = cx + j;
int loy = cy + i; int loy = cy + i;
if (!local) { if (!local) {
const float redmm = redloc[i][j] = red[i][j]; const float redmm = redloc[i][j];
const float greenmm = greenloc[i][j] = green[i][j]; const float greenmm = greenloc[i][j];
const float bluemm = blueloc[i][j] = blue[i][j]; const float bluemm = blueloc[i][j];
const float LL = (0.299f * redmm + 0.587f * greenmm + 0.114f * bluemm); const float LL = 0.299f * redmm + 0.587f * greenmm + 0.114f * bluemm;
avgL += static_cast<double>(LL); avgL += static_cast<double>(LL);
nn++; nn++;
} else { } else {
@@ -5260,21 +5301,24 @@ void RawImageSource::getrgbloc(bool local, bool gamma, bool cat02, int begx, in
const float redmm = redloc[loy - begy][lox - begx] = red[i][j]; const float redmm = redloc[loy - begy][lox - begx] = red[i][j];
const float greenmm = greenloc[loy - begy][lox - begx] = green[i][j]; const float greenmm = greenloc[loy - begy][lox - begx] = green[i][j];
const float bluemm = blueloc[loy - begy][lox - begx] = blue[i][j]; const float bluemm = blueloc[loy - begy][lox - begx] = blue[i][j];
const float LL = (0.299f * redmm + 0.587f * greenmm + 0.114f * bluemm); const float LL = 0.299f * redmm + 0.587f * greenmm + 0.114f * bluemm;
avgL += static_cast<double>(LL); avgL += static_cast<double>(LL);
nn++; nn++;
} }
} }
} }
}
avgL /= nn; avgL /= nn;
float vari = 0.f; double vari = 0.f;
int mm = 0; int mm = 0;
#ifdef _OPENMP
#pragma omp parallel for reduction(+:vari, mm)
#endif
for (int i = 0; i < bfh; i++) for (int i = 0; i < bfh; i++)
for (int j = 0; j < bfw; j++) { for (int j = 0; j < bfw; j++) {
float LL = (0.299f * redloc[i][j] + 0.587f * greenloc[i][j] + 0.114f * blueloc[i][j]); float LL = 0.299f * redloc[i][j] + 0.587f * greenloc[i][j] + 0.114f * blueloc[i][j];
vari += SQR(LL - avgL); vari += SQR(LL - avgL);
mm++; mm++;
} }
@@ -5282,6 +5326,9 @@ void RawImageSource::getrgbloc(bool local, bool gamma, bool cat02, int begx, in
const float sig = std::sqrt(vari / mm); const float sig = std::sqrt(vari / mm);
const float multip = 60000.f / (avgL + 2.f * sig); const float multip = 60000.f / (avgL + 2.f * sig);
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < bfh; i++) for (int i = 0; i < bfh; i++)
for (int j = 0; j < bfw; j++) { for (int j = 0; j < bfw; j++) {
redloc[i][j] *= multip; redloc[i][j] *= multip;
@@ -5290,6 +5337,9 @@ void RawImageSource::getrgbloc(bool local, bool gamma, bool cat02, int begx, in
} }
if (gamma) { if (gamma) {
#ifdef _OPENMP
#pragma omp parallel for
#endif
for (int i = 0; i < bfh; i++) for (int i = 0; i < bfh; i++)
for (int j = 0; j < bfw; j++) { for (int j = 0; j < bfw; j++) {
redloc[i][j] = Color::gammatab_srgb[redloc[i][j]]; redloc[i][j] = Color::gammatab_srgb[redloc[i][j]];