[2/6] ipa: rpi: pisp: data: Improve noise and detail tuning

Message ID	20250822123709.16966-3-david.plowman@raspberrypi.com
State	New
Headers	show Return-Path: <libcamera-devel-bounces@lists.libcamera.org> From: David Plowman <david.plowman@raspberrypi.com> To: libcamera-devel@lists.libcamera.org Cc: David Plowman <david.plowman@raspberrypi.com> Subject: [PATCH 2/6] ipa: rpi: pisp: data: Improve noise and detail tuning Date: Fri, 22 Aug 2025 13:37:05 +0100 Message-Id: <20250822123709.16966-3-david.plowman@raspberrypi.com> In-Reply-To: <20250822123709.16966-1-david.plowman@raspberrypi.com> References: <20250822123709.16966-1-david.plowman@raspberrypi.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" <libcamera-devel-bounces@lists.libcamera.org>
Series	Camera tuning updates for Raspberry Pi
Related	show [0/6] Camera tuning updates for Raspberry Pi [1/6] utils: raspberrypi: ctt: Update noise/sharpness tuning [2/6] ipa: rpi: pisp: data: Improve noise and detail tuning [3/6] ipa: rpi: pisp: data: Update all non-official camera tuning files [4/6] ipa: rpi: vc4: Minor tuning changes [5/6] utils: raspberrypi: ctt: Update vc4 tuning defaults [6/6] ipa: rpi: sdn: Remove legacy denoise warning

Hi David, On Fri, 22 Aug 2025 at 13:37, David Plowman <david.plowman@raspberrypi.com> wrote: > > Noise and detail tuning is improved for all official Raspberry Pi > cameras. > > The old tunings left too much noise in and even sharpened some of > it. The new tunings remove more noise, and no longer sharpen it. Some > of the more general over-sharpening is also removed. Note that lost > detail can be recovered well using TDN (temporal denoise), which is > the recommended method to get the best results. > > There are some minor adjustments to the CDN deviation, now that this > gets backed-off as TDN ramps up. > > The contrast in the gamma in the bright areas is also toned down just > a little. > > Signed-off-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Naushir Patuck <naush@raspberrypi.com> > --- > src/ipa/rpi/pisp/data/imx219.json | 118 +++++++++-------- > src/ipa/rpi/pisp/data/imx219_noir.json | 118 +++++++++-------- > src/ipa/rpi/pisp/data/imx296.json | 126 ++++++++++-------- > src/ipa/rpi/pisp/data/imx296_16mm.json | 126 ++++++++++-------- > src/ipa/rpi/pisp/data/imx296_6mm.json | 126 ++++++++++-------- > src/ipa/rpi/pisp/data/imx296_mono.json | 126 ++++++++++-------- > src/ipa/rpi/pisp/data/imx477.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx477_16mm.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx477_6mm.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx477_noir.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx477_scientific.json | 16 +-- > src/ipa/rpi/pisp/data/imx708.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx708_noir.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx708_wide.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/imx708_wide_noir.json | 128 +++++++++++-------- > src/ipa/rpi/pisp/data/ov5647.json | 118 +++++++++-------- > src/ipa/rpi/pisp/data/ov5647_noir.json | 118 +++++++++-------- > 17 files changed, 1152 insertions(+), 864 deletions(-) > > diff --git a/src/ipa/rpi/pisp/data/imx219.json b/src/ipa/rpi/pisp/data/imx219.json > index 5254e60d..727f8e2d 100644 > --- a/src/ipa/rpi/pisp/data/imx219.json > +++ b/src/ipa/rpi/pisp/data/imx219.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 3.661 > + "reference_slope": 5.38 > } > }, > { > @@ -45,11 +45,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -58,7 +58,7 @@ > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,11 +66,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -79,19 +79,19 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -100,8 +100,8 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -271,7 +271,7 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > "gain": [ 1.0, 1.5, 2.0, 4.0, 10.0 ] > }, > "short": > @@ -282,7 +282,7 @@ > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 10.0 ] > } > }, > "constraint_modes": > @@ -1021,37 +1021,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1120,8 +1138,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx219_noir.json b/src/ipa/rpi/pisp/data/imx219_noir.json > index 8a8ad330..cfd2daac 100644 > --- a/src/ipa/rpi/pisp/data/imx219_noir.json > +++ b/src/ipa/rpi/pisp/data/imx219_noir.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 3.661 > + "reference_slope": 5.38 > } > }, > { > @@ -45,11 +45,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -58,7 +58,7 @@ > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,11 +66,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -79,19 +79,19 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -100,8 +100,8 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -188,7 +188,7 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > "gain": [ 1.0, 1.5, 2.0, 4.0, 10.0 ] > }, > "short": > @@ -199,7 +199,7 @@ > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 10.0 ] > } > }, > "constraint_modes": > @@ -928,37 +928,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1045,8 +1063,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx296.json b/src/ipa/rpi/pisp/data/imx296.json > index d9dde898..d833c837 100644 > --- a/src/ipa/rpi/pisp/data/imx296.json > +++ b/src/ipa/rpi/pisp/data/imx296.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.751 > + "reference_slope": 3.751 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -270,18 +270,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1019,37 +1019,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1127,7 +1145,7 @@ > { > "rpi.sharpen": > { > - "threshold": 0.06, > + "threshold": 0.76, > "strength": 0.5, > "limit": 0.5 > } > diff --git a/src/ipa/rpi/pisp/data/imx296_16mm.json b/src/ipa/rpi/pisp/data/imx296_16mm.json > index 87443745..62344533 100644 > --- a/src/ipa/rpi/pisp/data/imx296_16mm.json > +++ b/src/ipa/rpi/pisp/data/imx296_16mm.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.751 > + "reference_slope": 3.751 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -270,18 +270,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1019,37 +1019,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1127,7 +1145,7 @@ > { > "rpi.sharpen": > { > - "threshold": 0.06, > + "threshold": 0.76, > "strength": 0.5, > "limit": 0.5 > } > diff --git a/src/ipa/rpi/pisp/data/imx296_6mm.json b/src/ipa/rpi/pisp/data/imx296_6mm.json > index abbcaa83..c71a0327 100644 > --- a/src/ipa/rpi/pisp/data/imx296_6mm.json > +++ b/src/ipa/rpi/pisp/data/imx296_6mm.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.751 > + "reference_slope": 3.751 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -270,18 +270,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1019,37 +1019,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1127,7 +1145,7 @@ > { > "rpi.sharpen": > { > - "threshold": 0.06, > + "threshold": 0.76, > "strength": 0.5, > "limit": 0.5 > } > diff --git a/src/ipa/rpi/pisp/data/imx296_mono.json b/src/ipa/rpi/pisp/data/imx296_mono.json > index 153f86a0..e8fb9f27 100644 > --- a/src/ipa/rpi/pisp/data/imx296_mono.json > +++ b/src/ipa/rpi/pisp/data/imx296_mono.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.751 > + "reference_slope": 3.751 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -182,18 +182,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -855,37 +855,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -893,7 +911,7 @@ > { > "rpi.sharpen": > { > - "threshold": 0.06, > + "threshold": 0.76, > "strength": 0.5, > "limit": 0.5 > } > diff --git a/src/ipa/rpi/pisp/data/imx477.json b/src/ipa/rpi/pisp/data/imx477.json > index 2fe04c21..1dce5964 100644 > --- a/src/ipa/rpi/pisp/data/imx477.json > +++ b/src/ipa/rpi/pisp/data/imx477.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.809 > + "reference_slope": 3.9 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -271,18 +271,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1020,37 +1020,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1119,8 +1137,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx477_16mm.json b/src/ipa/rpi/pisp/data/imx477_16mm.json > index f4e65c92..3c835341 100644 > --- a/src/ipa/rpi/pisp/data/imx477_16mm.json > +++ b/src/ipa/rpi/pisp/data/imx477_16mm.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.809 > + "reference_slope": 3.9 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -271,18 +271,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1020,37 +1020,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1119,8 +1137,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx477_6mm.json b/src/ipa/rpi/pisp/data/imx477_6mm.json > index 27268c23..af4f7891 100644 > --- a/src/ipa/rpi/pisp/data/imx477_6mm.json > +++ b/src/ipa/rpi/pisp/data/imx477_6mm.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.809 > + "reference_slope": 3.9 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -271,18 +271,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1020,37 +1020,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1119,8 +1137,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx477_noir.json b/src/ipa/rpi/pisp/data/imx477_noir.json > index defc4f4d..0c2020bb 100644 > --- a/src/ipa/rpi/pisp/data/imx477_noir.json > +++ b/src/ipa/rpi/pisp/data/imx477_noir.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.809 > + "reference_slope": 3.9 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -188,18 +188,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -937,37 +937,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1081,8 +1099,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx477_scientific.json b/src/ipa/rpi/pisp/data/imx477_scientific.json > index 4ec5a15b..1d9bae9b 100644 > --- a/src/ipa/rpi/pisp/data/imx477_scientific.json > +++ b/src/ipa/rpi/pisp/data/imx477_scientific.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.809 > + "reference_slope": 3.9 > } > }, > { > @@ -43,20 +43,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > } > @@ -537,8 +537,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > } > diff --git a/src/ipa/rpi/pisp/data/imx708.json b/src/ipa/rpi/pisp/data/imx708.json > index 7f2e7865..d86afc2e 100644 > --- a/src/ipa/rpi/pisp/data/imx708.json > +++ b/src/ipa/rpi/pisp/data/imx708.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 1.856 > + "reference_slope": 2.856 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 3.2, > - "strength": 0.75, > + "deviation": 0.2, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -270,18 +270,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1019,37 +1019,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1109,8 +1127,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx708_noir.json b/src/ipa/rpi/pisp/data/imx708_noir.json > index c5e6a265..d4c7cb9d 100644 > --- a/src/ipa/rpi/pisp/data/imx708_noir.json > +++ b/src/ipa/rpi/pisp/data/imx708_noir.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 1.856 > + "reference_slope": 2.856 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -188,18 +188,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -937,37 +937,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1126,8 +1144,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx708_wide.json b/src/ipa/rpi/pisp/data/imx708_wide.json > index 8550cdfc..7208823a 100644 > --- a/src/ipa/rpi/pisp/data/imx708_wide.json > +++ b/src/ipa/rpi/pisp/data/imx708_wide.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.9 > + "reference_slope": 2.856 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -270,18 +270,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -1019,37 +1019,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1118,8 +1136,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/imx708_wide_noir.json b/src/ipa/rpi/pisp/data/imx708_wide_noir.json > index 069a0618..f0fa66c9 100644 > --- a/src/ipa/rpi/pisp/data/imx708_wide_noir.json > +++ b/src/ipa/rpi/pisp/data/imx708_wide_noir.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 2.9 > + "reference_slope": 2.856 > } > }, > { > @@ -45,20 +45,20 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,42 +66,42 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > - "deviation": 200, > + "deviation": 100, > "strength": 0.3 > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -188,18 +188,18 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "short": > { > "shutter": [ 100, 5000, 10000, 20000, 60000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] > }, > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] > } > }, > "constraint_modes": > @@ -937,37 +937,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1027,8 +1045,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/ov5647.json b/src/ipa/rpi/pisp/data/ov5647.json > index d5156767..d534af31 100644 > --- a/src/ipa/rpi/pisp/data/ov5647.json > +++ b/src/ipa/rpi/pisp/data/ov5647.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 4.371 > + "reference_slope": 5.871 > } > }, > { > @@ -45,11 +45,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -58,7 +58,7 @@ > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,11 +66,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -79,19 +79,19 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -100,8 +100,8 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -271,7 +271,7 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > }, > "short": > @@ -282,7 +282,7 @@ > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 8.0 ] > } > }, > "constraint_modes": > @@ -1020,37 +1020,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1119,8 +1137,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > diff --git a/src/ipa/rpi/pisp/data/ov5647_noir.json b/src/ipa/rpi/pisp/data/ov5647_noir.json > index 3e04f21b..a900af43 100644 > --- a/src/ipa/rpi/pisp/data/ov5647_noir.json > +++ b/src/ipa/rpi/pisp/data/ov5647_noir.json > @@ -28,7 +28,7 @@ > "rpi.noise": > { > "reference_constant": 0, > - "reference_slope": 4.371 > + "reference_slope": 5.871 > } > }, > { > @@ -45,11 +45,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -58,7 +58,7 @@ > }, > "tdn": > { > - "deviation": 0.8, > + "deviation": 1.0, > "threshold": 0.05 > } > }, > @@ -66,11 +66,11 @@ > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -79,19 +79,19 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > }, > "night": > { > "sdn": > { > - "deviation": 1.6, > - "strength": 0.5, > + "deviation": 0.6, > + "strength": 0.95, > "deviation2": 3.2, > "deviation_no_tdn": 3.2, > - "strength_no_tdn": 0.75 > + "strength_no_tdn": 0.95 > }, > "cdn": > { > @@ -100,8 +100,8 @@ > }, > "tdn": > { > - "deviation": 1.3, > - "threshold": 0.1 > + "deviation": 1.0, > + "threshold": 0.05 > } > } > } > @@ -188,7 +188,7 @@ > { > "normal": > { > - "shutter": [ 100, 10000, 30000, 60000, 66666 ], > + "shutter": [ 100, 10000, 30000, 50000, 66666 ], > "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] > }, > "short": > @@ -199,7 +199,7 @@ > "long": > { > "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], > - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] > + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 8.0 ] > } > }, > "constraint_modes": > @@ -937,37 +937,55 @@ > "gamma_curve": > [ > 0, 0, > - 1024, 5040, > - 2048, 9338, > - 3072, 12356, > - 4096, 15312, > - 5120, 18051, > - 6144, 20790, > - 7168, 23193, > - 8192, 25744, > - 9216, 27942, > - 10240, 30035, > - 11264, 32005, > - 12288, 33975, > - 13312, 35815, > - 14336, 37600, > - 15360, 39168, > - 16384, 40642, > - 18432, 43379, > - 20480, 45749, > - 22528, 47753, > - 24576, 49621, > - 26624, 51253, > - 28672, 52698, > - 30720, 53796, > - 32768, 54876, > - 36864, 57012, > - 40960, 58656, > - 45056, 59954, > - 49152, 61183, > - 53248, 62355, > - 57344, 63419, > - 61440, 64476, > + 512, 2518, > + 1024, 5033, > + 1536, 7175, > + 2048, 9309, > + 2560, 10814, > + 3072, 12312, > + 3584, 13773, > + 4096, 15225, > + 4608, 16566, > + 5120, 17899, > + 5632, 19221, > + 6144, 20534, > + 6656, 21684, > + 7168, 22826, > + 7680, 24024, > + 8192, 25212, > + 9216, 27251, > + 10240, 29167, > + 11264, 30947, > + 12288, 32696, > + 13312, 34309, > + 14336, 35849, > + 15360, 37194, > + 16384, 38445, > + 17408, 39598, > + 18432, 40732, > + 19456, 41717, > + 20480, 42687, > + 22528, 44343, > + 24576, 45871, > + 26624, 47222, > + 28672, 48441, > + 30720, 49460, > + 32768, 50470, > + 34816, 51476, > + 36864, 52480, > + 38912, 53382, > + 40960, 54294, > + 43008, 55155, > + 45056, 56035, > + 47104, 56920, > + 49152, 57824, > + 51200, 58737, > + 53248, 59666, > + 55296, 60604, > + 57344, 61558, > + 59392, 62529, > + 61440, 63516, > + 63488, 64519, > 65535, 65535 > ] > } > @@ -1054,8 +1072,8 @@ > { > "rpi.sharpen": > { > - "threshold": 0.25, > - "limit": 1.0, > + "threshold": 0.75, > + "limit": 0.5, > "strength": 1.0 > } > }, > -- > 2.39.5 >

diff --git a/src/ipa/rpi/pisp/data/imx219.json b/src/ipa/rpi/pisp/data/imx219.json index 5254e60d..727f8e2d 100644 --- a/src/ipa/rpi/pisp/data/imx219.json +++ b/src/ipa/rpi/pisp/data/imx219.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 3.661 + "reference_slope": 5.38 } }, { @@ -45,11 +45,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -58,7 +58,7 @@ }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,11 +66,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -79,19 +79,19 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -100,8 +100,8 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -271,7 +271,7 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], + "shutter": [ 100, 10000, 30000, 50000, 66666 ], "gain": [ 1.0, 1.5, 2.0, 4.0, 10.0 ] }, "short": @@ -282,7 +282,7 @@ "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 10.0 ] } }, "constraint_modes": @@ -1021,37 +1021,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1120,8 +1138,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx219_noir.json b/src/ipa/rpi/pisp/data/imx219_noir.json index 8a8ad330..cfd2daac 100644 --- a/src/ipa/rpi/pisp/data/imx219_noir.json +++ b/src/ipa/rpi/pisp/data/imx219_noir.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 3.661 + "reference_slope": 5.38 } }, { @@ -45,11 +45,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -58,7 +58,7 @@ }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,11 +66,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -79,19 +79,19 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -100,8 +100,8 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -188,7 +188,7 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], + "shutter": [ 100, 10000, 30000, 50000, 66666 ], "gain": [ 1.0, 1.5, 2.0, 4.0, 10.0 ] }, "short": @@ -199,7 +199,7 @@ "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 10.0 ] } }, "constraint_modes": @@ -928,37 +928,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1045,8 +1063,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx296.json b/src/ipa/rpi/pisp/data/imx296.json index d9dde898..d833c837 100644 --- a/src/ipa/rpi/pisp/data/imx296.json +++ b/src/ipa/rpi/pisp/data/imx296.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.751 + "reference_slope": 3.751 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -270,18 +270,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1019,37 +1019,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1127,7 +1145,7 @@ { "rpi.sharpen": { - "threshold": 0.06, + "threshold": 0.76, "strength": 0.5, "limit": 0.5 } diff --git a/src/ipa/rpi/pisp/data/imx296_16mm.json b/src/ipa/rpi/pisp/data/imx296_16mm.json index 87443745..62344533 100644 --- a/src/ipa/rpi/pisp/data/imx296_16mm.json +++ b/src/ipa/rpi/pisp/data/imx296_16mm.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.751 + "reference_slope": 3.751 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -270,18 +270,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1019,37 +1019,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1127,7 +1145,7 @@ { "rpi.sharpen": { - "threshold": 0.06, + "threshold": 0.76, "strength": 0.5, "limit": 0.5 } diff --git a/src/ipa/rpi/pisp/data/imx296_6mm.json b/src/ipa/rpi/pisp/data/imx296_6mm.json index abbcaa83..c71a0327 100644 --- a/src/ipa/rpi/pisp/data/imx296_6mm.json +++ b/src/ipa/rpi/pisp/data/imx296_6mm.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.751 + "reference_slope": 3.751 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -270,18 +270,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1019,37 +1019,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1127,7 +1145,7 @@ { "rpi.sharpen": { - "threshold": 0.06, + "threshold": 0.76, "strength": 0.5, "limit": 0.5 } diff --git a/src/ipa/rpi/pisp/data/imx296_mono.json b/src/ipa/rpi/pisp/data/imx296_mono.json index 153f86a0..e8fb9f27 100644 --- a/src/ipa/rpi/pisp/data/imx296_mono.json +++ b/src/ipa/rpi/pisp/data/imx296_mono.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.751 + "reference_slope": 3.751 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -182,18 +182,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -855,37 +855,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -893,7 +911,7 @@ { "rpi.sharpen": { - "threshold": 0.06, + "threshold": 0.76, "strength": 0.5, "limit": 0.5 } diff --git a/src/ipa/rpi/pisp/data/imx477.json b/src/ipa/rpi/pisp/data/imx477.json index 2fe04c21..1dce5964 100644 --- a/src/ipa/rpi/pisp/data/imx477.json +++ b/src/ipa/rpi/pisp/data/imx477.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.809 + "reference_slope": 3.9 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -271,18 +271,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1020,37 +1020,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1119,8 +1137,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx477_16mm.json b/src/ipa/rpi/pisp/data/imx477_16mm.json index f4e65c92..3c835341 100644 --- a/src/ipa/rpi/pisp/data/imx477_16mm.json +++ b/src/ipa/rpi/pisp/data/imx477_16mm.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.809 + "reference_slope": 3.9 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -271,18 +271,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1020,37 +1020,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1119,8 +1137,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx477_6mm.json b/src/ipa/rpi/pisp/data/imx477_6mm.json index 27268c23..af4f7891 100644 --- a/src/ipa/rpi/pisp/data/imx477_6mm.json +++ b/src/ipa/rpi/pisp/data/imx477_6mm.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.809 + "reference_slope": 3.9 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -271,18 +271,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1020,37 +1020,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1119,8 +1137,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx477_noir.json b/src/ipa/rpi/pisp/data/imx477_noir.json index defc4f4d..0c2020bb 100644 --- a/src/ipa/rpi/pisp/data/imx477_noir.json +++ b/src/ipa/rpi/pisp/data/imx477_noir.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.809 + "reference_slope": 3.9 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -188,18 +188,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -937,37 +937,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1081,8 +1099,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx477_scientific.json b/src/ipa/rpi/pisp/data/imx477_scientific.json index 4ec5a15b..1d9bae9b 100644 --- a/src/ipa/rpi/pisp/data/imx477_scientific.json +++ b/src/ipa/rpi/pisp/data/imx477_scientific.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.809 + "reference_slope": 3.9 } }, { @@ -43,20 +43,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } } @@ -537,8 +537,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } } diff --git a/src/ipa/rpi/pisp/data/imx708.json b/src/ipa/rpi/pisp/data/imx708.json index 7f2e7865..d86afc2e 100644 --- a/src/ipa/rpi/pisp/data/imx708.json +++ b/src/ipa/rpi/pisp/data/imx708.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 1.856 + "reference_slope": 2.856 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 3.2, - "strength": 0.75, + "deviation": 0.2, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -270,18 +270,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1019,37 +1019,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1109,8 +1127,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx708_noir.json b/src/ipa/rpi/pisp/data/imx708_noir.json index c5e6a265..d4c7cb9d 100644 --- a/src/ipa/rpi/pisp/data/imx708_noir.json +++ b/src/ipa/rpi/pisp/data/imx708_noir.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 1.856 + "reference_slope": 2.856 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -188,18 +188,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -937,37 +937,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1126,8 +1144,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx708_wide.json b/src/ipa/rpi/pisp/data/imx708_wide.json index 8550cdfc..7208823a 100644 --- a/src/ipa/rpi/pisp/data/imx708_wide.json +++ b/src/ipa/rpi/pisp/data/imx708_wide.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.9 + "reference_slope": 2.856 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -270,18 +270,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -1019,37 +1019,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1118,8 +1136,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/imx708_wide_noir.json b/src/ipa/rpi/pisp/data/imx708_wide_noir.json index 069a0618..f0fa66c9 100644 --- a/src/ipa/rpi/pisp/data/imx708_wide_noir.json +++ b/src/ipa/rpi/pisp/data/imx708_wide_noir.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 2.9 + "reference_slope": 2.856 } }, { @@ -45,20 +45,20 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,42 +66,42 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { - "deviation": 200, + "deviation": 100, "strength": 0.3 }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -188,18 +188,18 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "shutter": [ 100, 10000, 30000, 50000, 66666 ], + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "short": { "shutter": [ 100, 5000, 10000, 20000, 60000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 16.0 ] }, "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 16.0 ] } }, "constraint_modes": @@ -937,37 +937,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1027,8 +1045,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/ov5647.json b/src/ipa/rpi/pisp/data/ov5647.json index d5156767..d534af31 100644 --- a/src/ipa/rpi/pisp/data/ov5647.json +++ b/src/ipa/rpi/pisp/data/ov5647.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 4.371 + "reference_slope": 5.871 } }, { @@ -45,11 +45,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -58,7 +58,7 @@ }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,11 +66,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -79,19 +79,19 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -100,8 +100,8 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -271,7 +271,7 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], + "shutter": [ 100, 10000, 30000, 50000, 66666 ], "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] }, "short": @@ -282,7 +282,7 @@ "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 8.0 ] } }, "constraint_modes": @@ -1020,37 +1020,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1119,8 +1137,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } }, diff --git a/src/ipa/rpi/pisp/data/ov5647_noir.json b/src/ipa/rpi/pisp/data/ov5647_noir.json index 3e04f21b..a900af43 100644 --- a/src/ipa/rpi/pisp/data/ov5647_noir.json +++ b/src/ipa/rpi/pisp/data/ov5647_noir.json @@ -28,7 +28,7 @@ "rpi.noise": { "reference_constant": 0, - "reference_slope": 4.371 + "reference_slope": 5.871 } }, { @@ -45,11 +45,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -58,7 +58,7 @@ }, "tdn": { - "deviation": 0.8, + "deviation": 1.0, "threshold": 0.05 } }, @@ -66,11 +66,11 @@ { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -79,19 +79,19 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } }, "night": { "sdn": { - "deviation": 1.6, - "strength": 0.5, + "deviation": 0.6, + "strength": 0.95, "deviation2": 3.2, "deviation_no_tdn": 3.2, - "strength_no_tdn": 0.75 + "strength_no_tdn": 0.95 }, "cdn": { @@ -100,8 +100,8 @@ }, "tdn": { - "deviation": 1.3, - "threshold": 0.1 + "deviation": 1.0, + "threshold": 0.05 } } } @@ -188,7 +188,7 @@ { "normal": { - "shutter": [ 100, 10000, 30000, 60000, 66666 ], + "shutter": [ 100, 10000, 30000, 50000, 66666 ], "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0 ] }, "short": @@ -199,7 +199,7 @@ "long": { "shutter": [ 100, 10000, 30000, 60000, 90000, 120000 ], - "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 12.0 ] + "gain": [ 1.0, 1.5, 2.0, 4.0, 8.0, 8.0 ] } }, "constraint_modes": @@ -937,37 +937,55 @@ "gamma_curve": [ 0, 0, - 1024, 5040, - 2048, 9338, - 3072, 12356, - 4096, 15312, - 5120, 18051, - 6144, 20790, - 7168, 23193, - 8192, 25744, - 9216, 27942, - 10240, 30035, - 11264, 32005, - 12288, 33975, - 13312, 35815, - 14336, 37600, - 15360, 39168, - 16384, 40642, - 18432, 43379, - 20480, 45749, - 22528, 47753, - 24576, 49621, - 26624, 51253, - 28672, 52698, - 30720, 53796, - 32768, 54876, - 36864, 57012, - 40960, 58656, - 45056, 59954, - 49152, 61183, - 53248, 62355, - 57344, 63419, - 61440, 64476, + 512, 2518, + 1024, 5033, + 1536, 7175, + 2048, 9309, + 2560, 10814, + 3072, 12312, + 3584, 13773, + 4096, 15225, + 4608, 16566, + 5120, 17899, + 5632, 19221, + 6144, 20534, + 6656, 21684, + 7168, 22826, + 7680, 24024, + 8192, 25212, + 9216, 27251, + 10240, 29167, + 11264, 30947, + 12288, 32696, + 13312, 34309, + 14336, 35849, + 15360, 37194, + 16384, 38445, + 17408, 39598, + 18432, 40732, + 19456, 41717, + 20480, 42687, + 22528, 44343, + 24576, 45871, + 26624, 47222, + 28672, 48441, + 30720, 49460, + 32768, 50470, + 34816, 51476, + 36864, 52480, + 38912, 53382, + 40960, 54294, + 43008, 55155, + 45056, 56035, + 47104, 56920, + 49152, 57824, + 51200, 58737, + 53248, 59666, + 55296, 60604, + 57344, 61558, + 59392, 62529, + 61440, 63516, + 63488, 64519, 65535, 65535 ] } @@ -1054,8 +1072,8 @@ { "rpi.sharpen": { - "threshold": 0.25, - "limit": 1.0, + "threshold": 0.75, + "limit": 0.5, "strength": 1.0 } },

[2/6] ipa: rpi: pisp: data: Improve noise and detail tuning
diff mbox series

Commit Message

Comments

Patch
diff mbox series

[2/6] ipa: rpi: pisp: data: Improve noise and detail tuning 24178 diff mbox series

Commit Message

Comments

Patch 24178 diff mbox series

[2/6] ipa: rpi: pisp: data: Improve noise and detail tuning
diff mbox series

Patch
diff mbox series