diff --git a/rtengine/camconst.json b/rtengine/camconst.json index c683eb07f..4809ff1a3 100755 --- a/rtengine/camconst.json +++ b/rtengine/camconst.json @@ -464,6 +464,32 @@ Quality X: unknown, ie we knowing to little about the camera properties to know ] } }, + { // Quality A, ISO and aperture WL data by CharlyW at RawTherapee forums, missing samples safely guessed + "make_model": "Canon EOS 7D", + "dcraw_matrix": [ 5962,-171,-732,-4189,12307,2099,-911,1981,6304 ], // Colin Walker + // "dcraw_matrix": [ 6844,-996,-856,-3876,11761,2396,-593,1772,6198 ], // dcraw + "ranges": { + "white": [ + { "iso": [ 100, 125 ], "levels": 13480 }, // typical 13584 + { "iso": [ 160, 320, 640, 1250, 2500 ], "levels": 12550 }, // typical 12650 + { "iso": [ 200, 250, 400, 500, 800, 1000, 1600, 2000, 3200, 4000, 5000, 6400, 12800 ], "levels": 15200 } // typical 15304 + ], + "white_max": 16383, + "aperture_scaling": [ + /* note: no scale factors known for f/1.2 and f/1.0 (no lenses to test with), but the + typical 12650 white levels maxes out at "white_max" for f/1.4 and below anyway. */ + { "aperture": 1.4, "scale_factor": 1.250 }, // guessed + { "aperture": 1.6, "scale_factor": 1.150 }, // guessed + { "aperture": 1.8, "scale_factor": 1.110 }, // 15196/13584 + { "aperture": 2.0, "scale_factor": 1.080 }, // 14734/13584 + { "aperture": 2.2, "scale_factor": 1.050 }, // 14386/13584 + { "aperture": 2.5, "scale_factor": 1.040 }, // 14272/13584 + { "aperture": 2.8, "scale_factor": 1.030 }, // 14042/13584 + { "aperture": 3.2, "scale_factor": 1.015 }, // guessed + { "aperture": 3.5, "scale_factor": 1.000 } // guessed negligible + ] + } + }, { // Quality A - ISO and aperture WL data by Ilias at Avclub gr forums "make_model": "Canon EOS 40D", @@ -516,6 +542,31 @@ Quality X: unknown, ie we knowing to little about the camera properties to know ] } }, + { // Quality A, ISO and aperture WL data copyed from Shalrath's 60D data at RawTherapee forums + "make_model": "Canon EOS 60Da", + "dcraw_matrix": [ 17492,-7240,-2023,-1791,10323,1701,-186,1329,5406 ], // 60Da dng d65 + "ranges": { + "white": [ + { "iso": [ 100, 125 ], "levels": 13480 }, // typical 13583 + { "iso": [ 160, 320, 640, 1250, 2500 ], "levels": 12550 }, // typical 12650 + { "iso": [ 200, 250, 400, 500, 800, 1000, 1600, 2000, 3200, 4000, 5000, 6400, 12800 ], "levels": 15200 } // typical 15304 + ], + "white_max": 16383, + "aperture_scaling": [ + /* note: no scale factors known for f/1.2 and f/1.0 (had no lenses to test with), but the + typical 12650 white levels maxes out at "white_max" for f/1.4 and below anyway. */ + { "aperture": 1.4, "scale_factor": 1.300 }, // gaps 81of301 + { "aperture": 1.6, "scale_factor": 1.200 }, + { "aperture": 1.8, "scale_factor": 1.140 }, + { "aperture": 2.0, "scale_factor": 1.080 }, // gaps 1of11 + { "aperture": 2.2, "scale_factor": 1.060 }, + { "aperture": 2.5, "scale_factor": 1.050 }, + { "aperture": 2.8, "scale_factor": 1.030 }, + { "aperture": 3.2, "scale_factor": 1.015 }, + { "aperture": 3.5, "scale_factor": 1.000 } // no sample but it would be negligible + ] + } + }, { // Quality A, ISO and aperture WL data by Shalrath at RawTherapee forums "make_model": "Canon EOS 60D", "dcraw_matrix": [ 6719,-994,-925,-4408,12426,2211,-887,2129,6051 ], @@ -542,7 +593,7 @@ Quality X: unknown, ie we knowing to little about the camera properties to know } }, { // Quality B, more aperture scale factors needed - "make_model": "Canon EOS 70D", + "make_model": [ "Canon EOS 70D", "Canon EOS 7D Mark II" ], // guess for 7DII as the sensors look "same" "dcraw_matrix": [ 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 ], "ranges": { "white": [ @@ -660,6 +711,15 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "ranges": { "white": 16300 } }, + { // Quality X, preliminary support, color data guessed from G16 + "make_model": "Canon PowerShot G7 X", + "dcraw_matrix": [ 8020,-2687,-682,-3704,11879,2052,-965,1921,5556 ], // D65 matrix copy from Canon powershot G16 + // "raw_crop": [ 116, 24, 5504, 3680 ], // Sensor size 5632x3710. Largest usefull frame 120-5616X28-3702 = 5504x3682, 4pix RTborders, Left Border 120-4, Top border 28-4 + "raw_crop": [ 128, 36, 5480, 3656 ], // Default official 3/2 frame 5472X3648, 4pix borders, Left Border 132-4, Top border 40-4 + "masked_areas": [ 40, 4, 3680, 76 ], + "ranges": { "white": 4080 } + }, + { // Quality A, changes for raw crop which is wrong (larger) in Dcraw "make_model": "Canon PowerShot S120", "dcraw_matrix": [ 6961,-1685,-695,-4625,12945,1836,-1114,2152,5518 ], @@ -668,59 +728,68 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "ranges": { "white": 4050 } }, - { // Quality A - "make_model": "FUJIFILM S1", - // "dcraw_matrix": [ 11705,-4262,-1107,-2282,10791,1709,-555,1713,4945 ] // MATRIX FROM FUJI SL1000 - "dcraw_matrix": [ 12297,-4882,-1202,-2106,10691,1623,-88,1312,4790 ] // DNG_v8.5 D65 - }, - - { // Quality B - "make_model": [ "FUJIFILM X-T1", "FUJIFILM X-E2" ], - "dcraw_matrix": [ 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 ], // DNG D65 -// "dcraw_matrix": [ 9289,-3279,-632,-3539,11137,2758,-1049,1950,6544 ], // X-RITE D55 - "ranges": { "white": 16100 } - }, - + { // Quality X, preliminary support, color data guessed + "make_model": "Canon PowerShot SX60 HS", + "dcraw_matrix": [ 12432,-4753,-1247,-2110,10691,1629,-412,1623,4926 ], // copy from SX50 + "raw_crop": [ 120, 34, 4616, 3464 ], // full raw 4768x3516, Usable 96,16,4672,3498 - Canon official 4608x3456 left 124 top 38, + "masked_areas": [ 20, 2, 3480, 80 ], + "ranges": { "white": 4050 } // nominal 4080-4093 + }, - { // Quality B, - "make_model": [ "Nikon 1 V3", "Ninon 1 J4" ], // Same format - "dcraw_matrix": [ 5958,-1559,-571,-4021,11453,2939,-634,1548,5087 ], // matrix from DNG_v8.5 d65 - // "dcraw_matrix": [ 5306,-1066,-469,-3865,11189,3076,-399,1341,5120 ], // matrix dXo D50, - "ranges": { "black": 200, "white": 4080 } // exif 800 - }, - { // Quality B, conflict with "Nikon 1 " in Dcraw_v9.21_r1.464 2014/06/13 - "make_model": "Nikon 1 S2", // - "dcraw_matrix": [ 6612,-1342,-618,-3338,11055,2623,-174,1792,5075 ], // matrix from DNG_v8.5 d65 - "ranges": { "black": 200, "white": 4080 } // exif 800 - }, - - { // quality B, lacks aperture and ISO scaling, known to exist, but little to gain as the levels are so close to white_max - "make_model": "Nikon D7000", - "dcraw_matrix": [ 7530,-1942,-255,-4318,11390,3362,-926,1694,7649 ], // matrix provided by Tanveer(tsk1979) - "ranges": { - // measured at ISO 100. ISO differences not measured, but known to exist - "white": [ 16370, 15760, 16370 ], // typical R 16383, G 15778, B 16383 + { // Quality A + "make_model": "FUJIFILM S1", + "dcraw_matrix": [ 12297,-4882,-1202,-2106,10691,1623,-88,1312,4790 ] // DNG_v8.5 D65 + }, + + { // Quality B + "make_model": [ "FUJIFILM X-T1", "FUJIFILM X-E2" ], + "dcraw_matrix": [ 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 ], // DNG D65 +// "dcraw_matrix": [ 9289,-3279,-632,-3539,11137,2758,-1049,1950,6544 ], // X-RITE D55 + "ranges": { "white": 16100 } + }, + + { // Quality B + "make_model": "FUJIFILM X30", + "dcraw_matrix": [ 12328,-5256,-1144,-4469,12927,1675,-87,1291,4351 ], // DNG8.7rc1 D65 + "ranges": { "white": 4048 } + }, + + + { // Quality A + "make_model": [ "Nikon 1 V3", "Nikon 1 J4" ], // Same format + "dcraw_matrix": [ 5958,-1559,-571,-4021,11453,2939,-634,1548,5087 ], // matrix from DNG_v8.5 d65 + // "dcraw_matrix": [ 5306,-1066,-469,-3865,11189,3076,-399,1341,5120 ], // matrix dXo D50, + "ranges": { "black": 200, "white": 4080 } // exif BL=800, lower WL to 4080 from 4095 due to some non linearity detected at raw highlights + }, + { // Quality A, + "make_model": "Nikon 1 S2", // + "dcraw_matrix": [ 6612,-1342,-618,-3338,11055,2623,-174,1792,5075 ], // matrix from DNG_v8.5 d65 + "ranges": { "black": 200, "white": 4080 } // exif BL=800 + }, + + { // quality B, lacks aperture and ISO scaling, known to exist, but little to gain as the levels are so close to white_max + "make_model": "Nikon D7000", + "dcraw_matrix": [ 7530,-1942,-255,-4318,11390,3362,-926,1694,7649 ], // matrix provided by Tanveer(tsk1979) + "ranges": { + // measured at ISO 100. ISO differences not measured, but known to exist + "white": [ 16370, 15760, 16370 ], // typical R 16383, G 15778, B 16383 "white_max": 16383 // aperture scaling not measured, but known to exist, at f/1.8 the G channels hits white_max } }, - // { // Quality A, new model, not in dcraw 9.20, conflict with D4 in dcraw 9.20, sRAW format not supported - // "make_model": "Nikon D4s", - // "dcraw_matrix": [ 8598,-2848,-857,-5618,13606,2195,-1002,1773,7137 ], - // "ranges": { "black": 768, "white": 16300 } - // }, - // { // Quality A, // correction for BL 147 to 150 and color matrix - // "make_model": "Nikon D3300", - // "dcraw_matrix": [ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 ], // matrix from adobe dcp d65 - // "ranges": { "black": 150, "white": 4095 } - // }, -// { // Quality B, does not work with 12bit files - experimenting with matrices -// "make_model": "Nikon D5300", -// "dcraw_matrix": [ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 ], // matrix from adobe dcp d65 -// "dcraw_matrix": [ 7009,-1699,-414,-5209,12641,2886,-1201,1904,7229 ], // Calculated from DxO d50 -// "ranges": { "black": 600 } // attention .. this is for 14bit files and has to be 150 for 12bit files -// }, + + { // Quality B, does not work with 12bit files + "make_model": "Nikon D5300", + "dcraw_matrix": [ 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 ], // adobe dcp d65 + "ranges": { "black": 600, "white": 16300 } // attention.. BL/WL values are for 14bit files, has to be BL150/WL4070 for 12bit files. WL typical 16383 set to 16300 for safety + }, + + { // Quality B, does not work with 12bit files + "make_model": "Nikon D750", + "dcraw_matrix": [ 9020,-2890,-715,-4535,12436,2348,-934,1919,7086 ], // adobe dcp d65 DNGv8.7rc1 + "ranges": { "black": 600, "white": 16300 } // attention.. BL/WL values are for 14bit files, has to be BL150/WL4070 for 12bit files. WL typical 16383 set to 16300 for safety + }, { // quality B, lacks WL measures at intermediate ISOs (160-250-320 ..) and measures at long exposures with LongExposureNoiseReduction // aperture scaling known to exist, but little to gain as the levels are so close to white_max @@ -729,7 +798,7 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "raw_crop": [ 0, 0, 6034, 4028 ], // Dcraw has no raw crop for D610 "ranges": { "white": [ - { "iso": [ 50, 100 ], "levels": [ 15800, 15700, 15800 ] }, // typical G1/G2 15778, R/B 15879 lowered to 15700, 158800 for possible WL distribution under LENR + { "iso": [ 50, 100 ], "levels": [ 15800, 15700, 15800 ] }, // typical G1/G2 15778, R/B 15879 lowered to 15700, 15800 for possible WL distribution under LENR { "iso": [ 200, 400, 800 ], "levels": [ 16300, 15700, 16300 ] }, // 15878, 16383 { "iso": 1600, "levels": [ 16300, 16100, 16300 ] }, // 16145-165, 16383 { "iso": [ 3200, 6400, 12800, 25600 ], "levels": [ 16300, 16300, 16300 ] } // 16383 @@ -737,7 +806,32 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "white_max": 16383 } }, - + + { // quality B; Data from RussellCottrell at RT forums. Largest aperture scale factor is 1.013, about 1/50th of a stop + "make_model": "Nikon D800E", + "dcraw_matrix": [ 7866,-2108,-555,-4869,12483,2681,-1176,2069,7501 ], // D800/D800E from dcraw.c + "ranges": { + "white": [ + { "iso": [ 100, 125, 160, 200, 250, 320, 400, 500, 640, 800, 1000, 1250 ], "levels": [ 16300, 15700, 16300 ] }, // 15779-15781 + { "iso": [ 1600 ], "levels": 16000 }, // 16085-16113 + { "iso": [ 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 16300 } // 16383 + ] + } + }, + { // quality B; Data from RusselCottrell at RT forums. sensor is not uniform + "make_model": "Nikon D700", + "dcraw_matrix": [ 8139,-2171,-663,-8747,16541,2295,-1925,2008,8093 ], + "ranges": { "white": 15800 } // Russell's lowest 15400.. nominal 15892 + }, + { // quality B, BL and colour matrix corrections for Dcraw's v9.22 r1467 preliminary support + // WL set at 16300 from nominal 16380 for possible non linearities with LENR + "make_model": "Nikon D810", + // "dcraw_matrix": [ 6502,-2328,154,-4249,9943,4307,-1303,2538,8108 ], // dcraw 9.22 v1.467 + "dcraw_matrix": [ 9369,-3195,-791,-4488,12430,2301,-893,1796,6872 ], // dcp_v8.6 d65 + "raw_crop": [ 0, 0, 7380, 4928 ], // Official raw crop 7380x4928, + "ranges": { "black": 600, "white": 16300 }, // attention BL600 is for 14bit raws and has to be 150 for 12 bit raws. Typical WL at 16383 + "white_max": 16383 + }, { // Quality A, new model, there is a conflict with E-M1 in Dcraw.cc, raw crop correction "make_model": "OLYMPUS E-M10", @@ -761,6 +855,20 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "dcraw_matrix": [ 10435,-3208,-72,-2293,10506,2067,-486,1725,4682 ], // RT, copy from custom dcp d55 "ranges": { "black": 15, "white": 4050 } // 15 is BL offstet. Dcraw/RT read the base offset from exif and calculates total BL = BLbase+BLoffset }, + + { // Quality B, New model, color data based on dng_v8.6 + // Intermediate ISO and Long exposure samples missing. + "make_model": "Panasonic DMC-FZ1000", + "dcraw_matrix": [ 7830,-2696,-763,-3325,11667,1866,-641,1712,4824 ], // dcp_v8.6 d65 + "ranges": { + "black": 15, // 15 is BL offstet. Dcraw/RT read the base offset from exif and calculates total BL = BLbase+BLoffset + "white": [ + { "iso": 80, "levels": 3720 }, // exif:3277 distribution peak at 3742 up to +/- 10 + { "iso": [ 125, 200, 400, 800, 1600, 3200, 6400, 12600, 25600 ], "levels": 4060 } // exif 4095 normal distribution 4080-4095 + ] + } + }, + { // Quality A "make_model": "Panasonic DMC-LF1", "dcraw_matrix": [ 9379,-3267,-816,-3227,11560,1881,-926,1928,5340 ], @@ -875,12 +983,11 @@ Quality X: unknown, ie we knowing to little about the camera properties to know { // Quality B, some ISO WLevels are safely guessed "make_model": "Panasonic DMC-GH4", - "dcraw_matrix": [ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 ], // dng_v8.5 d65 - // "dcraw_matrix": [ 5545,-878,-249,-4592,12128,2709,-1225,1928,5260 ], // calculated from dxo D50 matrix + "dcraw_matrix": [ 7122,-2108,-512,-3155,11201,2231,-541,1423,5045 ], // dng_v8.5 d65 "ranges": { - "black": 16, // // 15 is BL offstet. Dcraw/RT read the base black from exif and calculates total BL = BLbase+BLoffset + "black": 16, // 16 is BL offstet. Dcraw/RT read the base black from exif and calculates total BL = BLbase+BLoffset "white": [ - { "iso": 100, "levels": 2700 }, // gaussian center at 2870-2920 range +/- 150 + { "iso": 100, "levels": 2700 }, // gaussian center at 2870-2920 range +/- 150, exif 2111 { "iso": 125, "levels": 3100 }, // guessed { "iso": [ 160, 200, 250, 320, 400, 500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095 ] @@ -895,7 +1002,20 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "white": [ { "iso": 125, "levels": 3100 }, // bell shape 3150-3650 - exif 2616 { "iso": 160, "levels": 3600 }, // guessed from relative GX7 data - { "iso": [ 200, 250, 320, 400,500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095 + { "iso": [ 200, 250, 320, 400, 500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095 + ] + } + }, + + { // Quality X, preliminary support, color data copyed from GM1 + "make_model": "Panasonic DMC-GM5", + "dcraw_matrix": [ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 ], // GM1 + "ranges": { + "black": 15, // 15 is BL offstet. Dcraw/RT read the base offset from exif and calculates total BL = BLbase+BLoffset + "white": [ + { "iso": 100, "levels": 2900 }, // bell shape 2950-3250 - exif 2111 + { "iso": 160, "levels": 3600 }, // guessed from relative GX7 data + { "iso": [ 200, 250, 320, 400, 500, 640, 800, 1000, 1250, 1600, 2000, 2500, 3200, 4000, 5000, 6400, 12800, 25600 ], "levels": 4080 } // nominal 4095 ] } }, @@ -912,6 +1032,20 @@ Quality X: unknown, ie we knowing to little about the camera properties to know } }, + { // Quality C, preliminary support, color data from GX7 + "make_model": "Panasonic DMC-LX100", + "dcraw_matrix": [ 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 ], // GX7 .. measures fine DE2000=2.4 + // "dcraw_matrix": [ 6770,-1895,-744,-5232,13145,2303,-1664,2691,5703 ], // guessed ..FROM GM1 + "ranges": { + "black": 15, // 15 is BL offstet calculated from exif data. + "white": [ + { "iso": 100, "levels": 2500 }, // gaussian 2500-2700 exif linear 2111 + { "iso": 125, "levels": 3100 }, // guessed from GX7 + { "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, intermediate ISOs info missing "make_model": [ "RICOH PENTAX K-3", "PENTAX K-3" ], "dcraw_matrix": [ 7415,-2052,-721,-5186,12788,2682,-1446,2157,6773 ], // adobe dcp d65 @@ -929,30 +1063,36 @@ Quality X: unknown, ie we knowing to little about the camera properties to know } }, - { // Quality B, color looks bad with Dcraw matrix - corrections for raw crop vs Dcraw9.21, matched to Samsung's default + { // Quality B, corrections for raw crop vs Dcraw9.21, matched to Samsung's default "make_model": "Samsung NX mini", - "dcraw_matrix": [ 5222,-1196,-550,-6540,14649,2009,-1666,2819,5657 ], // Dcraw921 -// "dcraw_matrix": [ 5863,-1465,-760,-5714,13956,1883,-1075,1696,7136 ], // calculated from exif WB 11504/4096/6256 and color matrix 428,-170,-2,-36,352,-60,10,-104,350 + "dcraw_matrix": [ 5222,-1196,-550,-6540,14649,2009,-1666,2819,5657 ], // dng 8.6 d65 "raw_crop": [ 128, 36, 5480, 3656 ], // jpeg 5472x3648 - full raw: 5664 x 3710 - Samsung's official crop: 132, 40, 5604, 3688 "ranges": { "white": 4030 } // double clipping point for each channel at a) 4095 and b) bell distribution with peak at 4038 .. used the conservative one }, - { // Quality A, Conflict with "Samsung NX30" in Dcraw_v9.21_r1.414 - "make_model": "Samsung NX3000", - "dcraw_matrix": [ 8060,-2933,-761,-4504,12890,1762,-630,1489,5227 ] // D65 from Adobe's Dcp profile + { // Quality A, Conflict with "Samsung NX30" in Dcraw_v9.21_r1.414 + "make_model": "Samsung NX3000", + "dcraw_matrix": [ 8060,-2933,-761,-4504,12890,1762,-630,1489,5227 ] // D65 from Adobe's Dcp profile }, + { // Quality A, correction for color matrix from Colin Walker's d50 to dng d65 + "make_model": "Sony NEX-C3", + // "dcraw_matrix": [ 5130,-1055,-269,-4473,11797,3050,-701,1310,7121 ], // Colin walker's d50 kept for possible consistency issues + "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], + "ranges": { "black": 512, "white": 16300 } + }, + { // Quality A, correction for frame width "make_model": "Sony NEX-5N", "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], "raw_crop": [ 0, 0, 4920, 3276 ], "ranges": { "black": 512, "white": 16300 } }, - { // Quality A, - "make_model": "Sony ILCA-77M2", - "dcraw_matrix": [ 5991,-1732,-443,-4100,11989,2381,-704,1467,5992 ], // adobe dcp d65 - "raw_crop": [ 0, 0, 6024, 4024 ], - "ranges": { "black": 512, "white": 16300 } - }, + { // Quality A, + "make_model": "Sony ILCA-77M2", + "dcraw_matrix": [ 5991,-1732,-443,-4100,11989,2381,-704,1467,5992 ], // adobe dcp d65 + "raw_crop": [ 0, 0, 6024, 4024 ], + "ranges": { "black": 512, "white": 16300 } + }, { // Quality A, correction for frame width black level and color matrix "make_model": "Sony ILCE-3000", "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], // adobe dcp d65 @@ -965,11 +1105,15 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "ranges": { "black": 512, "white": 16300 }, "raw_crop": [ 0, 0, 5476, 3656 ] }, + { // Quality B, not supported by Dcraw 9.22 - colour data from DNG v8.7rc1 d65 + "make_model": "Sony ILCE-5100", + "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], // adobe dcp d65 + "raw_crop": [ 0, 0, 6024, 4024 ], + "ranges": { "black": 512, "white": 16300 } + }, { // Quality A "make_model": "Sony ILCE-6000", "dcraw_matrix": [ 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 ], // adobe dcp d65 -// "dcraw_matrix": [ 5012,-901,-206,-4034,11428,2984,-1104,1718,6377 ], // IR_x-rite D55 -// "dcraw_matrix": [ 4491,-737,-117,-4578,11908,3037,-1088,1686,6152 ], // DxO_D50 "raw_crop": [ 0, 0, 6024, 4024 ], "ranges": { "black": 512, "white": 16300 } }, @@ -979,31 +1123,17 @@ Quality X: unknown, ie we knowing to little about the camera properties to know "raw_crop": [ 0, 0, 7372, 4920 ], "ranges": { "black": 512, "white": 16300 } }, - { // Quality B, correction for frame width - "make_model": "Sony ILCE-7S", - "dcraw_matrix": [ 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 ], // DNG D65 - "raw_crop": [ 0, 0, 4254, 2848 ], - "ranges": { "black": 512, "white": 16300 } - }, - { // Quality A, - "make_model": "Sony DSC-RX100M3", - "dcraw_matrix": [ 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 ], // DNG D65 - "ranges": { "black": 800, "white": 16300 } - }, - - -// No need for these Sony models anymore -// { // quality A -// "make_model": "Sony SLT-A77", -// "dcraw_matrix": [ 5126,-830,-261,-4788,12196,2934,-948,1602,7068 ], // matrix provided by Colin Walker -// // note: Sony ARW2 file format gets 14 bit values, not 12 bit like in dcraw 9.19 -// "ranges": { "black": 512, "white": 16300 } -// }, -// { // quality A -// "make_model": [ "Sony SLT-A99", "Sony SLT-A99V" ], -// "dcraw_matrix": [ 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 ], -// "ranges": { "black": 512, "white": 16300 } -// }, + { // Quality B, correction for frame width + "make_model": "Sony ILCE-7S", + "dcraw_matrix": [ 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 ], // DNG D65 + "raw_crop": [ 0, 0, 4254, 2848 ], + "ranges": { "black": 512, "white": 16300 } + }, + { // Quality A, + "make_model": "Sony DSC-RX100M3", + "dcraw_matrix": [ 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 ], // DNG D65 + "ranges": { "black": 800, "white": 16300 } + }, /* Phase One: color matrices borrowed from Adobe DNG Converter, black/white levels tested on actual raw files. Note: the dcraw decoder makes black level subtraction and various corrections to the raw values based on