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

Support for Fuji X-Trans-Sensor, Issue 2415 (thanks to Hombre for the changes to gui); Clip Control for Flat Field correction, Issue 2441; Update to dcraw 9.22 1.467

Browse Source
This commit is contained in:
Ingo
2014-07-10 00:33:33 +02:00
parent 3cf0da217a
commit 617b888fa0
65 changed files with 3832 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
rtengine/camconst.json
View File

@@ -336,7 +336,7 @@ For Panasonic raws beginning from Dcraw v9.21 Dcraw/RT reads base BL from exif d
define in "ranges": { "black": the needed offset of around 15. The (total) BL RT displays is base+offset
In all, you typically should not care about the black level in camconst.json,
any information that can be derived from the raw file itself should not be specified in camconst.json!
Sony's ARW2 is one of the few exceptions (which has a single black level around 512),
Sony's ARW2 is one of the few exceptions (with single black level around 512, or 800 for RX10/100 models),
but DCraw generally has good constants for these already.
Currently we have chosen not to provide any guide how to measure black levels
@@ -432,11 +432,11 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
{ "aperture": 2.0, "scale_factor": 1.025 },
{ "aperture": 2.2, "scale_factor": 1.020 },
{ "aperture": 2.5, "scale_factor": 1.015 },
{ "aperture": 2.8, "scale_factor": 1.010 },
{ "aperture": 3.2, "scale_factor": 1.005 },
{ "aperture": 3.5, "scale_factor": 1.002 }
]
}
{ "aperture": 2.8, "scale_factor": 1.010 },
{ "aperture": 3.2, "scale_factor": 1.005 },
{ "aperture": 3.5, "scale_factor": 1.002 }
]
}
},
{ // Quality A, some missing scaling factors are safelly guessed - most samples by sfink16 at RT forums
"make_model": "Canon EOS 6D",
@@ -588,7 +588,7 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
{ "aperture": 2.2, "scale_factor": 1.060 }, // 11971/11222 = 1.066
{ "aperture": 2.5, "scale_factor": 1.050 }, // guessed
{ "aperture": 2.8, "scale_factor": 1.030 }, // iso100: 14042/13584=1.0336 - iso200 15820/15303 = 1.0348
{ "aperture": 3.2, "scale_factor": 1.00 }, //
{ "aperture": 3.2, "scale_factor": 1.000 }, //
{ "aperture": 3.5, "scale_factor": 1.000 } //
]
}
@@ -668,27 +668,39 @@ 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
},
{ // 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 C, PRELIMINARY - new model not supported by dcraw9.20 or dng 8.4
// "make_model": "Nikon 1 V3",
// "dcraw_matrix": [ 5306,-1066,-469,-3865,11189,3076,-399,1341,5120 ], // matrix dXo D50
// // "dcraw_matrix": [ 6588,-1305,-693,-3277,10987,2634,-355,2016,5106 ], // copy from 1 V2
// "ranges": { "black": 200, "white": 4080 } // exif 800
// },
{ // 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 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, // 16383 typical
15760, // 15778 typical
16370 // 16383 typical
],
"white_max": 16383
// aperture scaling not measured, but known to exist, at f/1.8 the G channels hits white_max
}
@@ -746,7 +758,7 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
{ // Quality A , replicated from rawimage.cc
"make_model": "Panasonic DMC-FZ150",
"dcraw_matrix": [ 10435,-3208,-72,-2293,10506,2067,-486,1725,4682 ], // RT
"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 A
@@ -849,7 +861,7 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
}
},
{ // Quality B, BL is floating and should be extracted from exif maker data
{ // Quality B, variable WL
"make_model": "Panasonic DMC-GH3",
"dcraw_matrix": [ 6559,-1752,-491,-3672,11407,2586,-962,1875,5130 ], // dcp d65
"ranges": {
@@ -861,9 +873,10 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
}
},
{ // Quality C, preliminary support, not yet supported by Dcraw or Adobe
{ // Quality B, some ISO WLevels are safely guessed
"make_model": "Panasonic DMC-GH4",
"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
// "dcraw_matrix": [ 5545,-878,-249,-4592,12128,2709,-1225,1928,5260 ], // calculated from dxo D50 matrix
"ranges": {
"black": 16, // // 15 is BL offstet. Dcraw/RT read the base black from exif and calculates total BL = BLbase+BLoffset
"white": [
@@ -918,14 +931,15 @@ 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
"make_model": "Samsung NX mini",
"dcraw_matrix": [ 5222,-1196,-550,-6540,14649,2009,-1666,2819,5657 ], // Dcraw921
"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
"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,
"make_model": "Samsung NX30",
"dcraw_matrix": [ 7557,-2522,-739,-4679,12949,1894,-840,1777,5311 ] // D65 matrix from Adobe's Dcp profile - DxoD50 6661,-1695,-616,-6456,14646,1913,-1417,2142,5646
},
{ // 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 frame width
"make_model": "Sony NEX-5N",
@@ -933,7 +947,13 @@ Quality X: unknown, ie we knowing to little about the camera properties to know
"raw_crop": [ 0, 0, 4920, 3276 ],
"ranges": { "black": 512, "white": 16300 }
},
{ // Quality A, correction for frame width black level and color matrix
{ // 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
"ranges": { "black": 512, "white": 16300 },
@@ -945,7 +965,7 @@ 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 A, new model not supported in dcraw 9.20
{ // 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
@@ -959,6 +979,19 @@ 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",