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

Removed Benchmark code

Browse Source
This commit is contained in:
heckflosse
2018-06-07 21:38:10 +02:00
parent e542a38f85
commit fc4d0fb076
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/amaze_vng4_demosaic_RT.cc
View File

@@ -26,7 +26,7 @@
#include "rtengine.h" #include "rtengine.h"
#include "rawimagesource.h" #include "rawimagesource.h"
#include "rt_math.h" #include "rt_math.h"
#define BENCHMARK //#define BENCHMARK
#include "StopWatch.h" #include "StopWatch.h"
#include "rt_algo.h" #include "rt_algo.h"

12
rtengine/vng4_demosaic_RT.cc
View File

@@ -23,9 +23,8 @@
#include "rtengine.h" #include "rtengine.h"
#include "rawimagesource.h" #include "rawimagesource.h"
#include "rawimagesource_i.h" #include "rawimagesource_i.h"
//#include "rt_math.h"
#include "../rtgui/multilangmgr.h" #include "../rtgui/multilangmgr.h"
#define BENCHMARK //#define BENCHMARK
#include "StopWatch.h" #include "StopWatch.h"
namespace rtengine namespace rtengine
@@ -75,7 +74,7 @@ void RawImageSource::vng4_demosaic (const array2D<float> &rawData, array2D<float
float (*image)[4]; float (*image)[4];
image = (float (*)[4]) calloc (height * width, sizeof * image); image = (float (*)[4]) calloc (height * width, sizeof * image);
StopWatch Stop1("loop1");
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
@@ -84,7 +83,7 @@ StopWatch Stop1("loop1");
for (int jj = 0; jj < W; jj++) { for (int jj = 0; jj < W; jj++) {
image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj]; image[ii * W + jj][fc(ii, jj)] = rawData[ii][jj];
} }
Stop1.stop();
{ {
int lcode[16][16][32]; int lcode[16][16][32];
float mul[16][16][8]; float mul[16][16][8];
@@ -125,7 +124,6 @@ Stop1.stop();
} }
} }
StopWatch Stop2("loop2");
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for
#endif #endif
@@ -146,7 +144,6 @@ StopWatch Stop2("loop2");
} }
} }
} }
Stop2.stop();
} }
const int prow = 7, pcol = 1; const int prow = 7, pcol = 1;
@@ -210,7 +207,6 @@ Stop2.stop();
plistener->setProgress (progress); plistener->setProgress (progress);
} }
StopWatch Stop3("loop3");
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel #pragma omp parallel
#endif #endif
@@ -322,7 +318,7 @@ StopWatch Stop3("loop3");
if(plistenerActive) { if(plistenerActive) {
plistener->setProgress (0.98); plistener->setProgress (0.98);
} }
Stop3.stop();
// Interpolate R and B // Interpolate R and B
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel for #pragma omp parallel for