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

Add an average filter for pixel shift to process the moving parts, closes #6376 (#6380)

Browse Source
This commit is contained in:
Ingo Weyrich
2021-11-10 17:54:57 +01:00
committed by GitHub
parent 7a5c95ce3f
commit e4ee63850d
9 changed files with 72 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
rtengine/pixelshift.cc
View File

@@ -334,7 +334,7 @@ BENCHFUN
if(motionDetection) {
if(!showOnlyMask) {
if(bayerParams.pixelShiftMedian) { // We need the demosaiced frames for motion correction
if(bayerParams.pixelShiftMedian || bayerParams.pixelShiftAverage) { // We need the demosaiced frames for motion correction
if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(procparams::RAWParams::BayerSensor::PSDemosaicMethod::LMMSE)) {
lmmse_interpolate_omp(winw, winh, *(rawDataFrames[0]), red, green, blue, bayerParams.lmmse_iterations);
} else if (bayerParams.pixelShiftDemosaicMethod == bayerParams.getPSDemosaicMethodString(procparams::RAWParams::BayerSensor::PSDemosaicMethod::AMAZEVNG4)) {
@@ -359,22 +359,42 @@ BENCHFUN
amaze_demosaic_RT(winx, winy, winw, winh, *(rawDataFrames[i + 1]), redTmp[i], greenTmp[i], blueTmp[i], options.chunkSizeAMAZE, options.measure);
}
}
if(bayerParams.pixelShiftMedian) {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#pragma omp parallel for schedule(dynamic,16)
#endif
for(int i = winy + border; i < winh - border; i++) {
for(int j = winx + border; j < winw - border; j++) {
red[i][j] = median(red[i][j], redTmp[0][i + 1][j], redTmp[1][i + 1][j + 1], redTmp[2][i][j + 1]);
}
for(int i = winy + border; i < winh - border; i++) {
for(int j = winx + border; j < winw - border; j++) {
red[i][j] = median(red[i][j], redTmp[0][i + 1][j], redTmp[1][i + 1][j + 1], redTmp[2][i][j + 1]);
}
for(int j = winx + border; j < winw - border; j++) {
green[i][j] = median(green[i][j], greenTmp[0][i + 1][j], greenTmp[1][i + 1][j + 1], greenTmp[2][i][j + 1]);
}
for(int j = winx + border; j < winw - border; j++) {
green[i][j] = median(green[i][j], greenTmp[0][i + 1][j], greenTmp[1][i + 1][j + 1], greenTmp[2][i][j + 1]);
}
for(int j = winx + border; j < winw - border; j++) {
blue[i][j] = median(blue[i][j], blueTmp[0][i + 1][j], blueTmp[1][i + 1][j + 1], blueTmp[2][i][j + 1]);
for(int j = winx + border; j < winw - border; j++) {
blue[i][j] = median(blue[i][j], blueTmp[0][i + 1][j], blueTmp[1][i + 1][j + 1], blueTmp[2][i][j + 1]);
}
}
} else {
#ifdef _OPENMP
#pragma omp parallel for schedule(dynamic,16)
#endif
for(int i = winy + border; i < winh - border; i++) {
for(int j = winx + border; j < winw - border; j++) {
red[i][j] = 0.25f * ((red[i][j] + redTmp[0][i + 1][j]) + (redTmp[1][i + 1][j + 1] + redTmp[2][i][j + 1]));
}
for(int j = winx + border; j < winw - border; j++) {
green[i][j] = 0.25f * ((green[i][j] + greenTmp[0][i + 1][j]) + (greenTmp[1][i + 1][j + 1] + greenTmp[2][i][j + 1]));
}
for(int j = winx + border; j < winw - border; j++) {
blue[i][j] = 0.25f * ((blue[i][j] + blueTmp[0][i + 1][j]) + (blueTmp[1][i + 1][j + 1] + blueTmp[2][i][j + 1]));
}
}
}
} else {