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

Speedup for Impulse Noise Reduction, Issue 1970

Browse Source
This commit is contained in:
Ingo
2013-09-16 13:52:14 +02:00
parent 7e26931ecb
commit 59ddcd37ee
1 changed files with 314 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

369
rtengine/impulse_denoise.h
View File

@@ -18,20 +18,25 @@
*
*/
#include <cstddef>
#include "rt_math.h"
#include "rt_math.h"
#include "labimage.h"
#include "improcfun.h"
#include "cieimage.h"
#include "sleef.c"
#ifdef __SSE2__
#include "sleefsseavx.c"
#endif
using namespace std;
namespace rtengine {
void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
#if defined( __SSE2__ ) && defined( WIN32 )
__attribute__((force_align_arg_pointer)) void ImProcFunctions::impulse_nr (LabImage* lab, double thresh)
#else
void ImProcFunctions::impulse_nr (LabImage* lab, double thresh)
#endif
{
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// impulse noise removal
@@ -40,8 +45,6 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
int width = lab->W;
int height = lab->H;
float hpfabs, hfnbrave;
// buffer for the lowpass image
float ** lpf = new float *[height];
// buffer for the highpass image
@@ -59,9 +62,7 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// modified bilateral filter for lowpass image, omitting input pixel; or Gaussian blur
static float eps = 1.0;
float wtdsum[3], dirwt, norm;
int i1, j1;
const float eps = 1.0;
//rangeblur<unsigned short, unsigned int> (lab->L, lpf, impish /*used as buffer here*/, width, height, thresh, false);
#ifdef _OPENMP
@@ -79,21 +80,75 @@ 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)
#endif
for (int i=0; i < height; i++)
for (int j=0; j < width; j++) {
#ifdef _OPENMP
#pragma omp parallel
#endif
{
int i1,j1,j;
float hpfabs, hfnbrave;
#ifdef __SSE2__
__m128 hfnbravev,hpfabsv;
__m128 impthrDiv24v = _mm_set1_ps( impthrDiv24 );
__m128 onev = _mm_set1_ps( 1.0f );
#endif
#ifdef _OPENMP
#pragma omp for
#endif
for (int i=0; i < height; i++) {
for (j=0; j < 2; j++) {
hpfabs = fabs(lab->L[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++ ) {
for (j1=0; j1<=j+2; j1++) {
hfnbrave += fabs(lab->L[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#ifdef __SSE2__
for (; j < width-5; j+=4) {
hfnbravev = _mm_setzero_ps( );
hpfabsv = vabsf(LVFU(lab->L[i][j])-LVFU(lpf[i][j]));
//block average of high pass data
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=j-2; j1<=j+2; j1++) {
hfnbravev += vabsf(LVFU(lab->L[i1][j1])-LVFU(lpf[i1][j1]));
}
_mm_storeu_ps(&impish[i][j], vself(vmaskf_gt(hpfabsv, (hfnbravev-hpfabsv)*impthrDiv24v), onev, _mm_setzero_ps()));
}
for (; j < width-2; j++) {
hpfabs = fabs(lab->L[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=j-2; j1<=j+2; j1++) {
hfnbrave += fabs(lab->L[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#else
for (; j < width-2; j++) {
hpfabs = fabs(lab->L[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=j-2; j1<=j+2; j1++) {
hfnbrave += fabs(lab->L[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#endif
for (; j < width; j++) {
hpfabs = fabs(lab->L[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=j-2; j1<width; j1++) {
hfnbrave += fabs(lab->L[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
}
}
}//now impulsive values have been identified
//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,
@@ -102,15 +157,21 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
// 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)
#pragma omp parallel
#endif
for (int i=0; i < height; i++)
for (int j=0; j < width; j++) {
{
int i1,j1,j;
float wtdsum[3], dirwt, norm;
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
#endif
for (int i=0; i < height; i++) {
for (j=0; j < 2; j++) {
if (!impish[i][j]) continue;
norm=0.0;
wtdsum[0]=wtdsum[1]=wtdsum[2]=0.0;
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++ ) {
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=0; j1<=j+2; j1++ ) {
if (i1==i && j1==j) continue;
if (impish[i1][j1]) continue;
dirwt = 1/(SQR(lab->L[i1][j1]-lab->L[i][j])+eps);//use more sophisticated rangefn???
@@ -119,14 +180,55 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
wtdsum[2] += dirwt*lab->b[i1][j1];
norm += dirwt;
}
//wtdsum /= norm;
if (norm) {
lab->L[i][j]=wtdsum[0]/norm;//low pass filter
lab->a[i][j]=wtdsum[1]/norm;//low pass filter
lab->b[i][j]=wtdsum[2]/norm;//low pass filter
}
}//now impulsive values have been corrected
}
for (; j < width-2; j++) {
if (!impish[i][j]) continue;
norm=0.0;
wtdsum[0]=wtdsum[1]=wtdsum[2]=0.0;
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=j-2; j1<=j+2; j1++ ) {
if (i1==i && j1==j) continue;
if (impish[i1][j1]) continue;
dirwt = 1/(SQR(lab->L[i1][j1]-lab->L[i][j])+eps);//use more sophisticated rangefn???
wtdsum[0] += dirwt*lab->L[i1][j1];
wtdsum[1] += dirwt*lab->a[i1][j1];
wtdsum[2] += dirwt*lab->b[i1][j1];
norm += dirwt;
}
if (norm) {
lab->L[i][j]=wtdsum[0]/norm;//low pass filter
lab->a[i][j]=wtdsum[1]/norm;//low pass filter
lab->b[i][j]=wtdsum[2]/norm;//low pass filter
}
}
for (; j < width; j++) {
if (!impish[i][j]) continue;
norm=0.0;
wtdsum[0]=wtdsum[1]=wtdsum[2]=0.0;
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=j-2; j1<width; j1++ ) {
if (i1==i && j1==j) continue;
if (impish[i1][j1]) continue;
dirwt = 1/(SQR(lab->L[i1][j1]-lab->L[i][j])+eps);//use more sophisticated rangefn???
wtdsum[0] += dirwt*lab->L[i1][j1];
wtdsum[1] += dirwt*lab->a[i1][j1];
wtdsum[2] += dirwt*lab->b[i1][j1];
norm += dirwt;
}
if (norm) {
lab->L[i][j]=wtdsum[0]/norm;//low pass filter
lab->a[i][j]=wtdsum[1]/norm;//low pass filter
lab->b[i][j]=wtdsum[2]/norm;//low pass filter
}
}
}
}
//now impulsive values have been corrected
for (int i=0; i<height; i++) {
delete [] lpf[i];
@@ -137,8 +239,13 @@ void ImProcFunctions::impulse_nr (LabImage* lab, double thresh) {
}
void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
#if defined( __SSE2__ ) && defined( WIN32 )
__attribute__((force_align_arg_pointer)) void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh)
#else
void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh)
#endif
{
// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// impulse noise removal
@@ -147,7 +254,7 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
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];
@@ -163,9 +270,7 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// 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;
const float eps = 1.0f;
float** sraa;
sraa = new float*[height];
for (int i=0; i<height; i++)
@@ -175,22 +280,49 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
srbb = new float*[height];
for (int i=0; i<height; i++)
srbb[i] = new float[width];
#ifdef _OPENMP
#pragma omp parallel for
#pragma omp parallel
#endif
{
int j;
float2 sincosval;
#ifdef __SSE2__
vfloat2 sincosvalv;
__m128 piidv = _mm_set1_ps( piid );
__m128 tempv;
#endif
#ifdef _OPENMP
#pragma omp 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]);
for (int i=0; i<height; i++) {
#ifdef __SSE2__
for (j=0; j<width-3; j+=4) {
sincosvalv = xsincosf(piidv*LVFU(ncie->h_p[i][j]));
tempv = LVFU(ncie->C_p[i][j]);
_mm_storeu_ps(&sraa[i][j], tempv * sincosvalv.y);
_mm_storeu_ps(&srbb[i][j], tempv * sincosvalv.x);
}
for (; j<width; j++) {
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
#else
for (j=0; j<width; j++) {
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;
}
#endif
}
}
//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
#pragma omp parallel
#endif
{
AlignedBufferMP<double> buffer(max(width,height));
@@ -204,21 +336,74 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double 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)
#pragma omp parallel
#endif
for (int i=0; i < height; i++)
for (int j=0; j < width; j++) {
{
int i1,j1,j;
float hpfabs, hfnbrave;
#ifdef __SSE2__
__m128 hfnbravev,hpfabsv;
__m128 impthrDiv24v = _mm_set1_ps( impthrDiv24 );
__m128 onev = _mm_set1_ps( 1.0f );
#endif
#ifdef _OPENMP
#pragma omp for
#endif
for (int i=0; i < height; i++) {
for (j=0; j < 2; 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++ ) {
for (j1=0; j1<=j+2; j1++) {
hfnbrave += fabs(ncie->sh_p[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#ifdef __SSE2__
for (; j < width-5; j+=4) {
hpfabsv = vabsf(LVFU(ncie->sh_p[i][j])-LVFU(lpf[i][j]));
hfnbravev = _mm_setzero_ps();
//block average of high pass data
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ ) {
for (j1=j-2; j1<=j+2; j1++ ) {
hfnbravev += vabsf(LVFU(ncie->sh_p[i1][j1])-LVFU(lpf[i1][j1]));
}
_mm_storeu_ps(&impish[i][j], vself(vmaskf_gt(hpfabsv, (hfnbravev-hpfabsv)*impthrDiv24v), onev, _mm_setzero_ps()));
}
}
for (; j < width-2; 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=j-2; j1<=j+2; j1++ ) {
hfnbrave += fabs(ncie->sh_p[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#else
for (; j < width-2; 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=j-2; j1<=j+2; j1++ ) {
hfnbrave += fabs(ncie->sh_p[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
#endif
for (; 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=j-2; j1<width; j1++ ) {
hfnbrave += fabs(ncie->sh_p[i1][j1]-lpf[i1][j1]);
}
impish[i][j] = (hpfabs>((hfnbrave-hpfabs)*impthrDiv24));
}
}
}
}//now impulsive values have been identified
//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,
@@ -227,15 +412,21 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
// 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)
#pragma omp parallel
#endif
for (int i=0; i < height; i++)
for (int j=0; j < width; j++) {
{
int i1,j1,j;
float wtdsum[3], dirwt, norm;
#ifdef _OPENMP
#pragma omp for schedule(dynamic,16)
#endif
for (int i=0; i < height; i++) {
for (j=0; j < 2; 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++ ) {
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=0; j1<=j+2; 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???
@@ -244,23 +435,94 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
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
}
}
for (; j < width-2; j++) {
if (!impish[i][j]) continue;
norm=0.0f;
wtdsum[0]=wtdsum[1]=wtdsum[2]=0.0f;
for (i1=max(0,i-2); i1<=min(i+2,height-1); i1++ )
for (j1=j-2; j1<=j+2; 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;
}
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
}
}
for (; 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); i1<=min(i+2,height-1); i1++ )
for (j1=j-2; j1<width; 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;
}
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
//now impulsive values have been corrected
#ifdef _OPENMP
#pragma omp parallel
#endif
{
#ifdef __SSE2__
__m128 interav,interbv;
__m128 piidv = _mm_set1_ps(piid);
#endif // __SSE2__
int j;
#ifdef _OPENMP
#pragma omp for
#endif
for(int i = 0; i < height; i++ ) {
for(int j = 0; j < width; j++) {
#ifdef __SSE2__
for(j = 0; j < width-3; j+=4) {
interav = LVFU(sraa[i][j]);
interbv = LVFU(srbb[i][j]);
_mm_storeu_ps(&ncie->h_p[i][j],(xatan2f(interbv,interav))/piidv);
_mm_storeu_ps(&ncie->C_p[i][j], _mm_sqrt_ps(SQRV(interbv)+SQRV(interav)));
}
for(; 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));
}
#else
for(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));
}
#endif
}
}
for (int i=0; i<height; i++) {
delete [] lpf[i];
@@ -279,6 +541,3 @@ void ImProcFunctions::impulse_nrcam (CieImage* ncie, double thresh) {
}