merge with dev

This commit is contained in:
Desmis
2019-11-13 17:01:56 +01:00
2 changed files with 12 additions and 2 deletions

View File

@@ -1089,6 +1089,7 @@ HISTORY_MSG_PDSHARPEN_CONTRAST;CS - Contrast threshold
HISTORY_MSG_PDSHARPEN_ITERATIONS;CS - Iterations
HISTORY_MSG_PDSHARPEN_RADIUS;CS - Radius
HISTORY_MSG_PDSHARPEN_RADIUS_BOOST;CS - Corner radius boost
HISTORY_MSG_PDSHARPEN_RANGE;CS - Range
HISTORY_MSG_PIXELSHIFT_DEMOSAIC;PS - Demosaic method for motion
HISTORY_MSG_PREPROCESS_LINEDENOISE_DIRECTION;Line noise filter direction
HISTORY_MSG_PREPROCESS_PDAFLINESFILTER;PDAF lines filter
@@ -2714,6 +2715,7 @@ TP_SHARPENING_METHOD;Method
TP_SHARPENING_ONLYEDGES;Sharpen only edges
TP_SHARPENING_RADIUS;Radius
TP_SHARPENING_RADIUS_BOOST;Corner radius boost
TP_SHARPENING_RANGE;Range
TP_SHARPENING_RLD;RL Deconvolution
TP_SHARPENING_RLD_AMOUNT;Amount
TP_SHARPENING_RLD_DAMPING;Damping

View File

@@ -1,4 +1,5 @@
/*
vim: set syntax=javascript:
DO NOT EDIT THIS FILE!
@@ -2142,10 +2143,17 @@ Camera constants:
}
},
{ // Quality B, issue #5204. Missing ISO 50, 64 and 80 and I expect the WL to differ for these ISO values
{ // Quality A, issue #5204.
"make_model": [ "Panasonic DC-S1" ],
"dcraw_matrix": [ 9744, -3905, -779, -4899, 12807, 2324, -798, 1630, 5827 ], // ColorMatrix2 using illuminant D65 from Adobe DNG Converter 11.4
"ranges": { "white": 16320 }
"ranges": {
"white": [
{ "iso": 50, "levels": 8400 }, // LENR 8000
{ "iso": 64, "levels": 10450 }, // LENR 10000
{ "iso": 80, "levels": 13050 }, // LENR 12400
{ "iso": 100, "levels": 16320 }
]
}
},
{ // Quality X, issue #5204. No white frames available.