Fix random bright pixels appear when using CIECAM02 and a wide gamut color space and automatic calculation of adaptation scene luminosity
This commit is contained in:
jdc
@@ -23,6 +23,8 @@
|
||||
#include "rt_math.h"
|
||||
#include "labimage.h"
|
||||
#include "improcfun.h"
|
||||
#include "cieimage.h"
|
||||
#include "sleef.c"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -75,10 +77,10 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
|
||||
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
float impthr = max(1.0,5.5-thresh);
|
||||
float impthrDiv24 = impthr / 24.0f; //Issue 1671: moved the Division outside the loop, impthr can be optimized out too, but I let in the code at the moment
|
||||
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(hpfabs, hfnbrave,i1,j1)
|
||||
float impthrDiv24 = impthr / 24.0f; //Issue 1671: moved the Division outside the loop, impthr can be optimized out too, but I let in the code at the moment
|
||||
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(hpfabs, hfnbrave,i1,j1)
|
||||
#endif
|
||||
for (int i=0; i < height; i++)
|
||||
for (int j=0; j < width; j++) {
|
||||
@@ -92,15 +94,15 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
|
||||
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
|
||||
|
||||
}//now impulsive values have been identified
|
||||
|
||||
// Issue 1671:
|
||||
// often, noise isn't evenly distributed, e.g. only a few noisy pixels in the bright sky, but many in the dark foreground,
|
||||
// so it's better to schedule dynamic and let every thread only process 16 rows, to avoid running big threads out of work
|
||||
// Measured it and in fact gives better performance than without schedule(dynamic,16). Of course, there could be a better
|
||||
// choice for the chunk_size than 16
|
||||
// race conditions are avoided by the array impish
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(wtdsum,norm,dirwt,i1,j1) schedule(dynamic,16)
|
||||
|
||||
// Issue 1671:
|
||||
// often, noise isn't evenly distributed, e.g. only a few noisy pixels in the bright sky, but many in the dark foreground,
|
||||
// so it's better to schedule dynamic and let every thread only process 16 rows, to avoid running big threads out of work
|
||||
// Measured it and in fact gives better performance than without schedule(dynamic,16). Of course, there could be a better
|
||||
// choice for the chunk_size than 16
|
||||
// race conditions are avoided by the array impish
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(wtdsum,norm,dirwt,i1,j1) schedule(dynamic,16)
|
||||
#endif
|
||||
for (int i=0; i < height; i++)
|
||||
for (int j=0; j < width; j++) {
|
||||
@@ -135,6 +137,147 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
|
||||
|
||||
}
|
||||
|
||||
void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
|
||||
|
||||
|
||||
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
// impulse noise removal
|
||||
// local variables
|
||||
|
||||
int width = ncie->W;
|
||||
int height = ncie->H;
|
||||
|
||||
float hpfabs, hfnbrave;
|
||||
float piid=3.14159265f/180.f;
|
||||
// buffer for the lowpass image
|
||||
float ** lpf = new float *[height];
|
||||
// buffer for the highpass image
|
||||
float ** impish = new float *[height];
|
||||
for (int i=0; i<height; i++) {
|
||||
lpf[i] = new float [width];
|
||||
//memset (lpf[i], 0, width*sizeof(float));
|
||||
impish[i] = new float [width];
|
||||
//memset (impish[i], 0, width*sizeof(unsigned short));
|
||||
}
|
||||
|
||||
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
// modified bilateral filter for lowpass image, omitting input pixel; or Gaussian blur
|
||||
|
||||
static float eps = 1.0f;
|
||||
float wtdsum[3], dirwt, norm;
|
||||
int i1, j1;
|
||||
float** sraa;
|
||||
sraa = new float*[height];
|
||||
for (int i=0; i<height; i++)
|
||||
sraa[i] = new float[width];
|
||||
|
||||
float** srbb;
|
||||
srbb = new float*[height];
|
||||
for (int i=0; i<height; i++)
|
||||
srbb[i] = new float[width];
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for
|
||||
#endif
|
||||
for (int i=0; i<height; i++)
|
||||
for (int j=0; j<width; j++) {
|
||||
float2 sincosval = xsincosf(piid*ncie->h_p[i][j]);
|
||||
sraa[i][j]=ncie->C_p[i][j]*sincosval.y;
|
||||
srbb[i][j]=ncie->C_p[i][j]*sincosval.x;
|
||||
}
|
||||
//The cleaning algorithm starts here
|
||||
|
||||
|
||||
|
||||
//rangeblur<unsigned short, unsigned int> (lab->L, lpf, impish /*used as buffer here*/, width, height, thresh, false);
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel
|
||||
#endif
|
||||
{
|
||||
AlignedBufferMP<double> buffer(max(width,height));
|
||||
gaussHorizontal<float> (ncie->sh_p, lpf, buffer, width, height, max(2.0,thresh-1.0));
|
||||
gaussVertical<float> (lpf, lpf, buffer, width, height, max(2.0,thresh-1.0));
|
||||
}
|
||||
|
||||
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
|
||||
float impthr = max(1.0f,5.0f-(float)thresh);
|
||||
float impthrDiv24 = impthr / 24.0f; //Issue 1671: moved the Division outside the loop, impthr can be optimized out too, but I let in the code at the moment
|
||||
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(hpfabs, hfnbrave,i1,j1)
|
||||
#endif
|
||||
for (int i=0; i < height; i++)
|
||||
for (int j=0; j < width; j++) {
|
||||
|
||||
hpfabs = fabs(ncie->sh_p[i][j]-lpf[i][j]);
|
||||
//block average of high pass data
|
||||
for (i1=max(0,i-2), hfnbrave=0; i1<=min(i+2,height-1); i1++ )
|
||||
for (j1=max(0,j-2); j1<=min(j+2,width-1); j1++ ) {
|
||||
hfnbrave += fabs(ncie->sh_p[i1][j1]-lpf[i1][j1]);
|
||||
}
|
||||
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
|
||||
|
||||
}//now impulsive values have been identified
|
||||
|
||||
|
||||
// Issue 1671:
|
||||
// often, noise isn't evenly distributed, e.g. only a few noisy pixels in the bright sky, but many in the dark foreground,
|
||||
// so it's better to schedule dynamic and let every thread only process 16 rows, to avoid running big threads out of work
|
||||
// Measured it and in fact gives better performance than without schedule(dynamic,16). Of course, there could be a better
|
||||
// choice for the chunk_size than 16
|
||||
// race conditions are avoided by the array impish
|
||||
#ifdef _OPENMP
|
||||
#pragma omp parallel for private(wtdsum,norm,dirwt,i1,j1) schedule(dynamic,16)
|
||||
#endif
|
||||
for (int i=0; i < height; i++)
|
||||
for (int j=0; j < width; j++) {
|
||||
if (!impish[i][j]) continue;
|
||||
norm=0.0f;
|
||||
wtdsum[0]=wtdsum[1]=wtdsum[2]=0.0f;
|
||||
for (i1=max(0,i-2), hfnbrave=0; i1<=min(i+2,height-1); i1++ )
|
||||
for (j1=max(0,j-2); j1<=min(j+2,width-1); j1++ ) {
|
||||
if (i1==i && j1==j) continue;
|
||||
if (impish[i1][j1]) continue;
|
||||
dirwt = 1.f/(SQR(ncie->sh_p[i1][j1]-ncie->sh_p[i][j])+eps);//use more sophisticated rangefn???
|
||||
wtdsum[0] += dirwt*ncie->sh_p[i1][j1];
|
||||
wtdsum[1] += dirwt*sraa[i1][j1];
|
||||
wtdsum[2] += dirwt*srbb[i1][j1];
|
||||
norm += dirwt;
|
||||
}
|
||||
//wtdsum /= norm;
|
||||
if (norm) {
|
||||
ncie->sh_p[i][j]=wtdsum[0]/norm;//low pass filter
|
||||
sraa[i][j]=wtdsum[1]/norm;//low pass filter
|
||||
srbb[i][j]=wtdsum[2]/norm;//low pass filter
|
||||
}
|
||||
|
||||
}//now impulsive values have been corrected
|
||||
|
||||
for(int i = 0; i < height; i++ ) {
|
||||
for(int j = 0; j < width; j++) {
|
||||
float intera = sraa[i][j];
|
||||
float interb = srbb[i][j];
|
||||
ncie->h_p[i][j]=(xatan2f(interb,intera))/piid;
|
||||
ncie->C_p[i][j]=sqrt(SQR(interb)+SQR(intera));
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0; i<height; i++) {
|
||||
delete [] lpf[i];
|
||||
delete [] impish[i];
|
||||
}
|
||||
delete [] lpf;
|
||||
delete [] impish;
|
||||
for (int i=0; i<height; i++)
|
||||
delete [] sraa[i];
|
||||
delete [] sraa;
|
||||
for (int i=0; i<height; i++)
|
||||
delete [] srbb[i];
|
||||
delete [] srbb;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user