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

Improve support for Pentax K-1, Olympus E-M1MarkII and Canon G7 X

Browse Source
This commit is contained in:
heckflosse
2016-11-10 20:13:21 +01:00
parent bda2e6bc6c
commit fda15c124e
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rtengine/camconst.json
View File

@@ -1003,8 +1003,8 @@ Camera constants:
"ranges": { "white": 16300 }
},
{ // Quality B
"make_model": [ "Canon PowerShot G7 X", "Canon PowerShot G7 X Mark II" ],
{ // Quality B,
"make_model": "Canon PowerShot G7 X",
"dcraw_matrix": [ 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 ], // DNG_V8.7 D65
//"raw_crop": [ 116, 24, 5504, 3680 ], // Sensor size 5632x3710. Largest useful 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
@@ -1012,8 +1012,8 @@ Camera constants:
"ranges": { "white": 4080 }
},
{ // Quality B
"make_model": [ "Canon PowerShot G5 X", "Canon PowerShot G9 X" ],
{ // Quality B,
"make_model": [ "Canon PowerShot G5 X", "Canon PowerShot G9 X", "Canon PowerShot G7 X Mark II" ],
"dcraw_matrix": [ 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 ], // DNG_V8.7 D65
//"raw_crop": [ 116, 24, 5504, 3680 ], // Sensor size 5632x3710. Largest useful 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
@@ -1332,6 +1332,20 @@ Camera constants:
}
},
{ // Quality C, 20Mp and 80Mp raw frames, Color matrix copied from EM5MKII which looks to be close.
"make_model": "OLYMPUS E-M1MarkII",
"dcraw_matrix": [ 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 ], // E-M5II dng_v9.5 D65
"raw_crop": [ 8, 8, -16, -8 ], // full raw 5240X3912, jpeg top12,left12,5184x3888, full hires 10400X7792, jpeg crop 8,8,10368x7776
"ranges": {
"white": [
{ "iso": [ 64, 100, 125, 160, 200, 250, 320, 400 ], "levels": 4090 }, // normal 4095
{ "iso": [ 500, 640, 800, 1000, 1600 ], "levels": 4080 }, // 4085-4095
{ "iso": [ 2000, 2500, 3200, 4000, 5000, 6400 ], "levels": 4060 }, // 4085-4095
{ "iso": [ 12800, 25600, 51200 ], "levels": 4060 } // guess
]
}
},
{ // Quality B, missing per ISO samples
"make_model": "OLYMPUS E-M1",
"dcraw_matrix": [ 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 ], // dng d65
@@ -1702,6 +1716,22 @@ Camera constants:
}
},
{ // Quality B, Intemediate ISO samples missing, Pentax_DNG WLtags are after BL sutraction and not valid
"make_model": [ "RICOH PENTAX K-1", "PENTAX K-1" ],
"dcraw_matrix": [ 8596,-2981,-639,-4202,12046,2431,-685,1424,6122 ], // adobe DNG v9.7 D65
// "dcraw_matrix": [ 8566,-2746,-1201,-3612,12204,1550,-893,1680,6264 ], // PENTAX DNG
"raw_crop": [ 6, 18, 7376, 4932 ], // full frame 7392x4950, cropped to official DNG raw_crop 6,18,7382,4950, official jpeg crop 8,10,7360x4912
"ranges": {
"white": [
{ "iso": [ 100, 200, 400, 800 ], "levels": 16300 }, // 16380
{ "iso": [ 1600, 3200 ], "levels": 16250 }, // 16360
{ "iso": [ 6400, 12800 ], "levels": 16200 }, // 16330
{ "iso": [ 25600, 51200 ], "levels": 16100 }, // 16300
{ "iso": 102400, "levels": 16000 } // 16200
]
}
},
{ // 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