camconst.json: rename pdafPattern -> pdaf_pattern and pdafOffset -> pdaf_offset
this is for consistency with the other entries
This commit is contained in:
Alberto Griggio
parent
d0ec3f2dbc
commit
0e22f0b610
@ -311,17 +311,17 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
|
||||
}
|
||||
}
|
||||
|
||||
ji = cJSON_GetObjectItem(js, "pdafPattern");
|
||||
ji = cJSON_GetObjectItem(js, "pdaf_pattern");
|
||||
|
||||
if (ji) {
|
||||
if (ji->type != cJSON_Array) {
|
||||
fprintf(stderr, "\"pdafPattern\" must be an array\n");
|
||||
fprintf(stderr, "\"pdaf_pattern\" must be an array\n");
|
||||
goto parse_error;
|
||||
}
|
||||
|
||||
for (ji = ji->child; ji != nullptr; ji = ji->next) {
|
||||
if (ji->type != cJSON_Number) {
|
||||
fprintf(stderr, "\"pdafPattern\" array must contain numbers\n");
|
||||
fprintf(stderr, "\"pdaf_pattern\" array must contain numbers\n");
|
||||
goto parse_error;
|
||||
}
|
||||
|
||||
@ -329,11 +329,11 @@ CameraConst::parseEntry(void *cJSON_, const char *make_model)
|
||||
}
|
||||
}
|
||||
|
||||
ji = cJSON_GetObjectItem(js, "pdafOffset");
|
||||
ji = cJSON_GetObjectItem(js, "pdaf_offset");
|
||||
|
||||
if (ji) {
|
||||
if (ji->type != cJSON_Number) {
|
||||
fprintf(stderr, "\"pdafOffset\" must contain a number\n");
|
||||
fprintf(stderr, "\"pdaf_offset\" must contain a number\n");
|
||||
goto parse_error;
|
||||
}
|
||||
|
||||
|
||||
@ -83,10 +83,10 @@ Examples:
|
||||
// instead, to take care of possible light leaks from the light sensing area to the optically black (masked)
|
||||
// area or sensor imperfections at the outer borders.
|
||||
|
||||
// list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdafOffset" value (see below)
|
||||
"pdafPattern" : [ 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 ],
|
||||
// list of indices of the rows with on-sensor PDAF pixels, for cameras that have such features. The indices here form a pattern that is repeated for the whole height of the sensor. The values are relative to the "pdaf_offset" value (see below)
|
||||
"pdaf_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 ],
|
||||
// index of the first row of the PDAF pattern in the sensor (0 is the topmost row). Allowed to be negative for convenience (this means that the first repetition of the pattern doesn't start from the first row)
|
||||
"pdafOffset" : 3
|
||||
"pdaf_offset" : 3
|
||||
},
|
||||
|
||||
{
|
||||
@ -2308,8 +2308,8 @@ Camera constants:
|
||||
"ranges": { "black": 512, "white": 16300 },
|
||||
// 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
|
||||
"pdafPattern" : [ 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 ],
|
||||
"pdafOffset" : 3
|
||||
"pdaf_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 ],
|
||||
"pdaf_offset" : 3
|
||||
},
|
||||
|
||||
{ // Quality A
|
||||
@ -2318,8 +2318,8 @@ Camera constants:
|
||||
"raw_crop": [ 0, 0, 6024, 4024 ],
|
||||
"ranges": { "black": 512, "white": 16300 },
|
||||
// contributed by Horshak from https://www.dpreview.com/forums/post/60873077
|
||||
"pdafPattern" : [ 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 ],
|
||||
"pdafOffset" : 3
|
||||
"pdaf_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 ],
|
||||
"pdaf_offset" : 3
|
||||
},
|
||||
|
||||
{ // Quality C, only pdaf data
|
||||
@ -2330,8 +2330,8 @@ Camera constants:
|
||||
//
|
||||
// rotated to match the start of the frame
|
||||
// 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
|
||||
"pdafPattern" : [ 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],
|
||||
"pdafOffset" : 9
|
||||
"pdaf_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],
|
||||
"pdaf_offset" : 9
|
||||
},
|
||||
|
||||
{ // Quality A, correction for frame width
|
||||
@ -2353,8 +2353,8 @@ Camera constants:
|
||||
"raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
|
||||
"ranges": { "black": 512, "white": 16300 },
|
||||
// PDAF info provided by Horshack with the rawshack tool (http://testcams.com/rawshack/)
|
||||
"pdafPattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
|
||||
"pdafOffset" : 31
|
||||
"pdaf_pattern" : [ 0,24,36,60,84,120,132,156,192,204,240,252,276,300,324,360,372,396,420 ],
|
||||
"pdaf_offset" : 31
|
||||
},
|
||||
|
||||
{ // Quality C, color matrix copied from ILCE-9, LongExposures 2-3sec only
|
||||
@ -2384,8 +2384,8 @@ Camera constants:
|
||||
"dcraw_matrix": [ 6640,-1847,-503,-5238,13010,2474,-993,1673,6527 ], // DNG_v10.1 D65
|
||||
"raw_crop": [ 0, 0, -36, 0 ], // full raw frame 8000x5320 - 36 rightmost columns are garbage
|
||||
"ranges": { "black": 512, "white": 16300 },
|
||||
"pdafPattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
|
||||
"pdafOffset" : 31
|
||||
"pdaf_pattern" : [0, 24, 36, 60, 84, 120, 132, 156, 192, 204, 240, 252, 276, 300, 324, 360, 372, 396, 420, 444, 480, 492, 504, 540, 564, 576, 612, 636, 660, 696, 720, 732, 756, 780, 804, 840],
|
||||
"pdaf_offset" : 31
|
||||
},
|
||||
|
||||
{ // Quality B, color matrix copied from a7rm2
|
||||
@ -2396,8 +2396,8 @@ Camera constants:
|
||||
// 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
|
||||
"pdafPattern" : [ 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 ],
|
||||
"pdafOffset" : -7
|
||||
"pdaf_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 ],
|
||||
"pdaf_offset" : -7
|
||||
},
|
||||
|
||||
{ // Quality B, correction for frame width
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user