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

Dual demosaic: added DCB+VNG4, RCD+VNG4. Cleaned code. Prepared engine for semi-automatic calculation of contrast threshold

Browse Source
This commit is contained in:
heckflosse
2018-06-24 17:01:15 +02:00
parent 01d4ed3025
commit f7578c1512
18 changed files with 298 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
rtengine/xtrans_demosaic.cc
View File

@@ -1019,60 +1019,5 @@ void RawImageSource::fast_xtrans_interpolate (const array2D<float> &rawData, arr
#undef fcol
#undef isgreen
void RawImageSource::xtrans_4pass_demosaic_RT(int passes, bool useCieLab, double contrast)
{
BENCHFUN
if (contrast == 0.0) {
// contrast == 0.0 means only AMaZE will be used
xtrans_interpolate (passes, useCieLab);
return;
}
xtrans_interpolate (passes, useCieLab);
array2D<float> redTmp(W, H);
array2D<float> greenTmp(W, H);
array2D<float> blueTmp(W, H);
array2D<float> L(W, H);
fast_xtrans_interpolate(rawData, redTmp, greenTmp, blueTmp);
const float xyz_rgb[3][3] = { // XYZ from RGB
{ 0.412453, 0.357580, 0.180423 },
{ 0.212671, 0.715160, 0.072169 },
{ 0.019334, 0.119193, 0.950227 }
};
#pragma omp parallel
{
#pragma omp for
for(int i = 0; i < H; ++i) {
Color::RGB2L(red[i], green[i], blue[i], L[i], xyz_rgb, W);
}
}
// calculate contrast based blend factors to use vng4 in regions with low contrast
JaggedArray<float> blend(W, H);
buildBlendMask(L, blend, W, H, contrast / 100.f);
// the following is split into 3 loops intentionally to avoid cache conflicts on CPUs with only 4-way cache
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
red[i][j] = intp(blend[i][j], red[i][j], redTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
green[i][j] = intp(blend[i][j], green[i][j], greenTmp[i][j]);
}
}
#pragma omp parallel for
for(int i = 0; i < H; ++i) {
for(int j = 0; j < W; ++j) {
blue[i][j] = intp(blend[i][j], blue[i][j], blueTmp[i][j]);
}
}
}
}