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

pixelshift: Correction for adaptive mode

Browse Source
This commit is contained in:
heckflosse 2016-11-24 15:11:07 +01:00
parent fe5f862c09
commit d83834d4e6
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtengine/pixelshift.cc
View File

@ -40,13 +40,14 @@ float greenDiff(float a, float b, bool adaptive, float scale, float stddevFactor
{ {
// calculate the difference between to green samples // calculate the difference between to green samples
// add a small epsilon to avoid division by zero // add a small epsilon to avoid division by zero
float diff = std::fabs(a - b) / (std::max(a, b) + 0.01f); float maxVal = std::max(a, b) + 0.01f;
float diff = std::fabs(a - b) / maxVal;
if(adaptive) { if(adaptive) {
float avg = (a+b)/2.f; float avg = (a+b)/2.f;
avg *= scale; // revert the colour scaling avg *= scale; // revert the colour scaling
prnu *= (avg * eperIso); prnu *= (avg * eperIso);
float stddev = sqrtf(avg * eperIso + nreadIso * nreadIso + prnu * prnu); float stddev = sqrtf(avg * eperIso + nreadIso * nreadIso + prnu * prnu);
float korr = stddevFactor * stddev / (a * scale); float korr = stddevFactor * stddev / (maxVal * scale);
diff -= korr; diff -= korr;
} }
return diff; return diff;
@ -77,13 +78,9 @@ void RawImageSource::pixelshift_simple(int winx, int winy, int winw, int winh, b
for(int i=2; i < 65536; i+=2) for(int i=2; i < 65536; i+=2)
log2Lut[i>>1] = 2.f * log2(i) / 100.f; log2Lut[i>>1] = 2.f * log2(i) / 100.f;
// const float eperIso = 0.75f * idata->getISOSpeed() / 100;
eperIso *= (idata->getISOSpeed() / 100); eperIso *= (idata->getISOSpeed() / 100);
// nreadIso *= (idata->getISOSpeed() / 100);
prnu /= 100.f; prnu /= 100.f;
// const float nreadIso = 5.f * idata->getISOSpeed() / 100;
// const float prnu = 1.f;
// const float stddevFactor = 4.f;
// If the values of two corresponding green pixels differ my more then motionThreshold %, the pixel will be treated as a badGreen pixel // If the values of two corresponding green pixels differ my more then motionThreshold %, the pixel will be treated as a badGreen pixel
float motionThreshold = 1.f - (motion / 100.f); float motionThreshold = 1.f - (motion / 100.f);
// For shades of green motion indicators // For shades of green motion indicators