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

Reduced peak memory usage of Noise Reduction, Issue 2557

Browse Source
This commit is contained in:
Ingo
2015-01-26 12:55:27 +01:00
parent c09599a850
commit 9d7bb2a917
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtengine/FTblockDN.cc
View File

@@ -718,7 +718,7 @@ do {
const float noisevarab_b = SQR(realblue); const float noisevarab_b = SQR(realblue);
//input L channel //input L channel
array2D<float> Lin(width,height); array2D<float> *Lin;
//wavelet denoised image //wavelet denoised image
LabImage * labdn = new LabImage(width,height); LabImage * labdn = new LabImage(width,height);
@@ -760,8 +760,6 @@ do {
labdn->a[i1][j1] = a; labdn->a[i1][j1] = a;
labdn->b[i1][j1] = b; labdn->b[i1][j1] = b;
Lin[i1][j1] = L;
if(((i1|j1)&1) == 0) { if(((i1|j1)&1) == 0) {
if(numTries == 1) { if(numTries == 1) {
noisevarlum[(i1>>1)*width2+(j1>>1)] = useNoiseLCurve ? lumcalc[i>>1][j>>1] : noisevarL; noisevarlum[(i1>>1)*width2+(j1>>1)] = useNoiseLCurve ? lumcalc[i>>1][j>>1] : noisevarL;
@@ -795,8 +793,6 @@ do {
labdn->a[i1][j1] = (X-Y); labdn->a[i1][j1] = (X-Y);
labdn->b[i1][j1] = (Y-Z); labdn->b[i1][j1] = (Y-Z);
Lin[i1][j1] = Y;
if(((i1|j1)&1) == 0) { if(((i1|j1)&1) == 0) {
if(numTries == 1) { if(numTries == 1) {
noisevarlum[(i1>>1)*width2+(j1>>1)] = useNoiseLCurve ? lumcalc[i>>1][j>>1] : noisevarL; noisevarlum[(i1>>1)*width2+(j1>>1)] = useNoiseLCurve ? lumcalc[i>>1][j>>1] : noisevarL;
@@ -843,8 +839,6 @@ do {
labdn->a[i1][j1] = a; labdn->a[i1][j1] = a;
labdn->b[i1][j1] = b; labdn->b[i1][j1] = b;
Lin[i1][j1] = L;
if(((i1|j1)&1) == 0) { if(((i1|j1)&1) == 0) {
float Llum,alum,blum; float Llum,alum,blum;
if(useNoiseLCurve || useNoiseCCurve) { if(useNoiseLCurve || useNoiseCCurve) {
@@ -1017,10 +1011,19 @@ do {
if(!WaveletDenoiseAllL(*Ldecomp, noisevarL, noisevarlum, madL, width, height, useNoiseLCurve, denoiseMethodRgb )) if(!WaveletDenoiseAllL(*Ldecomp, noisevarL, noisevarlum, madL, width, height, useNoiseLCurve, denoiseMethodRgb ))
memoryAllocationFailed = true; memoryAllocationFailed = true;
} }
if(!memoryAllocationFailed) if(!memoryAllocationFailed) {
// copy labdn->L to Lin before it gets modified by reconstruction
Lin = new array2D<float>(width,height);
#ifdef _OPENMP
#pragma omp parallel for num_threads(denoiseNestedLevels) if(denoiseNestedLevels>1)
#endif
for(int i=0;i<height;i++)
for(int j=0;j<width;j++)
(*Lin)[i][j] = labdn->L[i][j];
Ldecomp->reconstruct(labdn->data); Ldecomp->reconstruct(labdn->data);
} }
} }
}
delete Ldecomp; delete Ldecomp;
} }
@@ -1156,7 +1159,7 @@ do {
} }
for (int j=0; j<labdn->W; j++) { for (int j=0; j<labdn->W; j++) {
datarow[j] = (Lin[rr][j]-labdn->L[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++) {
@@ -1397,6 +1400,7 @@ do {
//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
} }
delete labdn; delete labdn;
delete Lin;
}//end of tile row }//end of tile row
}//end of tile loop }//end of tile loop