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

Optimization of damping part of RL-Sharpening, Issue 1759

Browse Source
This commit is contained in:
Ingo
2013-03-14 12:56:59 +01:00
parent 2054e54f96
commit 5afb5bc182
2 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/helpersse2.h
View File

@@ -9,7 +9,12 @@
#define INLINE inline
#endif
#include <intrin.h>
#if defined( WIN32 ) && defined(__x86_64__)
#include <intrin.h>
#else
#include <emmintrin.h>
#endif
#include <stdint.h>
typedef __m128d vdouble;

68
rtengine/ipsharpen.cc
View File

@@ -20,7 +20,9 @@
#include "improcfun.h"
#include "gauss.h"
#include "bilateral2.h"
#include "rt_math.h"
#include "rt_math.h"
#include "sleef.c"
#include "sleefsseavx.c"
#ifdef _OPENMP
#include <omp.h>
@@ -40,28 +42,75 @@ extern const Settings* settings;
void ImProcFunctions::dcdamping (float** aI, float** aO, float damping, int W, int H) {
const float dampingFac=2.0/(damping*damping);
const float dampingFac=-2.0/(damping*damping);
#ifdef __SSE2__
__m128 Iv,Ov,Uv,zerov,onev,fourv,fivev,dampingFacv,Tv;
zerov = _mm_setzero_ps( );
onev = _mm_set1_ps( 1.0f );
fourv = _mm_set1_ps( 4.0f );
fivev = _mm_set1_ps( 5.0f );
dampingFacv = _mm_set1_ps( dampingFac );
#ifdef _OPENMP
#pragma omp for
#endif
for (int i=0; i<H; i++)
for (int j=0; j<W-3; j+=4) {
Iv = _mm_loadu_ps( &aI[i][j] );
Ov = _mm_loadu_ps( &aO[i][j] );
Uv = (Ov * xlogf(Iv/Ov) - Iv + Ov) * dampingFacv;
Uv = _mm_min_ps(Uv,onev);
Tv = Uv*Uv;
Tv = Tv*Tv;
Uv = Tv*(fivev-Uv*fourv);
Uv = (Ov - Iv) / Iv * Uv + onev;
Uv = vself(vmaskf_ge(zerov, Iv), zerov, Uv);
Uv = vself(vmaskf_ge(zerov, Ov), zerov, Uv);
_mm_storeu_ps( &aI[i][j], Uv );
}
// border pixels are done without SSE2
float I,O,U;
#ifdef _OPENMP
#pragma omp for
#endif
for (int i=0; i<H; i++)
for(int j=W-(W%4);j<W;j++) {
I = aI[i][j];
O = aO[i][j];
if (O<=0.0 || I<=0.0) {
aI[i][j] = 0.0;
continue;
}
U = (O * xlogf(I/O) - I + O) * dampingFac;
U = min(U,1.0f);
U = U*U*U*U*(5.0-U*4.0);
aI[i][j] = (O - I) / I * U + 1.0;
}
#else // without __SSE2__
float I,O,U;
#ifdef _OPENMP
#pragma omp for
#endif
for (int i=0; i<H; i++)
for (int j=0; j<W; j++) {
float I = aI[i][j];
float O = aO[i][j];
I = aI[i][j];
O = aO[i][j];
if (O<=0.0 || I<=0.0) {
aI[i][j] = 0.0;
continue;
}
float U = -(O * log(I/O) - I + O) * dampingFac;
}
U = (O * xlogf(I/O) - I + O) * dampingFac;
U = min(U,1.0f);
U = U*U*U*U*(5.0-U*4.0);
aI[i][j] = (O - I) / I * U + 1.0;
}
}
#endif
}
void ImProcFunctions::deconvsharpening (LabImage* lab, float** b2) {
if (params->sharpening.enabled==false || params->sharpening.deconvamount<1)
return;
@@ -74,7 +123,7 @@ void ImProcFunctions::deconvsharpening (LabImage* lab, float** b2) {
tmpI[i][j] = (float)lab->L[i][j];
}
float** tmp = (float**)b2;
float** tmp = (float**)b2;
#ifdef _OPENMP
#pragma omp parallel
@@ -128,7 +177,6 @@ void ImProcFunctions::deconvsharpening (LabImage* lab, float** b2) {
for (int i=0; i<H; i++)
delete [] tmpI[i];
delete [] tmpI;
}
void ImProcFunctions::sharpening (LabImage* lab, float** b2) {