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

added PDAF pattern for the Sony A9

Browse Source
This commit is contained in:
Alberto Griggio 2018-03-06 09:37:37 +01:00
parent 3422dc7173
commit 5ffe11fa8b
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/pdaflinesfilter.cc
View File

@ -32,7 +32,8 @@ PDAFLinesFilter::PDAFLinesFilter(RawImage *ri):
W_(ri->get_width()), W_(ri->get_width()),
H_(ri->get_height()) H_(ri->get_height())
{ {
if (ri_->get_maker() == "Sony" && ri_->get_model() == "ILCE-7M3") { if (ri_->get_maker() == "Sony") {
if (ri_->get_model() == "ILCE-7M3") {
// A7III, from https://www.dpreview.com/forums/post/60843139 // A7III, from https://www.dpreview.com/forums/post/60843139
// in the original post: // in the original post:
// P 5 P 17 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 // P 5 P 17 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11
@ -43,13 +44,22 @@ PDAFLinesFilter::PDAFLinesFilter(RawImage *ri):
0, 12, 24, 36, 54, 66, 72, 84, 96, 114, 120, 132, 150, 156, 174, 180, 192, 204, 216, 234, 240, 252, 264, 276, 282, 300, 306, 324, 336, 342, 360, 372, 384, 402, 414, 420 0, 12, 24, 36, 54, 66, 72, 84, 96, 114, 120, 132, 150, 156, 174, 180, 192, 204, 216, 234, 240, 252, 264, 276, 282, 300, 306, 324, 336, 342, 360, 372, 384, 402, 414, 420
}; };
offset_ = 9; offset_ = 9;
} else if (ri_->get_maker() == "Sony" && ri_->get_model() == "ILCE-6000") { } else if (ri_->get_model() == "ILCE-6000") {
// detected by hand, using the picture from https://www.dpreview.com/forums/thread/3923513 // detected by hand, using the picture from https://www.dpreview.com/forums/thread/3923513
// P 11 P 23 P 17 P 17 P 17 P 23 P 11 P 17 P 17 P 17 P 23 P 11 P 23 P 11 P 17 P 23 P 11 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 23 P 11 P 17 P 11 P 23 // P 11 P 23 P 17 P 17 P 17 P 23 P 11 P 17 P 17 P 17 P 23 P 11 P 23 P 11 P 17 P 23 P 11 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 17 P 23 P 17 P 11 P 17 P 17 P 23 P 11 P 17 P 11 P 23
pattern_ = { pattern_ = {
0, 12, 36, 54, 72, 90, 114, 126, 144, 162, 180, 204, 216, 240, 252, 270, 294, 306, 324, 342, 366, 384, 396, 414, 432, 450, 474, 492, 504, 522, 540, 564, 576, 594, 606, 630 0, 12, 36, 54, 72, 90, 114, 126, 144, 162, 180, 204, 216, 240, 252, 270, 294, 306, 324, 342, 366, 384, 396, 414, 432, 450, 474, 492, 504, 522, 540, 564, 576, 594, 606, 630
}; };
offset_ = 3; offset_ = 3;
} else if (ri_->get_model() == "ILCE-9") {
// the A9 is the same as the A7III, rotated of 1 position
// source: https://www.dpreview.com/forums/post/60857788
// P 11 P 11 P 11 P 17 P 11 P 5 P 11 P 11 P 17 P 5 P 11 P 17 P 5 P 17 P 5 P 11 P 11 P 11 P 17 P 5 P 11 P 11 P 11 P 5 P 17 P 5 P 17 P 11 P 5 P 17 P 11 P 11 P 17 P 11 P 5
pattern_ = {
0, 12, 24, 36, 54, 66, 72, 84, 96, 114, 120, 132, 150, 156, 174, 180, 192, 204, 216, 234, 240, 252, 264, 276, 282, 300, 306, 324, 336, 342, 360, 372, 384, 402, 414, 420
};
offset_ = -7;
}
} }
} }
@ -81,7 +91,7 @@ int PDAFLinesFilter::mark(array2D<float> &rawData, PixelsMap &bpMap)
} }
found += n; found += n;
if (n && settings->verbose) { if (n && settings->verbose) {
std::cout << "marked " << n << "pixels in PDAF line at " << y << std::endl; std::cout << "marked " << n << " pixels in PDAF line at " << y << std::endl;
} }
} else if (y > yy) { } else if (y > yy) {
++idx; ++idx;