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

About 3x speed for scale_colors in rtthumbnail.cc also for xtrans files

Browse Source
This commit is contained in:
heckflosse
2017-04-06 16:16:08 +02:00
parent 850577b8c7
commit 6917f6bba3
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/rawimage.h
View File

@@ -129,10 +129,6 @@ protected:
char* profile_data; // Embedded ICC color profile char* profile_data; // Embedded ICC color profile
float* allocation; // pointer to allocated memory float* allocation; // pointer to allocated memory
int maximum_c4[4]; int maximum_c4[4];
bool isXtrans() const
{
return filters == 9;
}
bool isFoveon() const bool isFoveon() const
{ {
return is_foveon; return is_foveon;
@@ -309,6 +305,11 @@ public:
return (filters != 0 && filters != 9); return (filters != 0 && filters != 9);
} }
bool isXtrans() const
{
return filters == 9;
}
public: public:
// dcraw functions // dcraw functions
void scale_colors() void scale_colors()

32
rtengine/rtthumbnail.cc
View File

@@ -62,8 +62,8 @@ namespace
void scale_colors(rtengine::RawImage *ri, float scale_mul[4], float cblack[4]) void scale_colors(rtengine::RawImage *ri, float scale_mul[4], float cblack[4])
{ {
BENCHFUNMICRO BENCHFUNMICRO
if(ri->isBayer()) {
DCraw::dcrawImage_t image = ri->get_image(); DCraw::dcrawImage_t image = ri->get_image();
if(ri->isBayer()) {
const int height = ri->get_iheight(); const int height = ri->get_iheight();
const int width = ri->get_iwidth(); const int width = ri->get_iwidth();
for(int row = 0; row < height; ++row) { for(int row = 0; row < height; ++row) {
@@ -87,8 +87,34 @@ void scale_colors(rtengine::RawImage *ri, float scale_mul[4], float cblack[4])
image[row * width + col][c0] = rtengine::CLIP(val0); image[row * width + col][c0] = rtengine::CLIP(val0);
} }
} }
} else if(ri->isXtrans()) {
const int height = ri->get_iheight();
const int width = ri->get_iwidth();
unsigned c[6];
for(int row = 0; row < height; ++row) {
for(int i = 0; i < 6; ++i) {
c[i] = ri->XTRANSFC(row,i);
}
int col = 0;
for(; col < width - 5; col += 6) {
for(int i = 0; i < 6; ++i) {
const unsigned ccol = c[i];
float val = image[row * width + col + i][ccol];
val -= cblack[ccol];
val *= scale_mul[ccol];
image[row * width + col + i][ccol] = rtengine::CLIP(val);
}
}
for(; col < width; ++col) { // remaining columns
const unsigned ccol = ri->XTRANSFC(row,col);
float val = image[row * width + col][ccol];
val -= cblack[ccol];
val *= scale_mul[ccol];
image[row * width + col][ccol] = rtengine::CLIP(val);
}
}
} else { } else {
DCraw::dcrawImage_t image = ri->get_image();
const int size = ri->get_iheight() * ri->get_iwidth(); const int size = ri->get_iheight() * ri->get_iwidth();
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
for (int j = 0; j < 4; ++j) { for (int j = 0; j < 4; ++j) {
@@ -908,7 +934,7 @@ IImage8* Thumbnail::quickProcessImage (const procparams::ProcParams& params, int
IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rheight, TypeInterpolation interp, std::string camName, IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rheight, TypeInterpolation interp, std::string camName,
double focalLen, double focalLen35mm, float focusDist, float shutter, float fnumber, float iso, std::string expcomp_, double& myscale) double focalLen, double focalLen35mm, float focusDist, float shutter, float fnumber, float iso, std::string expcomp_, double& myscale)
{ {
BENCHFUN // BENCHFUN
// check if the WB's equalizer value has changed // check if the WB's equalizer value has changed
if (wbEqual < (params.wb.equal - 5e-4) || wbEqual > (params.wb.equal + 5e-4) || wbTempBias < (params.wb.tempBias - 5e-4) || wbTempBias > (params.wb.tempBias + 5e-4)) { if (wbEqual < (params.wb.equal - 5e-4) || wbEqual > (params.wb.equal + 5e-4) || wbTempBias < (params.wb.tempBias - 5e-4) || wbTempBias > (params.wb.tempBias + 5e-4)) {