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

Speedup for Noise Reduction, Issue 2557#100

Browse Source
This commit is contained in:
Ingo
2014-12-23 12:20:49 +01:00
parent 8190d5ba75
commit 700c63dc3e
4 changed files with 307 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

286
rtengine/FTblockDN.cc
View File

@@ -244,7 +244,7 @@ void ImProcFunctions::Tile_calc (int tilesize, int overlap, int kall, int imwidt
int denoiseNestedLevels = 1; int denoiseNestedLevels = 1;
void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagefloat * dst,Imagefloat * calclum, float * ch_M, float *max_r, float *max_b, bool isRAW, const procparams::DirPyrDenoiseParams & dnparams, const double expcomp, const NoiseCurve & noiseLCurve, const NoiseCurve & noiseCCurve, float &chaut, float &redaut, float &blueaut, float &maxredaut, float &maxblueaut, float &nresi, float &highresi) SSEFUNCTION void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagefloat * dst,Imagefloat * calclum, float * ch_M, float *max_r, float *max_b, bool isRAW, const procparams::DirPyrDenoiseParams & dnparams, const double expcomp, const NoiseCurve & noiseLCurve, const NoiseCurve & noiseCCurve, float &chaut, float &redaut, float &blueaut, float &maxredaut, float &maxblueaut, float &nresi, float &highresi)
{ {
//#ifdef _DEBUG //#ifdef _DEBUG
MyTime t1e,t2e; MyTime t1e,t2e;
@@ -278,20 +278,20 @@ void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagefloat * dst,I
{wprofi[1][0],wprofi[1][1],wprofi[1][2]}, {wprofi[1][0],wprofi[1][1],wprofi[1][2]},
{wprofi[2][0],wprofi[2][1],wprofi[2][2]} {wprofi[2][0],wprofi[2][1],wprofi[2][2]}
}; };
lumcalc = new float*[hei]; lumcalc = new float*[(hei+1)/2];
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
lumcalc[i] = new float[wid]; lumcalc[i] = new float[(wid+1)/2];
acalc = new float*[hei]; acalc = new float*[(hei+1)/2];
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
acalc[i] = new float[wid]; acalc[i] = new float[(wid+1)/2];
bcalc = new float*[hei]; bcalc = new float*[(hei+1)/2];
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
bcalc[i] = new float[wid]; bcalc[i] = new float[(wid+1)/2];
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
for(int ii=0;ii<hei;ii++){ for(int ii=0;ii<hei;ii+=2){
for(int jj=0;jj<wid;jj++){ for(int jj=0;jj<wid;jj+=2){
float LLum,AAum,BBum; float LLum,AAum,BBum;
float RL = calclum->r(ii,jj); float RL = calclum->r(ii,jj);
@@ -301,9 +301,9 @@ void ImProcFunctions::RGB_denoise(int kall, Imagefloat * src, Imagefloat * dst,I
float XL,YL,ZL; float XL,YL,ZL;
Color::rgbxyz(RL,GL,BL,XL,YL,ZL,wpi); Color::rgbxyz(RL,GL,BL,XL,YL,ZL,wpi);
Color::XYZ2Lab(XL, YL, ZL, LLum, AAum, BBum); Color::XYZ2Lab(XL, YL, ZL, LLum, AAum, BBum);
lumcalc[ii][jj]=LLum; lumcalc[ii>>1][jj>>1]=LLum;
acalc[ii][jj]=AAum; acalc[ii>>1][jj>>1]=AAum;
bcalc[ii][jj]=BBum; bcalc[ii>>1][jj>>1]=BBum;
} }
} }
delete calclum; delete calclum;
@@ -472,14 +472,12 @@ if(settings->leveldnti ==1) {
printf("RGB_denoise uses %d main thread(s) and up to %d nested thread(s) for each main thread\n",numthreads,denoiseNestedLevels); printf("RGB_denoise uses %d main thread(s) and up to %d nested thread(s) for each main thread\n",numthreads,denoiseNestedLevels);
#endif #endif
float *nbrwtArray[denoiseNestedLevels*numthreads];
float *LbloxArray[denoiseNestedLevels*numthreads]; float *LbloxArray[denoiseNestedLevels*numthreads];
float *fLbloxArray[denoiseNestedLevels*numthreads]; float *fLbloxArray[denoiseNestedLevels*numthreads];
for(int i=0;i<denoiseNestedLevels*numthreads;i++) { for(int i=0;i<denoiseNestedLevels*numthreads;i++) {
LbloxArray[i] = (float*) fftwf_malloc(max_numblox_W*TS*TS*sizeof(float)); LbloxArray[i] = (float*) fftwf_malloc(max_numblox_W*TS*TS*sizeof(float));
fLbloxArray[i] = (float*) fftwf_malloc(max_numblox_W*TS*TS*sizeof(float)); fLbloxArray[i] = (float*) fftwf_malloc(max_numblox_W*TS*TS*sizeof(float));
nbrwtArray[i] = new float[TS*TS];
} }
TMatrix wiprof = iccStore->workingSpaceInverseMatrix (params->icm.working); TMatrix wiprof = iccStore->workingSpaceInverseMatrix (params->icm.working);
@@ -511,6 +509,12 @@ if(settings->leveldnti ==1) {
float residblue=0.f; float residblue=0.f;
int pos; int pos;
float** noisevarlum = new float*[(tileheight+1)/2];
for (int i=0; i<(tileheight+1)/2; i++)
noisevarlum[i] = new float[(tilewidth+1)/2];
float** noisevarchrom = new float*[(tileheight+1)/2];
for (int i=0; i<(tileheight+1)/2; i++)
noisevarchrom[i] = new float[(tilewidth+1)/2];
#ifdef _OPENMP #ifdef _OPENMP
@@ -562,17 +566,9 @@ if(settings->leveldnti ==1) {
//wavelet denoised image //wavelet denoised image
LabImage * labdn = new LabImage(width,height); LabImage * labdn = new LabImage(width,height);
float* mad_LL = new float [height*width]; float* mad_LL = new float [height*width];
float** noisevarlum;
noisevarlum = new float*[height];
for (int i=0; i<height; i++)
noisevarlum[i] = new float[width];
float* mad_aa = new float [height*width]; float* mad_aa = new float [height*width];
float* mad_bb = new float [height*width]; float* mad_bb = new float [height*width];
float** noisevarchrom;
noisevarchrom = new float*[height];
for (int i=0; i<height; i++)
noisevarchrom[i] = new float[width];
//residual between input and denoised L channel //residual between input and denoised L channel
array2D<float> Ldetail(width,height,ARRAY2D_CLEAR_DATA); array2D<float> Ldetail(width,height,ARRAY2D_CLEAR_DATA);
@@ -626,6 +622,7 @@ if(settings->leveldnti ==1) {
R_ = R_<65535.0f ? gamcurve[R_] : (Color::gammanf(R_/65535.f, gam)*32768.0f); R_ = R_<65535.0f ? gamcurve[R_] : (Color::gammanf(R_/65535.f, gam)*32768.0f);
G_ = G_<65535.0f ? gamcurve[G_] : (Color::gammanf(G_/65535.f, gam)*32768.0f); G_ = G_<65535.0f ? gamcurve[G_] : (Color::gammanf(G_/65535.f, gam)*32768.0f);
B_ = B_<65535.0f ? gamcurve[B_] : (Color::gammanf(B_/65535.f, gam)*32768.0f); B_ = B_<65535.0f ? gamcurve[B_] : (Color::gammanf(B_/65535.f, gam)*32768.0f);
//true conversion xyz=>Lab //true conversion xyz=>Lab
float L,a,b; float L,a,b;
float X,Y,Z; float X,Y,Z;
@@ -634,8 +631,15 @@ if(settings->leveldnti ==1) {
//convert to Lab //convert to Lab
Color::XYZ2Lab(X, Y, Z, L, a, b); Color::XYZ2Lab(X, Y, Z, L, a, b);
labdn->L[i1][j1] = L;
labdn->a[i1][j1] = a;
labdn->b[i1][j1] = b;
Lin[i1][j1] = L;
if(((i1|j1)&1) == 0) {
if(noiseLCurve) { if(noiseLCurve) {
float kN = lumcalc[i][j]; //with no gamma and take into account working profile float kN = lumcalc[i>>1][j>>1]; //with no gamma and take into account working profile
float epsi = 0.01f; float epsi = 0.01f;
if(kN<2.f) if(kN<2.f)
kN = 2.f;//avoid divided by zero kN = 2.f;//avoid divided by zero
@@ -644,24 +648,20 @@ if(settings->leveldnti ==1) {
float kinterm = epsi + noiseLCurve[xdivf(kN,15)*500.f]; float kinterm = epsi + noiseLCurve[xdivf(kN,15)*500.f];
float ki = kinterm*100.f; float ki = kinterm*100.f;
ki += noiseluma; ki += noiseluma;
noisevarlum[i1][j1] = SQR((ki/125.f)*(1.f+ki/25.f)); noisevarlum[i1>>1][j1>>1] = SQR((ki/125.f)*(1.f+ki/25.f));
} }
if(noiseCCurve) { if(noiseCCurve) {
float aN = acalc[i][j]; float aN = acalc[i>>1][j>>1];
float bN = bcalc[i][j]; float bN = bcalc[i>>1][j>>1];
float cN = sqrtf(SQR(aN)+SQR(bN)); float cN = sqrtf(SQR(aN)+SQR(bN));
if(cN < 100.f) if(cN < 100.f)
cN = 100.f;//avoid divided by zero cN = 100.f;//avoid divided by zero
float Cinterm = 1.f + ponderCC*4.f*noiseCCurve[cN/60.f];//C=f(C) float Cinterm = 1.f + ponderCC*4.f*noiseCCurve[cN/60.f];//C=f(C)
noisevarchrom[i1][j1] = max(noisevarab_b,noisevarab_r)*SQR(Cinterm); noisevarchrom[i1>>1][j1>>1] = max(noisevarab_b,noisevarab_r)*SQR(Cinterm);
}
} }
//end chroma //end chroma
labdn->L[i1][j1] = L;
labdn->a[i1][j1] = a;
labdn->b[i1][j1] = b;
Lin[i1][j1] = L;
} }
} }
} }
@@ -681,9 +681,10 @@ if(settings->leveldnti ==1) {
X = X<65535.0f ? gamcurve[X] : (Color::gamma((double)X/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f); X = X<65535.0f ? gamcurve[X] : (Color::gamma((double)X/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f);
Y = Y<65535.0f ? gamcurve[Y] : (Color::gamma((double)Y/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f); Y = Y<65535.0f ? gamcurve[Y] : (Color::gamma((double)Y/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f);
Z = Z<65535.0f ? gamcurve[Z] : (Color::gamma((double)Z/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f); Z = Z<65535.0f ? gamcurve[Z] : (Color::gamma((double)Z/65535.0, gam, gamthresh, gamslope, 1.0, 0.0)*32768.0f);
if(((i1|j1)&1) == 0) {
if(noiseLCurve) { if(noiseLCurve) {
// float noiseluma=(float) dnparams.luma; // float noiseluma=(float) dnparams.luma;
float kN = lumcalc[i][j]; float kN = lumcalc[i>>1][j>>1];
float epsi = 0.01f; float epsi = 0.01f;
if (kN<2.f) if (kN<2.f)
kN = 2.f; kN = 2.f;
@@ -692,17 +693,17 @@ if(settings->leveldnti ==1) {
float kinterm = epsi + noiseLCurve[xdivf(kN,15)*500.f]; float kinterm = epsi + noiseLCurve[xdivf(kN,15)*500.f];
float ki = kinterm*100.f; float ki = kinterm*100.f;
ki += noiseluma; ki += noiseluma;
noisevarlum[i1][j1] = SQR((ki/125.f)*(1.f+ki/25.f)); noisevarlum[i1>>1][j1>>1] = SQR((ki/125.f)*(1.f+ki/25.f));
} }
if(noiseCCurve) { if(noiseCCurve) {
float aN = acalc[i][j]; float aN = acalc[i>>1][j>>1];
float bN = bcalc[i][j]; float bN = bcalc[i>>1][j>>1];
float cN = sqrtf(SQR(aN)+SQR(bN)); float cN = sqrtf(SQR(aN)+SQR(bN));
if(cN < 100.f) if(cN < 100.f)
cN = 100.f;//avoid divided by zero cN = 100.f;//avoid divided by zero
float Cinterm = 1.f + ponderCC*4.f*noiseCCurve[cN/60.f]; float Cinterm = 1.f + ponderCC*4.f*noiseCCurve[cN/60.f];
noisevarchrom[i1][j1] = max(noisevarab_b,noisevarab_r)*SQR(Cinterm); noisevarchrom[i1>>1][j1>>1] = max(noisevarab_b,noisevarab_r)*SQR(Cinterm);
}
} }
//end chroma //end chroma
labdn->L[i1][j1] = Y; labdn->L[i1][j1] = Y;
@@ -746,6 +747,7 @@ if(settings->leveldnti ==1) {
//convert Lab //convert Lab
Color::XYZ2Lab(X, Y, Z, L, a, b); Color::XYZ2Lab(X, Y, Z, L, a, b);
float Llum,alum,blum; float Llum,alum,blum;
if(((i1|j1)&1) == 0) {
if(noiseLCurve || noiseCCurve) { if(noiseLCurve || noiseCCurve) {
float XL,YL,ZL; float XL,YL,ZL;
Color::rgbxyz(rLum,gLum,bLum,XL,YL,ZL,wp); Color::rgbxyz(rLum,gLum,bLum,XL,YL,ZL,wp);
@@ -755,14 +757,13 @@ if(settings->leveldnti ==1) {
if(noiseLCurve) { if(noiseLCurve) {
float kN = Llum; float kN = Llum;
float epsi=0.01f; float epsi=0.01f;
if(kN<2.f) kN=2.f; if(kN<2.f) kN=2.f;
if(kN>32768.f) kN=32768.f; if(kN>32768.f) kN=32768.f;
float kinterm=epsi + noiseLCurve[xdivf(kN,15)*500.f]; float kinterm=epsi + noiseLCurve[xdivf(kN,15)*500.f];
float ki=kinterm*100.f; float ki=kinterm*100.f;
ki+=noiseluma; ki+=noiseluma;
noiseluma += 1.f; noiseluma += 1.f;
noisevarlum[i1][j1]=SQR((ki/125.f)*(1.f+ki/25.f)); noisevarlum[i1>>1][j1>>1]=SQR((ki/125.f)*(1.f+ki/25.f));
} }
if(noiseCCurve) { if(noiseCCurve) {
float aN=alum; float aN=alum;
@@ -771,9 +772,9 @@ if(settings->leveldnti ==1) {
if(cN < 100.f) if(cN < 100.f)
cN=100.f;//avoid divided by zero ??? cN=100.f;//avoid divided by zero ???
float Cinterm=1.f + ponderCC*4.f*noiseCCurve[cN/60.f]; float Cinterm=1.f + ponderCC*4.f*noiseCCurve[cN/60.f];
noisevarchrom[i1][j1]=max(noisevarab_b,noisevarab_r)*SQR(Cinterm); noisevarchrom[i1>>1][j1>>1]=max(noisevarab_b,noisevarab_r)*SQR(Cinterm);
}
} }
labdn->L[i1][j1] = L; labdn->L[i1][j1] = L;
labdn->a[i1][j1] = a; labdn->a[i1][j1] = a;
labdn->b[i1][j1] = b; labdn->b[i1][j1] = b;
@@ -838,13 +839,18 @@ if(settings->leveldnti ==1) {
#pragma omp section #pragma omp section
#endif #endif
{ {
Ldecomp = new wavelet_decomposition (labdn->data, labdn->W, labdn->H, levwav/*maxlevels*/, 0/*subsampling*/ ); Ldecomp = new wavelet_decomposition (labdn->data, labdn->W, labdn->H, levwav/*maxlevels*/, 1/*subsampling*/ );
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp section #pragma omp section
#endif #endif
{ // only one section for both, because they are much faster then Ldecomp {
adecomp = new wavelet_decomposition (labdn->data+datalen, labdn->W, labdn->H,levwav, 1 ); adecomp = new wavelet_decomposition (labdn->data+datalen, labdn->W, labdn->H,levwav, 1 );
}
#ifdef _OPENMP
#pragma omp section
#endif
{
bdecomp = new wavelet_decomposition (labdn->data+2*datalen, labdn->W, labdn->H, levwav, 1 ); bdecomp = new wavelet_decomposition (labdn->data+2*datalen, labdn->W, labdn->H, levwav, 1 );
} }
} }
@@ -1231,10 +1237,6 @@ if(settings->leveldnti ==1) {
} }
//wavelet denoised L channel //wavelet denoised L channel
array2D<float> Lwavdn(width,height);
float * Lwavdnptr = Lwavdn;
memcpy (Lwavdnptr, labdn->data, width*height*sizeof(float));
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
// now do detail recovery using block DCT to detect // now do detail recovery using block DCT to detect
@@ -1269,21 +1271,19 @@ if(settings->leveldnti ==1) {
#else #else
int subThread = 0; int subThread = 0;
#endif #endif
AlignedBuffer<float> pBuf(width + TS + 2*blkrad*offset); float blurbuffer[TS*TS] ALIGNED64;
float * nbrwt = nbrwtArray[subThread];
float * Lblox = LbloxArray[subThread]; float * Lblox = LbloxArray[subThread];
float * fLblox = fLbloxArray[subThread];; float * fLblox = fLbloxArray[subThread];
float * blurbuffer = new float[TS*TS]; float pBuf[width + TS + 2*blkrad*offset] ALIGNED16;
float nbrwt[TS*TS] ALIGNED64;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp for #pragma omp for
#endif #endif
for (int vblk=0; vblk<numblox_H; vblk++) { for (int vblk=0; vblk<numblox_H; vblk++) {
//printf("vblock=%d",vblk);
int top = (vblk-blkrad)*offset; int top = (vblk-blkrad)*offset;
float * datarow = (float*)pBuf.data +blkrad*offset; float * datarow = pBuf +blkrad*offset;
//TODO: implement using AlignedBufferMP
for (int i=0/*, row=top*/; i<TS; i++/*, row++*/) { for (int i=0/*, row=top*/; i<TS; i++/*, row++*/) {
int row = top + i; int row = top + i;
int rr = row; int rr = row;
@@ -1294,7 +1294,7 @@ if(settings->leveldnti ==1) {
} }
for (int j=0; j<labdn->W; j++) { for (int j=0; j<labdn->W; j++) {
datarow[j] = (Lin[rr][j]-Lwavdn[rr][j]); datarow[j] = (Lin[rr][j]-labdn->L[rr][j]);
} }
for (int j=-blkrad*offset; j<0; j++) { for (int j=-blkrad*offset; j<0; j++) {
@@ -1305,7 +1305,6 @@ if(settings->leveldnti ==1) {
}//now we have a padded data row }//now we have a padded data row
//now fill this row of the blocks with Lab high pass data //now fill this row of the blocks with Lab high pass data
//OMP here does not add speed, better handled on the outside loop
for (int hblk=0; hblk<numblox_W; hblk++) { for (int hblk=0; hblk<numblox_W; hblk++) {
int left = (hblk-blkrad)*offset; int left = (hblk-blkrad)*offset;
int indx = (hblk)*TS;//index of block in malloc int indx = (hblk)*TS;//index of block in malloc
@@ -1350,7 +1349,6 @@ if(settings->leveldnti ==1) {
}//end of vertical block loop }//end of vertical block loop
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
delete [] blurbuffer;
} }
} }
@@ -1360,7 +1358,7 @@ if(settings->leveldnti ==1) {
//may want to include masking threshold for large hipass data to preserve edges/detail //may want to include masking threshold for large hipass data to preserve edges/detail
float hpdn = Ldetail[i][j]/totwt[i][j];//note that labdn initially stores the denoised hipass data float hpdn = Ldetail[i][j]/totwt[i][j];//note that labdn initially stores the denoised hipass data
labdn->L[i][j] = Lwavdn[i][j] + hpdn; labdn->L[i][j] += hpdn;
} }
} }
@@ -1369,8 +1367,8 @@ if(settings->leveldnti ==1) {
// transform denoised "Lab" to output RGB // transform denoised "Lab" to output RGB
//calculate mask for feathering output tile overlaps //calculate mask for feathering output tile overlaps
float * Vmask = new float [height+1]; float Vmask[height+1] ALIGNED16;
float * Hmask = new float [width+1]; float Hmask[width+1] ALIGNED16;
for (int i=0; i<height; i++) { for (int i=0; i<height; i++) {
Vmask[i] = 1; Vmask[i] = 1;
@@ -1383,7 +1381,7 @@ if(settings->leveldnti ==1) {
} }
for (int i=0; i<overlap; i++) { for (int i=0; i<overlap; i++) {
float mask = SQR(sin((M_PI*i)/(2*overlap))); float mask = SQR(xsinf((M_PI*i)/(2*overlap)));
if (tiletop>0) Vmask[i] = mask; if (tiletop>0) Vmask[i] = mask;
if (tilebottom<imheight) Vmask[height-i] = mask; if (tilebottom<imheight) Vmask[height-i] = mask;
if (tileleft>0) Hmask[i] = mask/newGain; if (tileleft>0) Hmask[i] = mask/newGain;
@@ -1514,28 +1512,23 @@ if(settings->leveldnti ==1) {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
delete labdn; delete labdn;
for (int i=0; i<height; i++)
delete [] noisevarlum[i];
delete [] noisevarlum;
delete [] mad_LL; delete [] mad_LL;
for (int i=0; i<height; i++)
delete [] noisevarchrom[i];
delete [] noisevarchrom;
delete [] mad_aa; delete [] mad_aa;
delete [] mad_bb; delete [] mad_bb;
delete[] Vmask;
delete[] Hmask;
}//end of tile row }//end of tile row
}//end of tile loop }//end of tile loop
for (int i=0; i<(tileheight+1)/2; i++)
delete [] noisevarlum[i];
delete [] noisevarlum;
for (int i=0; i<(tileheight+1)/2; i++)
delete [] noisevarchrom[i];
delete [] noisevarchrom;
} }
for(int i=0;i<denoiseNestedLevels*numthreads;i++) { for(int i=0;i<denoiseNestedLevels*numthreads;i++) {
fftwf_free(LbloxArray[i]); fftwf_free(LbloxArray[i]);
fftwf_free(fLbloxArray[i]); fftwf_free(fLbloxArray[i]);
delete [] nbrwtArray[i];
} }
#ifdef _OPENMP #ifdef _OPENMP
@@ -1733,13 +1726,13 @@ for(int iteration=1;iteration<=dnparams.passes;iteration++){
} }
//end median //end median
if(noiseLCurve || noiseCCurve) { if(noiseLCurve || noiseCCurve) {
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
delete [] lumcalc[i]; delete [] lumcalc[i];
delete [] lumcalc; delete [] lumcalc;
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
delete [] acalc[i]; delete [] acalc[i];
delete [] acalc; delete [] acalc;
for (int i=0; i<hei; i++) for (int i=0; i<(hei+1)/2; i++)
delete [] bcalc[i]; delete [] bcalc[i];
delete [] bcalc; delete [] bcalc;
@@ -1771,7 +1764,7 @@ SSEFUNCTION void ImProcFunctions::RGBtile_denoise (float * fLblox, int hblproc,
__m128 noisevar_Ldetailv = _mm_set1_ps( noisevar_Ldetail ); __m128 noisevar_Ldetailv = _mm_set1_ps( noisevar_Ldetail );
__m128 onev = _mm_set1_ps( 1.0f ); __m128 onev = _mm_set1_ps( 1.0f );
for (int n=0; n<TS*TS; n+=4) { //for DCT for (int n=0; n<TS*TS; n+=4) { //for DCT
tempv = onev - xexpf( -SQRV( LVFU(nbrwt[n]))/noisevar_Ldetailv); tempv = onev - xexpf( -SQRV( LVF(nbrwt[n]))/noisevar_Ldetailv);
_mm_storeu_ps( &fLblox[blkstart+n], LVFU(fLblox[blkstart+n]) * tempv ); _mm_storeu_ps( &fLblox[blkstart+n], LVFU(fLblox[blkstart+n]) * tempv );
}//output neighbor averaged result }//output neighbor averaged result
#else #else
@@ -1960,29 +1953,24 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
float madL[8][3], mada[8][3], madb[8][3]; float madL[8][3], mada[8][3], madb[8][3];
int maxWL = 0, maxHL = 0, maxWab = 0, maxHab = 0; int maxWL = 0, maxHL = 0;
for (int lvl=0; lvl<maxlvl; lvl++) { for (int lvl=0; lvl<maxlvl; lvl++) {
if(WaveletCoeffs_L.level_W(lvl) > maxWL) if(WaveletCoeffs_L.level_W(lvl) > maxWL)
maxWL = WaveletCoeffs_L.level_W(lvl); maxWL = WaveletCoeffs_L.level_W(lvl);
if(WaveletCoeffs_L.level_H(lvl) > maxHL) if(WaveletCoeffs_L.level_H(lvl) > maxHL)
maxHL = WaveletCoeffs_L.level_H(lvl); maxHL = WaveletCoeffs_L.level_H(lvl);
if(WaveletCoeffs_a.level_W(lvl) > maxWab)
maxWab = WaveletCoeffs_a.level_W(lvl);
if(WaveletCoeffs_a.level_H(lvl) > maxHab)
maxHab = WaveletCoeffs_a.level_H(lvl);
} }
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel num_threads(denoiseNestedLevels) if(denoiseNestedLevels>1) #pragma omp parallel num_threads(denoiseNestedLevels) if(denoiseNestedLevels>1)
#endif #endif
{ {
float *buffer[6]; float *buffer[5];
buffer[0] = new float[maxWL*maxHL+32]; buffer[0] = new float[maxWL*maxHL+32];
buffer[1] = new float[maxWL*maxHL+64]; buffer[1] = new float[maxWL*maxHL+64];
buffer[2] = new float[maxWL*maxHL+96]; buffer[2] = new float[maxWL*maxHL+96];
buffer[3] = new float[maxWab*maxHab+128]; buffer[3] = new float[maxWL*maxHL+128];
buffer[4] = new float[maxWL*maxHL+160]; buffer[4] = new float[maxWL*maxHL+160];
buffer[5] = new float[maxWL*maxHL+192];
#ifdef _OPENMP #ifdef _OPENMP
@@ -1994,9 +1982,6 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
int Wlvl_L = WaveletCoeffs_L.level_W(lvl); int Wlvl_L = WaveletCoeffs_L.level_W(lvl);
int Hlvl_L = WaveletCoeffs_L.level_H(lvl); int Hlvl_L = WaveletCoeffs_L.level_H(lvl);
if(Wlvl_L!=width) Wlvl_L=width;
if(Hlvl_L!=height) Hlvl_L=height;
int Wlvl_ab = WaveletCoeffs_a.level_W(lvl); int Wlvl_ab = WaveletCoeffs_a.level_W(lvl);
int Hlvl_ab = WaveletCoeffs_a.level_H(lvl); int Hlvl_ab = WaveletCoeffs_a.level_H(lvl);
@@ -2024,9 +2009,6 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
int Wlvl_L = WaveletCoeffs_L.level_W(lvl); int Wlvl_L = WaveletCoeffs_L.level_W(lvl);
int Hlvl_L = WaveletCoeffs_L.level_H(lvl); int Hlvl_L = WaveletCoeffs_L.level_H(lvl);
if(Wlvl_L!=width) Wlvl_L=width;
if(Hlvl_L!=height) Hlvl_L=height;
int Wlvl_ab = WaveletCoeffs_a.level_W(lvl); int Wlvl_ab = WaveletCoeffs_a.level_W(lvl);
int Hlvl_ab = WaveletCoeffs_a.level_H(lvl); int Hlvl_ab = WaveletCoeffs_a.level_H(lvl);
@@ -2044,8 +2026,7 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
} else { } else {
//simple wavelet shrinkage //simple wavelet shrinkage
float * sfave = buffer[0]+32; float * sfave = buffer[0]+32;
float * sfaved = buffer[4]+160; float * sfaved = buffer[3]+128;
float * WavCoeffsLtemp = buffer[3]+128;
float * blurBuffer = buffer[1]+64; float * blurBuffer = buffer[1]+64;
for (int dir=1; dir<4; dir++) { for (int dir=1; dir<4; dir++) {
float mad_Lr = madL[lvl][dir-1]; float mad_Lr = madL[lvl][dir-1];
@@ -2070,48 +2051,42 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
} }
} }
if (noisevar_abr>0.001f || noisevar_abb>0.001f) { if (noisevar_abr>0.001f || noisevar_abb>0.001f) {
for(int i=0;i<Hlvl_ab;i++)
for(int j=0;j<Wlvl_ab;j++)
WavCoeffsLtemp[i*Wlvl_ab+j] = WavCoeffs_L[dir][((i*skip_L)/skip_ab)*Wlvl_L + ((j*skip_L)/skip_ab)];
#ifdef __SSE2__ #ifdef __SSE2__
int j;
__m128 onev = _mm_set1_ps(1.f); __m128 onev = _mm_set1_ps(1.f);
__m128 rmad_Lm9v = onev / _mm_set1_ps(mad_Lr * 9.f); __m128 rmad_Lm9v = onev / _mm_set1_ps(mad_Lr * 9.f);
__m128 mad_av; __m128 mad_av;
__m128 mad_bv; __m128 mad_bv;
__m128 mag_Lv, mag_av, mag_bv; __m128 mag_Lv, mag_av, mag_bv;
__m128 tempav, tempbv; __m128 tempav, tempbv;
for (int i=0; i<Hlvl_ab; i++) { int coeffloc_ab;
int coeffloc_ab = i*Wlvl_ab; for (coeffloc_ab=0; coeffloc_ab<Hlvl_ab*Wlvl_ab-3; coeffloc_ab+=4) {
for (j=0; j<Wlvl_ab-3; j+=4, coeffloc_ab+=4) {
mad_av = LVFU(mad_aa[coeffloc_ab]); mad_av = LVFU(mad_aa[coeffloc_ab]);
mad_bv = LVFU(mad_bb[coeffloc_ab]); mad_bv = LVFU(mad_bb[coeffloc_ab]);
tempav = LVFU(WavCoeffs_a[dir][coeffloc_ab]); tempav = LVFU(WavCoeffs_a[dir][coeffloc_ab]);
tempbv = LVFU(WavCoeffs_b[dir][coeffloc_ab]); tempbv = LVFU(WavCoeffs_b[dir][coeffloc_ab]);
mag_Lv = LVFU(WavCoeffsLtemp[coeffloc_ab]); mag_Lv = LVFU(WavCoeffs_L[dir][coeffloc_ab]);
mag_av = SQRV(tempav); mag_av = SQRV(tempav);
mag_bv = SQRV(tempbv); mag_bv = SQRV(tempbv);
mag_Lv = SQRV(mag_Lv) * rmad_Lm9v; mag_Lv = SQRV(mag_Lv) * rmad_Lm9v;
_mm_storeu_ps(&WavCoeffs_a[dir][coeffloc_ab], tempav * SQRV((onev-xexpf(-(mag_av/mad_av)-(mag_Lv))))); _mm_storeu_ps(&WavCoeffs_a[dir][coeffloc_ab], tempav * SQRV((onev-xexpf(-(mag_av/mad_av)-(mag_Lv)))));
_mm_storeu_ps(&WavCoeffs_b[dir][coeffloc_ab], tempbv * SQRV((onev-xexpf(-(mag_bv/mad_bv)-(mag_Lv))))); _mm_storeu_ps(&WavCoeffs_b[dir][coeffloc_ab], tempbv * SQRV((onev-xexpf(-(mag_bv/mad_bv)-(mag_Lv)))));
} }
for (; j<Wlvl_ab; j++,coeffloc_ab++) { // few remaining pixels
float mag_L = SQR(WavCoeffsLtemp[coeffloc_ab ]); for (; coeffloc_ab<Hlvl_ab*Wlvl_ab; coeffloc_ab++) {
float mag_L = SQR(WavCoeffs_L[dir][coeffloc_ab ]);
float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab]); float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab]);
float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab]); float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab]);
WavCoeffs_a[dir][coeffloc_ab] *= SQR(1.f-xexpf(-(mag_a/mad_aa[coeffloc_ab])-(mag_L/(9.f*mad_Lr)))/*satfactor_a*/); WavCoeffs_a[dir][coeffloc_ab] *= SQR(1.f-xexpf(-(mag_a/mad_aa[coeffloc_ab])-(mag_L/(9.f*mad_Lr)))/*satfactor_a*/);
WavCoeffs_b[dir][coeffloc_ab] *= SQR(1.f-xexpf(-(mag_b/mad_bb[coeffloc_ab])-(mag_L/(9.f*mad_Lr)))/*satfactor_b*/); WavCoeffs_b[dir][coeffloc_ab] *= SQR(1.f-xexpf(-(mag_b/mad_bb[coeffloc_ab])-(mag_L/(9.f*mad_Lr)))/*satfactor_b*/);
}
}//now chrominance coefficients are denoised }//now chrominance coefficients are denoised
#else #else
for (int i=0; i<Hlvl_ab; i++) { for (int i=0; i<Hlvl_ab; i++) {
for (int j=0; j<Wlvl_ab; j++) { for (int j=0; j<Wlvl_ab; j++) {
int coeffloc_ab = i*Wlvl_ab+j; int coeffloc_ab = i*Wlvl_ab+j;
float mag_L = SQR(WavCoeffsLtemp[coeffloc_ab ])+eps; float mag_L = SQR(WavCoeffs_L[dir][coeffloc_ab ])+eps;
float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab])+eps; float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab])+eps;
float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab])+eps; float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab])+eps;
@@ -2142,24 +2117,20 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
} }
} }
#ifdef __SSE2__ #ifdef __SSE2__
int j;
__m128 mad_Lv; __m128 mad_Lv;
__m128 ninev = _mm_set1_ps( 9.0f ); __m128 ninev = _mm_set1_ps( 9.0f );
__m128 epsv = _mm_set1_ps(eps); __m128 epsv = _mm_set1_ps(eps);
__m128 mag_Lv; __m128 mag_Lv;
for (int i=0; i<Hlvl_L; i++) { int coeffloc_L;
int coeffloc_L = i*Wlvl_L; for (coeffloc_L=0; coeffloc_L<Hlvl_L*Wlvl_L-3; coeffloc_L+=4) {
for (j=0; j<Wlvl_L-3; j+=4,coeffloc_L+=4) {
mad_Lv = LVFU(mad_LL[coeffloc_L]); mad_Lv = LVFU(mad_LL[coeffloc_L]);
mag_Lv = SQRV(LVFU(WavCoeffs_L[dir][coeffloc_L])); mag_Lv = SQRV(LVFU(WavCoeffs_L[dir][coeffloc_L]));
_mm_storeu_ps(&sfave[coeffloc_L], mag_Lv / ( mag_Lv + mad_Lv * xexpf(-mag_Lv/(mad_Lv*ninev) )+ epsv)); _mm_storeu_ps(&sfave[coeffloc_L], mag_Lv / ( mag_Lv + mad_Lv * xexpf(-mag_Lv/(mad_Lv*ninev) )+ epsv));
} }
for (; j<Wlvl_L; j++, coeffloc_L++) { for (; coeffloc_L<Hlvl_L*Wlvl_L; coeffloc_L++) {
float mag_L = SQR(WavCoeffs_L[dir][coeffloc_L]); float mag_L = SQR(WavCoeffs_L[dir][coeffloc_L]);
sfave[coeffloc_L] = mag_L/(mag_L+mad_LL[coeffloc_L]*xexpf(-mag_L/(9.f*mad_LL[coeffloc_L]))+eps); sfave[coeffloc_L] = mag_L/(mag_L+mad_LL[coeffloc_L]*xexpf(-mag_L/(9.f*mad_LL[coeffloc_L]))+eps);
} }
}
#else #else
for (int i=0; i<Hlvl_L; i++) for (int i=0; i<Hlvl_L; i++)
for (int j=0; j<Wlvl_L; j++) { for (int j=0; j<Wlvl_L; j++) {
@@ -2173,20 +2144,18 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
#ifdef __SSE2__ #ifdef __SSE2__
__m128 sfavev; __m128 sfavev;
__m128 sf_Lv; __m128 sf_Lv;
for (int i=0; i<Hlvl_L; i++) { for (coeffloc_L=0; coeffloc_L<Hlvl_L*Wlvl_L-3; coeffloc_L+=4) {
int coeffloc_L = i*Wlvl_L;
for (j=0; j<Wlvl_L-3; j+=4,coeffloc_L+=4) {
sfavev = LVFU(sfaved[coeffloc_L]); sfavev = LVFU(sfaved[coeffloc_L]);
sf_Lv = LVFU(sfave[coeffloc_L]); sf_Lv = LVFU(sfave[coeffloc_L]);
_mm_storeu_ps(&WavCoeffs_L[dir][coeffloc_L], LVFU(WavCoeffs_L[dir][coeffloc_L]) * (SQRV(sfavev)+SQRV(sf_Lv))/(sfavev+sf_Lv+epsv)); _mm_storeu_ps(&WavCoeffs_L[dir][coeffloc_L], LVFU(WavCoeffs_L[dir][coeffloc_L]) * (SQRV(sfavev)+SQRV(sf_Lv))/(sfavev+sf_Lv+epsv));
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
}//now luminance coeffs are denoised }
for (; j<Wlvl_L; j++,coeffloc_L++) { // few remaining pixels
for (; coeffloc_L<Hlvl_L*Wlvl_L; coeffloc_L++) {
float sf_L = sfave[coeffloc_L]; float sf_L = sfave[coeffloc_L];
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
WavCoeffs_L[dir][coeffloc_L] *= (SQR(sfaved[coeffloc_L])+SQR(sf_L))/(sfaved[coeffloc_L]+sf_L+eps); WavCoeffs_L[dir][coeffloc_L] *= (SQR(sfaved[coeffloc_L])+SQR(sf_L))/(sfaved[coeffloc_L]+sf_L+eps);
}//now luminance coeffs are denoised }//now luminance coeffs are denoised
}
#else #else
for (int i=0; i<Hlvl_L; i++) for (int i=0; i<Hlvl_L; i++)
for (int j=0; j<Wlvl_L; j++) { for (int j=0; j<Wlvl_L; j++) {
@@ -2194,14 +2163,13 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
float sf_L = sfave[coeffloc_L]; float sf_L = sfave[coeffloc_L];
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
WavCoeffs_L[dir][coeffloc_L] *= (SQR(sfaved[coeffloc_L])+SQR(sf_L))/(sfaved[coeffloc_L]+sf_L+eps); WavCoeffs_L[dir][coeffloc_L] *= (SQR(sfaved[coeffloc_L])+SQR(sf_L))/(sfaved[coeffloc_L]+sf_L+eps);
}//now luminance coeffs are denoised }//now luminance coeffs are denoised
#endif #endif
} }
} }
} }
} }
for(int i=5;i>=0;i--) for(int i=4;i>=0;i--)
delete [] buffer[i]; delete [] buffer[i];
} }
@@ -2214,16 +2182,12 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
{ {
int maxlvl = WaveletCoeffs_L.maxlevel(); int maxlvl = WaveletCoeffs_L.maxlevel();
int maxWL = 0, maxHL = 0, maxWab = 0, maxHab = 0; int maxWL = 0, maxHL = 0;
for (int lvl=0; lvl<maxlvl; lvl++) { for (int lvl=0; lvl<maxlvl; lvl++) {
if(WaveletCoeffs_L.level_W(lvl) > maxWL) if(WaveletCoeffs_L.level_W(lvl) > maxWL)
maxWL = WaveletCoeffs_L.level_W(lvl); maxWL = WaveletCoeffs_L.level_W(lvl);
if(WaveletCoeffs_L.level_H(lvl) > maxHL) if(WaveletCoeffs_L.level_H(lvl) > maxHL)
maxHL = WaveletCoeffs_L.level_H(lvl); maxHL = WaveletCoeffs_L.level_H(lvl);
if(WaveletCoeffs_a.level_W(lvl) > maxWab)
maxWab = WaveletCoeffs_a.level_W(lvl);
if(WaveletCoeffs_a.level_H(lvl) > maxHab)
maxHab = WaveletCoeffs_a.level_H(lvl);
} }
@@ -2231,13 +2195,12 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
#pragma omp parallel num_threads(denoiseNestedLevels) if(denoiseNestedLevels>1) #pragma omp parallel num_threads(denoiseNestedLevels) if(denoiseNestedLevels>1)
#endif #endif
{ {
float *buffer[6]; float *buffer[5];
buffer[0] = new float[maxWL*maxHL+32]; buffer[0] = new float[maxWL*maxHL+32];
buffer[1] = new float[maxWL*maxHL+64]; buffer[1] = new float[maxWL*maxHL+64];
buffer[2] = new float[maxWL*maxHL+96]; buffer[2] = new float[maxWL*maxHL+96];
buffer[3] = new float[maxWab*maxHab+128]; buffer[3] = new float[maxWL*maxHL+128];
buffer[4] = new float[maxWL*maxHL+160]; buffer[4] = new float[maxWL*maxHL+160];
buffer[5] = new float[maxWL*maxHL+192];
#ifdef _OPENMP #ifdef _OPENMP
@@ -2268,7 +2231,7 @@ SSEFUNCTION void ImProcFunctions::WaveletDenoiseAll_BiShrink(wavelet_decompositi
skip_L, skip_ab, noisevar_L, noisevarlum, noisevarchrom, width, height, mad_LL, mad_aa, mad_bb, noisevar_abr, noisevar_abb, noi, noiseLCurve, noiseCCurve, chaut, redaut, blueaut, maxredaut, maxblueaut, callby, autoch, perf); skip_L, skip_ab, noisevar_L, noisevarlum, noisevarchrom, width, height, mad_LL, mad_aa, mad_bb, noisevar_abr, noisevar_abb, noi, noiseLCurve, noiseCCurve, chaut, redaut, blueaut, maxredaut, maxblueaut, callby, autoch, perf);
} }
for(int i=5;i>=0;i--) for(int i=4;i>=0;i--)
delete [] buffer[i]; delete [] buffer[i];
} }
} }
@@ -2282,18 +2245,17 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
{ {
//simple wavelet shrinkage //simple wavelet shrinkage
const float eps = 0.01f; const float eps = 0.01f;
W_L = width; if(autoch && noisevar_abr <=0.001f)
H_L = height; noisevar_abr=0.02f;
if(autoch && noisevar_abr <=0.001f) noisevar_abr=0.02f; if(autoch && noisevar_abb <=0.001f)
if(autoch && noisevar_abb <=0.001f) noisevar_abb=0.02f; noisevar_abb=0.02f;
float * sfavea = buffer[0]+32; float * sfavea = buffer[0]+32;
float * sfaveb = buffer[1]+64; float * sfaveb = buffer[1]+64;
float * sfavead = buffer[4]+160; float * sfavead = buffer[3]+128;
float * sfavebd = buffer[5]+192; float * sfavebd = buffer[4]+160;
float * sfave = sfavea; // we can safely reuse sfavea here, because they are not used together float * sfave = sfavea; // we can safely reuse sfavea here, because they are not used together
float * sfaved = sfavead; // we can safely reuse sfavead here, because they are not used together float * sfaved = sfavead; // we can safely reuse sfavead here, because they are not used together
float * WavCoeffsLtemp = buffer[3]+128;
float * blurBuffer = buffer[2]+96; float * blurBuffer = buffer[2]+96;
for (int dir=1; dir<4; dir++) { for (int dir=1; dir<4; dir++) {
@@ -2332,39 +2294,31 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
} }
if (noisevar_abr>0.001f || noisevar_abb>0.001f ) { if (noisevar_abr>0.001f || noisevar_abb>0.001f ) {
for(int i=0;i<H_ab;i++)
for(int j=0;j<W_ab;j++)
WavCoeffsLtemp[i*W_ab+j] = WavCoeffs_L[dir][((i*skip_L)/skip_ab)*W_L + ((j*skip_L)/skip_ab)];
#ifdef __SSE2__ #ifdef __SSE2__
int j;
__m128 onev = _mm_set1_ps(1.f); __m128 onev = _mm_set1_ps(1.f);
__m128 rmadLm9v = onev / _mm_set1_ps(madL * 9.f); __m128 rmadLm9v = onev / _mm_set1_ps(madL * 9.f);
__m128 mad_av ; __m128 mad_av ;
__m128 mad_bv; __m128 mad_bv;
__m128 mag_Lv, mag_av, mag_bv; __m128 mag_Lv, mag_av, mag_bv;
for (int i=0; i<H_ab; i++) { int coeffloc_ab;
int coeffloc_ab = i*W_ab; for (coeffloc_ab=0; coeffloc_ab<H_ab*W_ab-3; coeffloc_ab+=4) {
for (j=0; j<W_ab-3; j+=4, coeffloc_ab+=4) {
mad_av = LVFU(mad_aa[coeffloc_ab]); mad_av = LVFU(mad_aa[coeffloc_ab]);
mad_bv = LVFU(mad_bb[coeffloc_ab]); mad_bv = LVFU(mad_bb[coeffloc_ab]);
mag_Lv = LVFU(WavCoeffsLtemp[coeffloc_ab]); mag_Lv = LVFU(WavCoeffs_L[dir][coeffloc_ab]);
mag_av = SQRV(LVFU(WavCoeffs_a[dir][coeffloc_ab])); mag_av = SQRV(LVFU(WavCoeffs_a[dir][coeffloc_ab]));
mag_bv = SQRV(LVFU(WavCoeffs_b[dir][coeffloc_ab])); mag_bv = SQRV(LVFU(WavCoeffs_b[dir][coeffloc_ab]));
mag_Lv = (SQRV(mag_Lv)) * rmadLm9v; mag_Lv = (SQRV(mag_Lv)) * rmadLm9v;
_mm_storeu_ps(&sfavea[coeffloc_ab], (onev-xexpf(-(mag_av/mad_av)-(mag_Lv)))); _mm_storeu_ps(&sfavea[coeffloc_ab], (onev-xexpf(-(mag_av/mad_av)-(mag_Lv))));
_mm_storeu_ps(&sfaveb[coeffloc_ab], (onev-xexpf(-(mag_bv/mad_bv)-(mag_Lv)))); _mm_storeu_ps(&sfaveb[coeffloc_ab], (onev-xexpf(-(mag_bv/mad_bv)-(mag_Lv))));
} }
for (; j<W_ab; j++,coeffloc_ab++) { // few remaining pixels
float mag_L = SQR(WavCoeffsLtemp[coeffloc_ab]); for (; coeffloc_ab<H_ab*W_ab; coeffloc_ab++) {
float mag_L = SQR(WavCoeffs_L[dir][coeffloc_ab]);
float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab]); float mag_a = SQR(WavCoeffs_a[dir][coeffloc_ab]);
float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab]); float mag_b = SQR(WavCoeffs_b[dir][coeffloc_ab]);
sfavea[coeffloc_ab] = (1.f-xexpf(-(mag_a/mad_aa[coeffloc_ab])-(mag_L/(9.f*madL)))); sfavea[coeffloc_ab] = (1.f-xexpf(-(mag_a/mad_aa[coeffloc_ab])-(mag_L/(9.f*madL))));
sfaveb[coeffloc_ab] = (1.f-xexpf(-(mag_b/mad_bb[coeffloc_ab])-(mag_L/(9.f*madL)))); sfaveb[coeffloc_ab] = (1.f-xexpf(-(mag_b/mad_bb[coeffloc_ab])-(mag_L/(9.f*madL))));
}
}//now chrominance coefficients are denoised }//now chrominance coefficients are denoised
#else #else
@@ -2388,9 +2342,7 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
__m128 epsv = _mm_set1_ps(eps); __m128 epsv = _mm_set1_ps(eps);
__m128 sfav, sfbv; __m128 sfav, sfbv;
__m128 sfaveav, sfavebv; __m128 sfaveav, sfavebv;
for (int i=0; i<H_ab; i++) { for (coeffloc_ab=0; coeffloc_ab<H_ab*W_ab-3; coeffloc_ab+=4) {
int coeffloc_ab = i*W_ab;
for (j=0; j<W_ab-3; j+=4,coeffloc_ab+=4) {
sfav = LVFU(sfavea[coeffloc_ab]); sfav = LVFU(sfavea[coeffloc_ab]);
sfbv = LVFU(sfaveb[coeffloc_ab]); sfbv = LVFU(sfaveb[coeffloc_ab]);
sfaveav = LVFU(sfavead[coeffloc_ab]); sfaveav = LVFU(sfavead[coeffloc_ab]);
@@ -2399,9 +2351,9 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
_mm_storeu_ps( &WavCoeffs_a[dir][coeffloc_ab], LVFU(WavCoeffs_a[dir][coeffloc_ab]) * (SQRV(sfaveav)+SQRV(sfav))/(sfaveav+sfav+epsv)); _mm_storeu_ps( &WavCoeffs_a[dir][coeffloc_ab], LVFU(WavCoeffs_a[dir][coeffloc_ab]) * (SQRV(sfaveav)+SQRV(sfav))/(sfaveav+sfav+epsv));
_mm_storeu_ps( &WavCoeffs_b[dir][coeffloc_ab], LVFU(WavCoeffs_b[dir][coeffloc_ab]) * (SQRV(sfavebv)+SQRV(sfbv))/(sfavebv+sfbv+epsv)); _mm_storeu_ps( &WavCoeffs_b[dir][coeffloc_ab], LVFU(WavCoeffs_b[dir][coeffloc_ab]) * (SQRV(sfavebv)+SQRV(sfbv))/(sfavebv+sfbv+epsv));
}
}//now chrominance coefficients are denoised // few remaining pixels
for (; j<W_ab; j++,coeffloc_ab++) { for (; coeffloc_ab<H_ab*W_ab; coeffloc_ab++) {
//modification Jacques feb 2013 //modification Jacques feb 2013
float sfa = sfavea[coeffloc_ab]; float sfa = sfavea[coeffloc_ab];
float sfb = sfaveb[coeffloc_ab]; float sfb = sfaveb[coeffloc_ab];
@@ -2409,9 +2361,7 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
WavCoeffs_a[dir][coeffloc_ab] *= (SQR(sfavead[coeffloc_ab])+SQR(sfa))/(sfavead[coeffloc_ab]+sfa+eps); WavCoeffs_a[dir][coeffloc_ab] *= (SQR(sfavead[coeffloc_ab])+SQR(sfa))/(sfavead[coeffloc_ab]+sfa+eps);
WavCoeffs_b[dir][coeffloc_ab] *= (SQR(sfavebd[coeffloc_ab])+SQR(sfb))/(sfavebd[coeffloc_ab]+sfb+eps); WavCoeffs_b[dir][coeffloc_ab] *= (SQR(sfavebd[coeffloc_ab])+SQR(sfb))/(sfavebd[coeffloc_ab]+sfb+eps);
}//now chrominance coefficients are denoised }//now chrominance coefficients are denoised
}
#else #else
for (int i=0; i<H_ab; i++) { for (int i=0; i<H_ab; i++) {
for (int j=0; j<W_ab; j++) { for (int j=0; j<W_ab; j++) {
@@ -2422,7 +2372,6 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
WavCoeffs_a[dir][coeffloc_ab] *= (SQR(sfavead[coeffloc_ab])+SQR(sfa))/(sfavead[coeffloc_ab]+sfa+eps); WavCoeffs_a[dir][coeffloc_ab] *= (SQR(sfavead[coeffloc_ab])+SQR(sfa))/(sfavead[coeffloc_ab]+sfa+eps);
WavCoeffs_b[dir][coeffloc_ab] *= (SQR(sfavebd[coeffloc_ab])+SQR(sfb))/(sfavebd[coeffloc_ab]+sfb+eps); WavCoeffs_b[dir][coeffloc_ab] *= (SQR(sfavebd[coeffloc_ab])+SQR(sfb))/(sfavebd[coeffloc_ab]+sfb+eps);
}//now chrominance coefficients are denoised }//now chrominance coefficients are denoised
} }
#endif #endif
@@ -2455,6 +2404,7 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
magv = SQRV(LVFU(WavCoeffs_L[dir][i])); magv = SQRV(LVFU(WavCoeffs_L[dir][i]));
_mm_storeu_ps( &sfave[i], magv / (magv + mad_Lv*xexpf(-magv/(ninev * mad_Lv)) + epsv)); _mm_storeu_ps( &sfave[i], magv / (magv + mad_Lv*xexpf(-magv/(ninev * mad_Lv)) + epsv));
} }
// few remaining pixels
for (; i<W_L*H_L; i++) { for (; i<W_L*H_L; i++) {
float mag = SQR(WavCoeffs_L[dir][i]); float mag = SQR(WavCoeffs_L[dir][i]);
sfave[i] = mag/(mag+mad_LL[i]*xexpf(-mag/(9*mad_LL[i]))+eps); sfave[i] = mag/(mag+mad_LL[i]*xexpf(-mag/(9*mad_LL[i]))+eps);
@@ -2471,12 +2421,13 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
#ifdef __SSE2__ #ifdef __SSE2__
__m128 sfv; __m128 sfv;
for (int i=0; i<W_L*H_L-3; i+=4) { for (i=0; i<W_L*H_L-3; i+=4) {
sfv = LVFU(sfave[i]); sfv = LVFU(sfave[i]);
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
_mm_storeu_ps( &WavCoeffs_L[dir][i], _mm_loadu_ps( &WavCoeffs_L[dir][i]) * (SQRV( LVFU(sfaved[i] )) + SQRV(sfv)) / (LVFU(sfaved[i])+sfv+epsv)); _mm_storeu_ps( &WavCoeffs_L[dir][i], _mm_loadu_ps( &WavCoeffs_L[dir][i]) * (SQRV( LVFU(sfaved[i] )) + SQRV(sfv)) / (LVFU(sfaved[i])+sfv+epsv));
} }
for (int i=(W_L*H_L)-((W_L*H_L)%4); i<W_L*H_L; i++) { // few remaining pixels
for (; i<W_L*H_L; i++) {
float sf = sfave[i]; float sf = sfave[i];
//use smoothed shrinkage unless local shrinkage is much less //use smoothed shrinkage unless local shrinkage is much less
@@ -2493,10 +2444,7 @@ SSEFUNCTION void ImProcFunctions::ShrinkAll(float ** WavCoeffs_L, float ** WavCo
}//now luminance coefficients are denoised }//now luminance coefficients are denoised
#endif #endif
} }
} }
} }

38
rtengine/boxblur.h
View File

@@ -708,20 +708,25 @@ template<class T, class A> SSEFUNCTION void boxabsblur (T* src, A* dst, int radx
//horizontal blur //horizontal blur
for (int row = 0; row < H; row++) { for (int row = 0; row < H; row++) {
int len = radx + 1; int len = radx + 1;
temp[row*W+0] = fabsf((float)src[row*W+0]); float tempval = fabsf((float)src[row*W+0]);
for (int j=1; j<=radx; j++) { for (int j=1; j<=radx; j++) {
temp[row*W+0] += fabsf((float)src[row*W+j]); tempval += fabsf((float)src[row*W+j]);
} }
temp[row*W+0] = temp[row*W+0] / len; tempval /= len;
temp[row*W+0] = tempval;
for (int col=1; col<=radx; col++) { for (int col=1; col<=radx; col++) {
temp[row*W+col] = (temp[row*W+col-1]*len + fabsf(src[row*W+col+radx]))/(len+1); tempval = (tempval*len + fabsf(src[row*W+col+radx]))/(len+1);
temp[row*W+col] = tempval;
len ++; len ++;
} }
float rlen = 1.f/(float)len;
for (int col = radx+1; col < W-radx; col++) { for (int col = radx+1; col < W-radx; col++) {
temp[row*W+col] = temp[row*W+col-1] + ((float)(fabsf(src[row*W+col+radx]) - fabsf(src[row*W+col-radx-1])))/len; tempval = tempval + ((float)(fabsf(src[row*W+col+radx]) - fabsf(src[row*W+col-radx-1])))*rlen;
temp[row*W+col] = tempval;
} }
for (int col=W-radx; col<W; col++) { for (int col=W-radx; col<W; col++) {
temp[row*W+col] = (temp[row*W+col-1]*len - fabsf(src[row*W+col-radx-1]))/(len-1); tempval = (tempval*len - fabsf(src[row*W+col-radx-1]))/(len-1);
temp[row*W+col] = tempval;
len --; len --;
} }
} }
@@ -737,29 +742,30 @@ template<class T, class A> SSEFUNCTION void boxabsblur (T* src, A* dst, int radx
#ifdef __SSE2__ #ifdef __SSE2__
__m128 leninitv = _mm_set1_ps( (float)(rady+1)); __m128 leninitv = _mm_set1_ps( (float)(rady+1));
__m128 onev = _mm_set1_ps( 1.0f ); __m128 onev = _mm_set1_ps( 1.0f );
__m128 tempv,lenv,lenp1v,lenm1v; __m128 tempv,lenv,lenp1v,lenm1v,rlenv;
for (int col = 0; col < W-3; col+=4) { for (int col = 0; col < W-3; col+=4) {
lenv = leninitv; lenv = leninitv;
tempv = LVFU(temp[0*W+col]); tempv = LVF(temp[0*W+col]);
for (int i=1; i<=rady; i++) { for (int i=1; i<=rady; i++) {
tempv = tempv + LVFU(temp[i*W+col]); tempv = tempv + LVF(temp[i*W+col]);
} }
tempv = tempv / lenv; tempv = tempv / lenv;
_mm_storeu_ps( &dst[0*W+col], tempv ); _mm_store_ps( &dst[0*W+col], tempv );
for (int row=1; row<=rady; row++) { for (int row=1; row<=rady; row++) {
lenp1v = lenv + onev; lenp1v = lenv + onev;
tempv = (tempv*lenv + LVFU(temp[(row+rady)*W+col]))/lenp1v; tempv = (tempv*lenv + LVF(temp[(row+rady)*W+col]))/lenp1v;
_mm_storeu_ps( &dst[row*W+col],tempv); _mm_store_ps( &dst[row*W+col],tempv);
lenv = lenp1v; lenv = lenp1v;
} }
rlenv = onev / lenv;
for (int row = rady+1; row < H-rady; row++) { for (int row = rady+1; row < H-rady; row++) {
tempv = tempv + (LVFU(temp[(row+rady)*W+col])- LVFU(temp[(row-rady-1)*W+col]))/lenv; tempv = tempv + (LVF(temp[(row+rady)*W+col])- LVF(temp[(row-rady-1)*W+col]))*rlenv;
_mm_storeu_ps( &dst[row*W+col], tempv); _mm_store_ps( &dst[row*W+col], tempv);
} }
for (int row=H-rady; row<H; row++) { for (int row=H-rady; row<H; row++) {
lenm1v = lenv - onev; lenm1v = lenv - onev;
tempv = (tempv*lenv - LVFU(temp[(row-rady-1)*W+col]))/lenm1v; tempv = (tempv*lenv - LVF(temp[(row-rady-1)*W+col]))/lenm1v;
_mm_storeu_ps( &dst[row*W+col], tempv); _mm_store_ps( &dst[row*W+col], tempv);
lenv = lenm1v; lenv = lenm1v;
} }
} }

2
rtengine/cplx_wavelet_filter_coeffs.h
View File

@@ -22,7 +22,7 @@ namespace rtengine {
const int Daub4_len=6; const int Daub4_len=6;
const int Daub4_offset=2; const int Daub4_offset=2;
const float Daub4_anal[2][6] = {//analysis filter const float Daub4_anal[2][6] ALIGNED16 = {//analysis filter
{0, 0, 0.34150635, 0.59150635, 0.15849365, -0.091506351}, {0, 0, 0.34150635, 0.59150635, 0.15849365, -0.091506351},
{-0.091506351, -0.15849365, 0.59150635, -0.34150635, 0, 0}}; {-0.091506351, -0.15849365, 0.59150635, -0.34150635, 0, 0}};

124
rtengine/cplx_wavelet_level.h
View File

@@ -25,7 +25,6 @@
#include <cstddef> #include <cstddef>
#include "rt_math.h" #include "rt_math.h"
#include "opthelper.h" #include "opthelper.h"
namespace rtengine { namespace rtengine {
template<typename T> template<typename T>
@@ -50,15 +49,15 @@ namespace rtengine {
// load a row/column of input data, possibly with padding // load a row/column of input data, possibly with padding
void AnalysisFilterHaarVertical (T * srcbuffer, T * dstLo, T * dstHi, int pitch, int srclen); void AnalysisFilterHaarVertical (T * srcbuffer, T * dstLo, T * dstHi, int pitch, int srclen, int row);
void AnalysisFilterHaarHorizontal (T * srcbuffer, T * dstLo, T * dstHi, int pitch, int srclen); void AnalysisFilterHaarHorizontal (T * srcbuffer, T * dstLo, T * dstHi, int srclen, int row);
void SynthesisFilterHaarHorizontal (T * srcLo, T * srcHi, T * dst, int dstlen); void SynthesisFilterHaarHorizontal (T * srcLo, T * srcHi, T * dst, int dstlen);
void SynthesisFilterHaarVertical (T * srcLo, T * srcHi, T * dst, int pitch, int dstlen); void SynthesisFilterHaarVertical (T * srcLo, T * srcHi, T * dst, int pitch, int dstlen);
void AnalysisFilterSubsampHorizontal (T * srcbuffer, T * dstLo, T * dstHi, float *filterLo, float *filterHi, void AnalysisFilterSubsampHorizontal (T * srcbuffer, T * dstLo, T * dstHi, float *filterLo, float *filterHi,
int taps, int offset, int pitch, int srclen, int m_w2); int taps, int offset, int pitch, int srclen, int m_w2, int row);
void AnalysisFilterSubsampVertical (T * srcbuffer, T * dstLo, T * dstHi, float *filterLo, float *filterHi, void AnalysisFilterSubsampVertical (T * srcbuffer, T * dstLo, T * dstHi, float *filterLo, float *filterHi,
int taps, int offset, int pitch, int srclen); int taps, int offset, int pitch, int srclen, int row);
void SynthesisFilterSubsampHorizontal (T * srcLo, T * srcHi, T * dst, void SynthesisFilterSubsampHorizontal (T * srcLo, T * srcHi, T * dst,
float *filterLo, float *filterHi, int taps, int offset, int dstlen); float *filterLo, float *filterHi, int taps, int offset, int dstlen);
void SynthesisFilterSubsampVertical (T * srcLo, T * srcHi, T * dst, float *filterLo, float *filterHi, int taps, int offset, int pitch, int dstlen); void SynthesisFilterSubsampVertical (T * srcLo, T * srcHi, T * dst, float *filterLo, float *filterHi, int taps, int offset, int pitch, int dstlen);
@@ -152,38 +151,33 @@ namespace rtengine {
} }
template<typename T> template<typename T>
void wavelet_level<T>::AnalysisFilterHaarHorizontal (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, int pitch, int srclen) { void wavelet_level<T>::AnalysisFilterHaarHorizontal (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, int srclen, int row) {
/* Basic convolution code
* Applies a Haar filter
*/
for(int j=0;j<pitch;j++) {
for(int i = 0; i < (srclen - skip); i++) {
dstLo[j*srclen+i] = 0.5f*(srcbuffer[j*srclen+i] + srcbuffer[j*srclen+i+skip]);
dstHi[j*srclen+i] = 0.5f*(srcbuffer[j*srclen+i] - srcbuffer[j*srclen+i+skip]);
}
for(size_t i = max(srclen-skip,skip); i < (srclen); i++) {
dstLo[j*srclen+i] = 0.5f*(srcbuffer[j*srclen+i] + srcbuffer[j*srclen+i-skip]);
dstHi[j*srclen+i] = 0.5f*(srcbuffer[j*srclen+i] - srcbuffer[j*srclen+i-skip]);
}
}
}
template<typename T> void wavelet_level<T>::AnalysisFilterHaarVertical (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, int pitch, int srclen) {
/* Basic convolution code /* Basic convolution code
* Applies a Haar filter * Applies a Haar filter
*/ */
for(int i = 0; i < (srclen - skip); i++) { for(int i = 0; i < (srclen - skip); i++) {
for(int j=0;j<pitch;j++) { dstLo[row*srclen+i] = (srcbuffer[i] + srcbuffer[i+skip]);
dstLo[(pitch*(i))+j] = 0.5f*(srcbuffer[i*pitch+j] + srcbuffer[(i+skip)*pitch+j]); dstHi[row*srclen+i] = (srcbuffer[i] - srcbuffer[i+skip]);
dstHi[(pitch*(i))+j] = 0.5f*(srcbuffer[i*pitch+j] - srcbuffer[(i+skip)*pitch+j]);
}
} }
for(size_t i = max(srclen-skip,skip); i < (srclen); i++) { for(size_t i = max(srclen-skip,skip); i < (srclen); i++) {
dstLo[row*srclen+i] = (srcbuffer[i] + srcbuffer[i-skip]);
dstHi[row*srclen+i] = (srcbuffer[i] - srcbuffer[i-skip]);
}
}
template<typename T> void wavelet_level<T>::AnalysisFilterHaarVertical (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, int pitch, int srclen, int row) {
/* Basic convolution code
* Applies a Haar filter
*/
if(row < (srclen - skip)) {
for(int j=0;j<pitch;j++) { for(int j=0;j<pitch;j++) {
dstLo[(pitch*(i))+j] = 0.5f*(srcbuffer[i*pitch+j] + srcbuffer[(i-skip)*pitch+j]); dstLo[j] = 0.25f*(srcbuffer[row*pitch+j] + srcbuffer[(row+skip)*pitch+j]);
dstHi[(pitch*(i))+j] = 0.5f*(srcbuffer[i*pitch+j] - srcbuffer[(i-skip)*pitch+j]); dstHi[j] = 0.25f*(srcbuffer[row*pitch+j] - srcbuffer[(row+skip)*pitch+j]);
}
} else if(row>=max(srclen-skip,skip)) {
for(int j=0;j<pitch;j++) {
dstLo[j] = 0.25f*(srcbuffer[row*pitch+j] + srcbuffer[(row-skip)*pitch+j]);
dstHi[j] = 0.25f*(srcbuffer[row*pitch+j] - srcbuffer[(row-skip)*pitch+j]);
} }
} }
} }
@@ -227,40 +221,37 @@ namespace rtengine {
template<typename T> template<typename T>
void wavelet_level<T>::AnalysisFilterSubsampHorizontal (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, float * RESTRICT filterLo, float *filterHi, void wavelet_level<T>::AnalysisFilterSubsampHorizontal (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, float * RESTRICT filterLo, float *filterHi,
int taps, int offset, int pitch, int srclen, int m_w2) { int taps, int offset, int pitch, int srclen, int m_w2, int row) {
/* Basic convolution code /* Basic convolution code
* Applies an FIR filter 'filter' with filter length 'taps', * Applies an FIR filter 'filter' with filter length 'taps',
* aligning the 'offset' element of the filter with * aligning the 'offset' element of the filter with
* the input pixel, and skipping 'skip' pixels between taps * the input pixel, and skipping 'skip' pixels between taps
* Output is subsampled by two * Output is subsampled by two
*/ */
// calculate coefficients // calculate coefficients
for(int k=0;k<pitch;k++) {
for(int i = 0; i < srclen; i+=2) { for(int i = 0; i < srclen; i+=2) {
float lo = 0.f, hi = 0.f; float lo = 0.f, hi = 0.f;
if (LIKELY(i>skip*taps && i<srclen-skip*taps)) {//bulk if (LIKELY(i>skip*taps && i<srclen-skip*taps)) {//bulk
for (int j=0, l=-skip*offset; j<taps; j++, l+=skip) { for (int j=0, l=-skip*offset; j<taps; j++, l+=skip) {
float src = srcbuffer[k*srclen+i-l]; float src = srcbuffer[i-l];
lo += filterLo[j] * src;//lopass channel lo += filterLo[j] * src;//lopass channel
hi += filterHi[j] * src;//hipass channel hi += filterHi[j] * src;//hipass channel
} }
} else { } else {
for (int j=0; j<taps; j++) { for (int j=0; j<taps; j++) {
int arg = max(0,min(i+skip*(offset-j),srclen-1));//clamped BC's int arg = max(0,min(i+skip*(offset-j),srclen-1));//clamped BC's
lo += filterLo[j] * srcbuffer[k*srclen+arg];//lopass channel lo += filterLo[j] * srcbuffer[arg];//lopass channel
hi += filterHi[j] * srcbuffer[k*srclen+arg];//hipass channel hi += filterHi[j] * srcbuffer[arg];//hipass channel
} }
} }
dstLo[k*m_w2+((i/2))] = lo; dstLo[row*m_w2+((i/2))] = lo;
dstHi[k*m_w2+((i/2))] = hi; dstHi[row*m_w2+((i/2))] = hi;
}
} }
} }
template<typename T> void wavelet_level<T>::AnalysisFilterSubsampVertical (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, float * RESTRICT filterLo, float * RESTRICT filterHi, template<typename T> void wavelet_level<T>::AnalysisFilterSubsampVertical (T * RESTRICT srcbuffer, T * RESTRICT dstLo, T * RESTRICT dstHi, float * RESTRICT filterLo, float * RESTRICT filterHi,
int taps, int offset, int pitch, int srclen) { int taps, int offset, int pitch, int srclen, int row) {
/* Basic convolution code /* Basic convolution code
* Applies an FIR filter 'filter' with filter length 'taps', * Applies an FIR filter 'filter' with filter length 'taps',
* aligning the 'offset' element of the filter with * aligning the 'offset' element of the filter with
@@ -269,29 +260,26 @@ namespace rtengine {
*/ */
// calculate coefficients // calculate coefficients
if (LIKELY(row>skip*taps && row<srclen-skip*taps)) {//bulk
for(int i = 0; i < srclen; i+=2) {
if (LIKELY(i>skip*taps && i<srclen-skip*taps)) {//bulk
for (int k=0; k<pitch; k++) { for (int k=0; k<pitch; k++) {
float lo = 0.f, hi = 0.f; float lo = 0.f, hi = 0.f;
for (int j=0, l=-skip*offset; j<taps; j++, l+=skip) { for (int j=0, l=-skip*offset; j<taps; j++, l+=skip) {
lo += filterLo[j] * srcbuffer[(i-l)*pitch+k];//lopass channel lo += filterLo[j] * srcbuffer[(row-l)*pitch+k];//lopass channel
hi += filterHi[j] * srcbuffer[(i-l)*pitch+k];//hipass channel hi += filterHi[j] * srcbuffer[(row-l)*pitch+k];//hipass channel
} }
dstLo[(pitch*(i/2))+k] = lo; dstLo[k] = lo;
dstHi[(pitch*(i/2))+k] = hi; dstHi[k] = hi;
} }
} else {//boundary } else {//boundary
for (int k=0; k<pitch; k++) { for (int k=0; k<pitch; k++) {
float lo = 0.f, hi = 0.f; float lo = 0.f, hi = 0.f;
for (int j=0; j<taps; j++) { for (int j=0; j<taps; j++) {
int arg = max(0,min(i+skip*(offset-j),srclen-1))*pitch+k;//clamped BC's int arg = max(0,min(row+skip*(offset-j),srclen-1))*pitch+k;//clamped BC's
lo += filterLo[j] * srcbuffer[arg];//lopass channel lo += filterLo[j] * srcbuffer[arg];//lopass channel
hi += filterHi[j] * srcbuffer[arg];//hipass channel hi += filterHi[j] * srcbuffer[arg];//hipass channel
} }
dstLo[(pitch*(i/2))+k] = lo; dstLo[k] = lo;
dstHi[(pitch*(i/2))+k] = hi; dstHi[k] = hi;
}
} }
} }
} }
@@ -325,7 +313,7 @@ namespace rtengine {
tot += ((filterLo[j] * srcLo[k*m_w2+arg] + filterHi[j] * srcHi[k*m_w2+arg])); tot += ((filterLo[j] * srcLo[k*m_w2+arg] + filterHi[j] * srcHi[k*m_w2+arg]));
} }
} }
dst[k*m_w+(i-m_pad)] = 2.f * tot; dst[k*m_w+(i-m_pad)] = tot;
} }
} }
} }
@@ -353,7 +341,7 @@ namespace rtengine {
for (int j=begin, l=0; j<taps; j+=2, l+=skip) { for (int j=begin, l=0; j<taps; j+=2, l+=skip) {
tot += ((filterLo[j] * srcLo[(i_src-l)*pitch+k] + filterHi[j] * srcHi[(i_src-l)*pitch+k])); tot += ((filterLo[j] * srcLo[(i_src-l)*pitch+k] + filterHi[j] * srcHi[(i_src-l)*pitch+k]));
} }
dst[pitch*(i-m_pad)+k] = 2.f * tot; dst[pitch*(i-m_pad)+k] = 4.f * tot;
} }
} else {//boundary } else {//boundary
for (int k=0; k<pitch; k++) { for (int k=0; k<pitch; k++) {
@@ -362,7 +350,7 @@ namespace rtengine {
int arg = max(0,min((i_src-l),srclen-1))*pitch+k;//clamped BC's int arg = max(0,min((i_src-l),srclen-1))*pitch+k;//clamped BC's
tot += ((filterLo[j] * srcLo[arg] + filterHi[j] * srcHi[arg])); tot += ((filterLo[j] * srcLo[arg] + filterHi[j] * srcHi[arg]));
} }
dst[pitch*(i-m_pad)+k] = 2.f * tot; dst[pitch*(i-m_pad)+k] = 4.f * tot;
} }
} }
} }
@@ -370,22 +358,22 @@ namespace rtengine {
template<typename T> template<typename E> void wavelet_level<T>::decompose_level(E *src, float *filterV, float *filterH, int taps, int offset) { template<typename T> template<typename E> void wavelet_level<T>::decompose_level(E *src, float *filterV, float *filterH, int taps, int offset) {
T *tmpLo = new T[m_w*m_h2]; T tmpLo[m_w] ALIGNED64;
T *tmpHi = new T[m_w*m_h2]; T tmpHi[m_w] ALIGNED64;
/* filter along rows and columns */ /* filter along rows and columns */
if(subsamp_out) { if(subsamp_out) {
AnalysisFilterSubsampVertical (src, tmpLo, tmpHi, filterV, filterV+taps, taps, offset, m_w/*output_pitch*/, m_h/*srclen*/); for(int row=0;row<m_h;row+=2) {
AnalysisFilterSubsampHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2); AnalysisFilterSubsampVertical (src, tmpLo, tmpHi, filterV, filterV+taps, taps, offset, m_w/*output_pitch*/, m_h/*srclen*/, row);
AnalysisFilterSubsampHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2); AnalysisFilterSubsampHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2);
} else { AnalysisFilterSubsampHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2);
AnalysisFilterHaarVertical (src, tmpLo, tmpHi, m_w, m_h); }
AnalysisFilterHaarHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], m_h, m_w); } else {
AnalysisFilterHaarHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], m_h, m_w); for(int row=0;row<m_h;row++) {
AnalysisFilterHaarVertical (src, tmpLo, tmpHi, m_w, m_h, row);
AnalysisFilterHaarHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], m_w, row);
AnalysisFilterHaarHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], m_w, row);
}
} }
delete[] tmpLo;
delete[] tmpHi;
} }
template<typename T> template<typename E> void wavelet_level<T>::reconstruct_level(E* tmpLo, E* tmpHi, E *dst, float *filterV, float *filterH, int taps, int offset) { template<typename T> template<typename E> void wavelet_level<T>::reconstruct_level(E* tmpLo, E* tmpHi, E *dst, float *filterV, float *filterH, int taps, int offset) {