camconst.json updated by IliasG, closes #3298

This commit is contained in:
Morgan Hardwood 2016-09-24 13:57:28 +02:00
parent 2d0e5e4fee
commit a5af13228d

View File

@ -500,32 +500,34 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
}
},
{ // Quality C, Color Matrix same as 80D (color model 13)
// White Levels not properly indicated (look same as 80D's so copied from there), aperture scaling missing, scaling factors are guessed
{ // Quality B, some intermediate ISO samples missing, LENR samples missing
// so White Levels not properly indicated, some aperture scaling missing
"make_model": "Canon EOS 5D Mark IV",
"dcraw_matrix": [ 7457,-671,-937,-4849,12495,2643,-1213,2354,5492 ], // 80D, DNG_V9.5 D65
"dcraw_matrix": [ 6446,-366,-864,-4436,12204,2513,-952,2496,6348 ], // DNG_V9.7 D65
"raw_crop": [ 136, 42, 6740, 4500 ], // full size 6880x4544, official crop 148,54,6867,4533
"masked_areas": [ 54, 4, 4534, 132 ],
"ranges": {
"white": [
{ "iso": [ 100, 125, 200, 250 ], "levels": 16200 }, // nominal 16383, LENR blue 16243
{ "iso": [ 160 ], "levels": 13000 }, // nominal 13097,
{ "iso": [ 320, 640, 1250, 2500, 5000, 10000 ], "levels": 13200 }, // G1,G2 13415
{ "iso": [ 400, 500, 800, 1000, 1600, 2000, 3200, 4000 ], "levels": 16150 }, // nominal 16383, LENR ISO3200 16150
{ "iso": [ 6400, 8000, 12800, 16000, 25600 ], "levels": 16000 } // R,G1,G2 16383, B 16243, LENR B 16000
{ "iso": [ 100, 125, 200, 250 ], "levels": 16100 }, // nominal 16383, LENR?
{ "iso": [ 160 ], "levels": 13000 }, // nominal f8-13105
{ "iso": [ 320, 640, 1250, 2500 ], "levels": 13300 }, // G1,G2 F4.0-13422-F2.8-13562-13616
{ "iso": [ 5000, 10000, 20000 ], "levels": 13200 }, // G1,G2 F4.0-13422-F2.8-13562-13616
{ "iso": [ 400, 500, 800, 1000, 1600, 2000, 3200, 4000 ], "levels": 16100 }, // nominal 16383,
{ "iso": [ 6400, 8000, 12800, 16000, 25600, 32000 ], "levels": 16000 }, // R,G1,G2 16383, LENR?
{ "iso": [ 40000, 51200, 102400 ], "levels": 15800 } // 16383, LENR?
],
"white_max": 16383,
"aperture_scaling": [
/* note: need for more data to properly fill all scale factors */
{ "aperture": 1.4, "scale_factor": 1.200 }, // guessed
{ "aperture": 1.6, "scale_factor": 1.080 }, // guessed
{ "aperture": 1.8, "scale_factor": 1.055 }, // guessed
{ "aperture": 2.0, "scale_factor": 1.030 }, // guessed
{ "aperture": 2.2, "scale_factor": 1.025 }, // guessed
{ "aperture": 2.5, "scale_factor": 1.020 }, // guessed
{ "aperture": 2.8, "scale_factor": 1.000 }, //
{ "aperture": 3.2, "scale_factor": 1.000 }, //
{ "aperture": 3.5, "scale_factor": 1.000 } //
{ "aperture": 1.4, "scale_factor": 1.130 }, //
{ "aperture": 1.6, "scale_factor": 1.100 }, //
{ "aperture": 1.8, "scale_factor": 1.070 }, //
{ "aperture": 2.0, "scale_factor": 1.050 }, // 14171/13422=1.055
{ "aperture": 2.2, "scale_factor": 1.035 }, // 13954/13422=1.039
{ "aperture": 2.5, "scale_factor": 1.025 }, // 11400/11000=1.028
{ "aperture": 2.8, "scale_factor": 1.015 }, // 13562/13422 - 13731,13688,13562
{ "aperture": 3.2, "scale_factor": 1.010 }, //
{ "aperture": 3.5, "scale_factor": 1.005 } // 13508/13422
]
}
},
@ -1287,6 +1289,12 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
"ranges": { "black": 0, "white": 16300 } // WL typical 16383 set to 16300 for safety
},
{ // Quality B
"make_model": "Nikon D3400",
"dcraw_matrix": [ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 ], // adobe dng_v9.7 d65
"ranges": { "white": 16300 } // WL value is for 14-bit files, RT auto adapts it for 12-bit files. WL typical 16383 set to 16300 for safety
},
{ // Quality B
"make_model": "Nikon D5300",
"dcraw_matrix": [ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 ], // adobe dng_v8.8 d65
@ -1671,6 +1679,18 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
{ "iso": [ 160, 200, 250, 320, 400,500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095
]
}
},
{ // Quality B, Same as Panasonic G7
"make_model": [ "Panasonic DMC-G8", "Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85" ],
"dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ],// DNG_v9.7 D65
"ranges": {
"black": 16, // 16 is BL offset. Dcraw/RT read the base black from exif and calculates total BL = BLbase+BLoffset
"white": [
{ "iso": 100, "levels": 2300 }, // gaussian 2300-2700 exif_linearitylimit 2111
{ "iso": 125, "levels": 3180 }, // gaussian 3200-3600 exif_linearitylimit 2626
{ "iso": [ 160, 200, 250, 320, 400,500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095
]
}
},
{ // Quality B,
"make_model": "Panasonic DMC-GX8",