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

Optimization for RawImageSource::getRAWHistogram, Issue 2238

Browse Source
This commit is contained in:
Ingo
2014-02-10 12:24:35 +01:00
parent ea509c18ce
commit 0c0a585c8c
1 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
rtengine/rawimagesource.cc
View File

@@ -2452,62 +2452,77 @@ void RawImageSource::getAutoExpHistogram (LUTu & histogram, int& histcompr) {
// Histogram MUST be 256 in size; gamma is applied, blackpoint and gain also // Histogram MUST be 256 in size; gamma is applied, blackpoint and gain also
void RawImageSource::getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) { void RawImageSource::getRAWHistogram (LUTu & histRedRaw, LUTu & histGreenRaw, LUTu & histBlueRaw) {
histRedRaw.clear(); histGreenRaw.clear(); histBlueRaw.clear(); histRedRaw.clear(); histGreenRaw.clear(); histBlueRaw.clear();
float mult[4] = { 65535.0 / ri->get_white(0), 65535.0 / ri->get_white(1), 65535.0 / ri->get_white(2), 65535.0 / ri->get_white(3) }; const float mult[4] = { 65535.0 / ri->get_white(0), 65535.0 / ri->get_white(1), 65535.0 / ri->get_white(2), 65535.0 / ri->get_white(3) };
#pragma omp parallel #ifdef _OPENMP
int numThreads;
// reduce the number of threads under certain conditions to avoid overhaed of too many critical regions
numThreads = sqrt((((H-2*border)*(W-2*border))/262144.f));
numThreads = std::min(std::max(numThreads,1), omp_get_max_threads());
#pragma omp parallel num_threads(numThreads)
#endif
{ {
LUTu tmphistRedRaw( 256 ); // we need one LUT per color and thread, which corresponds to 1 MB per thread
LUTu tmphistGreenRaw( 256 ); LUTu tmphist[4];
LUTu tmphistBlueRaw( 256 ); tmphist[0](65536);tmphist[0].clear();
tmphistRedRaw.clear(); tmphist[1](65536);tmphist[1].clear();
tmphistGreenRaw.clear(); tmphist[2](65536);tmphist[2].clear();
tmphistBlueRaw.clear(); tmphist[3](65536);tmphist[3].clear();
#ifdef _OPENMP
#pragma omp for nowait #pragma omp for nowait
#endif
for (int i=border; i<H-border; i++) { for (int i=border; i<H-border; i++) {
int start, end, idx; int start, end;
getRowStartEnd (i, start, end); getRowStartEnd (i, start, end);
if (ri->isBayer()) { if (ri->isBayer()) {
for (int j=start; j<end; j++) { int j;
int c = FC(i, j); // three colors, 0=R, 1=G, 2=B int c1 = FC(i,start);
int c4 = ( c == 1 && !(i&1) ) ? 3 : c; // four colors, 0=R, 1=G1, 2=B, 3=G2 c1 = ( c1 == 1 && !(i&1) ) ? 3 : c1;
idx = CLIP((int)Color::gamma(mult[c4]*(ri->data[i][j]-(cblacksom[c4]/*+black_lev[c4]*/)))); int c2 = FC(i,start+1);
c2 = ( c2 == 1 && !(i&1) ) ? 3 : c2;
switch (c) { for (j=start; j<end-1; j+=2) {
case 0: tmphistRedRaw[idx>>8]++; break; tmphist[c1][ri->data[i][j]]++;
case 1: tmphistGreenRaw[idx>>8]++; break; tmphist[c2][ri->data[i][j+1]]++;
case 2: tmphistBlueRaw[idx>>8]++; break;
} }
if(j<end) { // last pixel of row if width is odd
tmphist[c1][ri->data[i][j]]++;
} }
} else { } else {
for (int j=start; j<end; j++) { for (int j=start; j<end; j++) {
for (int c=0; c<3; c++){ for (int c=0; c<3; c++){
idx = CLIP((int)Color::gamma(mult[c]*(ri->data[i][3*j+c]-cblacksom[c]))); tmphist[c][ri->data[i][3*j+c]]++;
switch (c) {
case 0: tmphistRedRaw[idx>>8]++; break;
case 1: tmphistGreenRaw[idx>>8]++; break;
case 2: tmphistBlueRaw[idx>>8]++; break;
}
} }
} }
} }
} }
#ifdef _OPENMP
#pragma omp critical #pragma omp critical
#endif
{ {
for(int i=0;i<256;i++){ for(int i=0;i<65536;i++){
histRedRaw[i] += tmphistRedRaw[i]; int idx;
histGreenRaw[i] += tmphistGreenRaw[i]; idx = CLIP((int)Color::gamma(mult[0]*(i-(cblacksom[0]/*+black_lev[0]*/))));
histBlueRaw[i] += tmphistBlueRaw[i]; histRedRaw[idx>>8] += tmphist[0][i];
idx = CLIP((int)Color::gamma(mult[1]*(i-(cblacksom[1]/*+black_lev[1]*/))));
histGreenRaw[idx>>8] += tmphist[1][i];
idx = CLIP((int)Color::gamma(mult[3]*(i-(cblacksom[3]/*+black_lev[3]*/))));
histGreenRaw[idx>>8] += tmphist[3][i];
idx = CLIP((int)Color::gamma(mult[2]*(i-(cblacksom[2]/*+black_lev[2]*/))));
histBlueRaw[idx>>8] += tmphist[2][i];
} }
} } // end of critical region
} } // end of parallel region
// since there are twice as many greens, correct for it // since there are twice as many greens, correct for it
if (ri->isBayer()) for (int i=0;i<256;i++) histGreenRaw[i]>>=1; if (ri->isBayer())
for (int i=0;i<256;i++)
histGreenRaw[i]>>=1;
} }
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%