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

Reduced peak memory usage of Noise Reduction, Issue 2557 #119 and #123

Browse Source
This commit is contained in:
Ingo
2015-01-04 18:40:45 +01:00
parent 46518ea6a7
commit d2a4faea14
3 changed files with 47 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/cplx_wavelet_dec.cc
View File

@@ -29,6 +29,8 @@ namespace rtengine {
} }
delete[] wavfilt_anal; delete[] wavfilt_anal;
delete[] wavfilt_synth; delete[] wavfilt_synth;
if(coeff0)
delete [] coeff0;
} }
}; };

38
rtengine/cplx_wavelet_dec.h
View File

@@ -46,9 +46,7 @@ namespace rtengine {
float *wavfilt_anal; float *wavfilt_anal;
float *wavfilt_synth; float *wavfilt_synth;
int testfilt_len, testfilt_offset; float *coeff0;
float *testfilt_anal;
float *testfilt_synth;
wavelet_level<internal_type> * wavelet_decomp[maxlevels]; wavelet_level<internal_type> * wavelet_decomp[maxlevels];
@@ -86,7 +84,7 @@ namespace rtengine {
int maxlevel() const int maxlevel() const
{ {
return lvltot; return lvltot+1;
} }
int subsample() const int subsample() const
@@ -99,7 +97,7 @@ namespace rtengine {
template<typename E> template<typename E>
wavelet_decomposition::wavelet_decomposition(E * src, int width, int height, int maxlvl, int subsampling) wavelet_decomposition::wavelet_decomposition(E * src, int width, int height, int maxlvl, int subsampling)
: lvltot(0), subsamp(subsampling), m_w(width), m_h(height) : lvltot(0), subsamp(subsampling), m_w(width), m_h(height), coeff0(NULL)
{ {
//initialize wavelet filters //initialize wavelet filters
wavfilt_len = Daub4_len; wavfilt_len = Daub4_len;
@@ -120,14 +118,22 @@ namespace rtengine {
int padding = 0;//pow(2, maxlvl);//must be a multiple of two int padding = 0;//pow(2, maxlvl);//must be a multiple of two
lvltot=0; lvltot=0;
wavelet_decomp[lvltot] = new wavelet_level<internal_type>(src, lvltot/*level*/, subsamp, padding/*padding*/, m_w, m_h, \ E *buffer[2];
buffer[0] = new E[(m_w/2+1)*(m_h/2+1)];
buffer[1] = new E[(m_w/2+1)*(m_h/2+1)];
int bufferindex = 0;
wavelet_decomp[lvltot] = new wavelet_level<internal_type>(src, buffer[bufferindex^1], lvltot/*level*/, subsamp, padding/*padding*/, m_w, m_h, \
wavfilt_anal, wavfilt_anal, wavfilt_len, wavfilt_offset); wavfilt_anal, wavfilt_anal, wavfilt_len, wavfilt_offset);
while(lvltot < maxlvl) { while(lvltot < maxlvl-1) {
lvltot++; lvltot++;
wavelet_decomp[lvltot] = new wavelet_level<internal_type>(wavelet_decomp[lvltot-1]->lopass()/*lopass*/, lvltot/*level*/, subsamp, 0/*no padding*/, \ bufferindex ^= 1;
wavelet_decomp[lvltot] = new wavelet_level<internal_type>(buffer[bufferindex], buffer[bufferindex^1]/*lopass*/, lvltot/*level*/, subsamp, 0/*no padding*/, \
wavelet_decomp[lvltot-1]->width(), wavelet_decomp[lvltot-1]->height(), \ wavelet_decomp[lvltot-1]->width(), wavelet_decomp[lvltot-1]->height(), \
wavfilt_anal, wavfilt_anal, wavfilt_len, wavfilt_offset); wavfilt_anal, wavfilt_anal, wavfilt_len, wavfilt_offset);
} }
coeff0 = buffer[bufferindex^1];
delete[] buffer[bufferindex];
} }
template<typename E> template<typename E>
@@ -143,17 +149,23 @@ namespace rtengine {
if(m_h2 < wavelet_decomp[lvl]->m_h2) if(m_h2 < wavelet_decomp[lvl]->m_h2)
m_h2 = wavelet_decomp[lvl]->m_h2; m_h2 = wavelet_decomp[lvl]->m_h2;
} }
E *tmpLo = new E[m_w*m_h2]; E *tmpLo = new E[m_w*m_h2];
E *tmpHi = new E[m_w*m_h2]; E *tmpHi = new E[m_w*m_h2];
for (int lvl=lvltot-1; lvl>0; lvl--) { E *buffer[2];
wavelet_decomp[lvl]->reconstruct_level(tmpLo, tmpHi, wavelet_decomp[lvl-1]->wavcoeffs[0], wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset); buffer[0] = coeff0;
buffer[1] = new E[(m_w/2+1)*(m_h/2+1)];
int bufferindex = 0;
for (int lvl=lvltot; lvl>0; lvl--) {
wavelet_decomp[lvl]->reconstruct_level(tmpLo, tmpHi, buffer[bufferindex], buffer[bufferindex^1], wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
bufferindex ^= 1;
//skip /=2; //skip /=2;
} }
wavelet_decomp[0]->reconstruct_level(tmpLo, tmpHi, dst, wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset); wavelet_decomp[0]->reconstruct_level(tmpLo, tmpHi, buffer[bufferindex], dst, wavfilt_synth, wavfilt_synth, wavfilt_len, wavfilt_offset);
delete[] buffer[0];
delete[] buffer[1];
coeff0 = NULL;
delete[] tmpLo; delete[] tmpLo;
delete[] tmpHi; delete[] tmpHi;

28
rtengine/cplx_wavelet_level.h
View File

@@ -72,7 +72,7 @@ namespace rtengine {
size_t m_w2, m_h2; size_t m_w2, m_h2;
template<typename E> template<typename E>
wavelet_level(E * src, int level, int subsamp, int padding, size_t w, size_t h, float *filterV, float *filterH, int len, int offset) wavelet_level(E * src, E * dst, int level, int subsamp, int padding, size_t w, size_t h, float *filterV, float *filterH, int len, int offset)
: m_w(w), m_h(h), m_w2(w), m_h2(h), m_pad(padding), wavcoeffs(NULL), lvl(level), skip(1<<level), subsamp_out((subsamp>>level)&1) : m_w(w), m_h(h), m_w2(w), m_h2(h), m_pad(padding), wavcoeffs(NULL), lvl(level), skip(1<<level), subsamp_out((subsamp>>level)&1)
{ {
if (subsamp) { if (subsamp) {
@@ -86,7 +86,7 @@ namespace rtengine {
m_pad= skip*padding; m_pad= skip*padding;
wavcoeffs = create((m_w2)*(m_h2)); wavcoeffs = create((m_w2)*(m_h2));
decompose_level(src, filterV, filterH, len, offset); decompose_level(src, dst, filterV, filterH, len, offset);
} }
@@ -126,18 +126,18 @@ namespace rtengine {
} }
template<typename E> template<typename E>
void decompose_level(E *src, float *filterV, float *filterH, int len, int offset); void decompose_level(E *src, E *dst, float *filterV, float *filterH, int len, int offset);
template<typename E> template<typename E>
void reconstruct_level(E* tmpLo, E* tmpHi, E *dst, float *filterV, float *filterH, int taps, int offset); void reconstruct_level(E* tmpLo, E* tmpHi, E *src, E *dst, float *filterV, float *filterH, int taps, int offset);
}; };
template<typename T> template<typename T>
T ** wavelet_level<T>::create(size_t n) { T ** wavelet_level<T>::create(size_t n) {
T * data = new T[4*n]; T * data = new T[3*n];
T ** subbands = new T*[4]; T ** subbands = new T*[4];
for(size_t j = 0; j < 4; j++) { for(size_t j = 1; j < 4; j++) {
subbands[j] = data + n * j; subbands[j] = data + n * (j-1);
} }
return subbands; return subbands;
} }
@@ -145,7 +145,7 @@ namespace rtengine {
template<typename T> template<typename T>
void wavelet_level<T>::destroy(T ** subbands) { void wavelet_level<T>::destroy(T ** subbands) {
if(subbands) { if(subbands) {
delete[] subbands[0]; delete[] subbands[1];
delete[] subbands; delete[] subbands;
} }
} }
@@ -356,7 +356,7 @@ 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, E *dst, float *filterV, float *filterH, int taps, int offset) {
T tmpLo[m_w] ALIGNED64; T tmpLo[m_w] ALIGNED64;
T tmpHi[m_w] ALIGNED64; T tmpHi[m_w] ALIGNED64;
@@ -364,27 +364,27 @@ namespace rtengine {
if(subsamp_out) { if(subsamp_out) {
for(int row=0;row<m_h;row+=2) { for(int row=0;row<m_h;row+=2) {
AnalysisFilterSubsampVertical (src, tmpLo, tmpHi, filterV, filterV+taps, taps, offset, m_w/*output_pitch*/, m_h/*srclen*/, row); AnalysisFilterSubsampVertical (src, tmpLo, tmpHi, filterV, filterV+taps, taps, offset, m_w/*output_pitch*/, m_h/*srclen*/, row);
AnalysisFilterSubsampHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2); AnalysisFilterSubsampHorizontal (tmpLo, dst, wavcoeffs[1], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2);
AnalysisFilterSubsampHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2); AnalysisFilterSubsampHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], filterH, filterH+taps, taps, offset, m_h2/*output_pitch*/, m_w/*srclen*/, m_w2, row/2);
} }
} else { } else {
for(int row=0;row<m_h;row++) { for(int row=0;row<m_h;row++) {
AnalysisFilterHaarVertical (src, tmpLo, tmpHi, m_w, m_h, row); AnalysisFilterHaarVertical (src, tmpLo, tmpHi, m_w, m_h, row);
AnalysisFilterHaarHorizontal (tmpLo, wavcoeffs[0], wavcoeffs[1], m_w, row); AnalysisFilterHaarHorizontal (tmpLo, dst, wavcoeffs[1], m_w, row);
AnalysisFilterHaarHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], m_w, row); AnalysisFilterHaarHorizontal (tmpHi, wavcoeffs[2], wavcoeffs[3], m_w, row);
} }
} }
} }
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 * src, E *dst, float *filterV, float *filterH, int taps, int offset) {
/* filter along rows and columns */ /* filter along rows and columns */
if (subsamp_out) { if (subsamp_out) {
SynthesisFilterSubsampHorizontal (wavcoeffs[0], wavcoeffs[1], tmpLo, filterH, filterH+taps, taps, offset, m_w/*dstlen*/); SynthesisFilterSubsampHorizontal (src, wavcoeffs[1], tmpLo, filterH, filterH+taps, taps, offset, m_w/*dstlen*/);
SynthesisFilterSubsampHorizontal (wavcoeffs[2], wavcoeffs[3], tmpHi, filterH, filterH+taps, taps, offset, m_w/*dstlen*/); SynthesisFilterSubsampHorizontal (wavcoeffs[2], wavcoeffs[3], tmpHi, filterH, filterH+taps, taps, offset, m_w/*dstlen*/);
SynthesisFilterSubsampVertical (tmpLo, tmpHi, dst, filterV, filterV+taps, taps, offset, m_w/*pitch*/, m_h/*dstlen*/); SynthesisFilterSubsampVertical (tmpLo, tmpHi, dst, filterV, filterV+taps, taps, offset, m_w/*pitch*/, m_h/*dstlen*/);
} else { } else {
SynthesisFilterHaarHorizontal (wavcoeffs[0], wavcoeffs[1], tmpLo, m_w); SynthesisFilterHaarHorizontal (src, wavcoeffs[1], tmpLo, m_w);
SynthesisFilterHaarHorizontal (wavcoeffs[2], wavcoeffs[3], tmpHi, m_w); SynthesisFilterHaarHorizontal (wavcoeffs[2], wavcoeffs[3], tmpHi, m_w);
SynthesisFilterHaarVertical (tmpLo, tmpHi, dst, m_w, m_h); SynthesisFilterHaarVertical (tmpLo, tmpHi, dst, m_w, m_h);
} }