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

Fix slowdown when creating thumb from non-raw file

Browse Source
This commit is contained in:
Ingo Weyrich 2019-11-04 15:10:28 +01:00
parent 7ef19b5126
commit 0544d15b16
2 changed files with 73 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/iimage.cc
View File

@ -46,6 +46,7 @@ int rtengine::getCoarseBitMask( const procparams::CoarseTransformParams &coarse)
return tr; return tr;
} }
int rtengine::igammasrgb(float in) {
return Color::igamma_srgb(in); const LUTf& rtengine::getigammatab() {
} return Color::igammatab_srgb;
}

95
rtengine/iimage.h
View File

@ -59,7 +59,7 @@ extern const char sImage16[];
extern const char sImagefloat[]; extern const char sImagefloat[];
int getCoarseBitMask(const procparams::CoarseTransformParams& coarse); int getCoarseBitMask(const procparams::CoarseTransformParams& coarse);
int igammasrgb(float in); const LUTf& getigammatab();
enum TypeInterpolation { TI_Nearest, TI_Bilinear }; enum TypeInterpolation { TI_Nearest, TI_Bilinear };
@ -958,17 +958,35 @@ public:
histogram(65536 >> histcompr); histogram(65536 >> histcompr);
histogram.clear(); histogram.clear();
const LUTf& igammatab = getigammatab();
for (int i = 0; i < height; i++) #ifdef _OPENMP
for (int j = 0; j < width; j++) { #pragma omp parallel
float r_, g_, b_; #endif
convertTo<T, float>(r(i, j), r_); {
convertTo<T, float>(g(i, j), g_); LUTu histThr(histogram.getSize());
convertTo<T, float>(b(i, j), b_); histThr.clear();
histogram[igammasrgb (r_) >> histcompr]++; #ifdef _OPENMP
histogram[igammasrgb (g_) >> histcompr]++; #pragma omp for schedule(dynamic,16) nowait
histogram[igammasrgb (b_) >> histcompr]++; #endif
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histThr[static_cast<int>(igammatab[r_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[g_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[b_]) >> histcompr]++;
}
} }
#ifdef _OPENMP
#pragma omp critical
#endif
{
histogram += histThr;
}
}
} }
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
@ -976,16 +994,16 @@ public:
histogram.clear(); histogram.clear();
avg_r = avg_g = avg_b = 0.; avg_r = avg_g = avg_b = 0.;
n = 0; n = 0;
const LUTf& igammatab = getigammatab();
for (unsigned int i = 0; i < (unsigned int)(height); i++) for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) { for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_; float r_, g_, b_;
convertTo<T, float>(r(i, j), r_); convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_); convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_); convertTo<T, float>(b(i, j), b_);
int rtemp = igammasrgb (r_); int rtemp = igammatab[r_];
int gtemp = igammasrgb (g_); int gtemp = igammatab[g_];
int btemp = igammasrgb (b_); int btemp = igammatab[b_];
histogram[rtemp >> compression]++; histogram[rtemp >> compression]++;
histogram[gtemp >> compression] += 2; histogram[gtemp >> compression] += 2;
@ -1012,6 +1030,9 @@ public:
int n = 0; int n = 0;
//int p = 6; //int p = 6;
#ifdef _OPENMP
#pragma omp parallel for reduction(+:avg_r,avg_g,avg_b,n) schedule(dynamic,16)
#endif
for (unsigned int i = 0; i < (unsigned int)(height); i++) for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) { for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_; float r_, g_, b_;
@ -1567,17 +1588,35 @@ public:
histogram(65536 >> histcompr); histogram(65536 >> histcompr);
histogram.clear(); histogram.clear();
const LUTf& igammatab = getigammatab();
for (int i = 0; i < height; i++) #ifdef _OPENMP
for (int j = 0; j < width; j++) { #pragma omp parallel
float r_, g_, b_; #endif
convertTo<T, float>(r(i, j), r_); {
convertTo<T, float>(g(i, j), g_); LUTu histThr(histogram.getSize());
convertTo<T, float>(b(i, j), b_); histThr.clear();
histogram[igammasrgb (r_) >> histcompr]++; #ifdef _OPENMP
histogram[igammasrgb (g_) >> histcompr]++; #pragma omp for schedule(dynamic,16) nowait
histogram[igammasrgb (b_) >> histcompr]++; #endif
for (int i = 0; i < height; i++) {
for (int j = 0; j < width; j++) {
float r_, g_, b_;
convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_);
histThr[static_cast<int>(igammatab[r_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[g_]) >> histcompr]++;
histThr[static_cast<int>(igammatab[b_]) >> histcompr]++;
}
} }
#ifdef _OPENMP
#pragma omp critical
#endif
{
histogram += histThr;
}
}
} }
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override
@ -1585,6 +1624,7 @@ public:
histogram.clear(); histogram.clear();
avg_r = avg_g = avg_b = 0.; avg_r = avg_g = avg_b = 0.;
n = 0; n = 0;
const LUTf& igammatab = getigammatab();
for (unsigned int i = 0; i < (unsigned int)(height); i++) for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) { for (unsigned int j = 0; j < (unsigned int)(width); j++) {
@ -1592,9 +1632,9 @@ public:
convertTo<T, float>(r(i, j), r_); convertTo<T, float>(r(i, j), r_);
convertTo<T, float>(g(i, j), g_); convertTo<T, float>(g(i, j), g_);
convertTo<T, float>(b(i, j), b_); convertTo<T, float>(b(i, j), b_);
int rtemp = igammasrgb (r_); int rtemp = igammatab[r_];
int gtemp = igammasrgb (g_); int gtemp = igammatab[g_];
int btemp = igammasrgb (b_); int btemp = igammatab[b_];
histogram[rtemp >> compression]++; histogram[rtemp >> compression]++;
histogram[gtemp >> compression] += 2; histogram[gtemp >> compression] += 2;
@ -1621,6 +1661,9 @@ public:
int n = 0; int n = 0;
//int p = 6; //int p = 6;
#ifdef _OPENMP
#pragma omp parallel for reduction(+:avg_r,avg_g,avg_b,n) schedule(dynamic,16)
#endif
for (unsigned int i = 0; i < (unsigned int)(height); i++) for (unsigned int i = 0; i < (unsigned int)(height); i++)
for (unsigned int j = 0; j < (unsigned int)(width); j++) { for (unsigned int j = 0; j < (unsigned int)(width); j++) {
float r_, g_, b_; float r_, g_, b_;