From patchwork Mon Oct 3 09:55:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17498 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 2F8AAC0DA4 for ; Mon, 3 Oct 2022 09:56:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4497862CE9; Mon, 3 Oct 2022 11:56:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664790967; bh=uHraPmksW6UuolJYoXT9mOkJwIm1PVmMdPXrQDTa2wQ=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=xh5RxpJA0JX7m1KjEf81CmwWGi3QFbAQyhg+pJX8pOdBTSl4V8RJCxDqvPJ34WsCF QH6IJwwK23z+cwHzD3vH+P9NEspFcSLRc7AQeu1rxxq7/hYWcbx6HbOmNV1Zl1hJz+ y4l2v0epfyyWrLCYUO0YhQx+m38m9QtJFRBunO4Y/MnPWNGFPaiB21w0/ZYtQUgIFe u8TjBsn1Bxz+tDhlE8DMZJrCCNbRFlkiyKGrdofvpURj8LZ65wL9WDyH2RXGIQBysD C4PTypfFn/Yt7xc094/v9vg1cV2GPVMz9iFMngZEdMmL7cF1WMGd5Gc/JR0o7yJoPx TXEkJsUU5UVpw== Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1EE3661F74 for ; Mon, 3 Oct 2022 11:56:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="IjjYbJ5W"; dkim-atps=neutral Received: by mail-wr1-x42c.google.com with SMTP id u10so15771390wrq.2 for ; Mon, 03 Oct 2022 02:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=UWCQhvdH74TLq/a6I6a7W4TSVIApKj/ulcAFzbFP21g=; b=IjjYbJ5W9rLFYJ+1wWiHQt1xUtuoNQED3I3D+0FT90xFcfiehy4glgzM47ElafO/SG zB7Ib5a5unnJjzRxzxbSaSebmrm8WEZl6uS8MxeDKzSIbotexCUJSFzz4WcgPydRAVyv BkuVVA7aF2phq8kCWECYei23B54mnPXaFC8qcPluewHz3mX7s8FzNmOZnYnjSJAHsfzu F/J41CpiwG+AfXyTQGAhfrLsODOsqqmePe/KPgru0yv/GF8f3Ag/NFpXu0EUUZTqZc4b 31RRKnL/LM3f3cKXMvBK1WOA8RCjunyw/np3+Qh1iWjYj6yHZeXR4OzRmBcwHGHhbXcn eD6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=UWCQhvdH74TLq/a6I6a7W4TSVIApKj/ulcAFzbFP21g=; b=7hu7osygu8yUiSw4AiEaFz+aUvWGtDUSr+OU1gJVzmoQeQoD2ZtbvPvSjjJeJB0jqc WcAMFouPbT1/YA91w7hJ1B/4LoeLyz31FyTuSQdAA54ZlQKRH/G1feC2d0OzL38djEcw tCA3qGou6qQdj5p3Zrednfl4lpDpN1yD9lVhwYfQbBiprPbp+Vw2zUom0+6hHty/uUGn oSbM6FW08Ab8umnrdSsKZL9iH97jzGuCdjizOILIYDLWfp2MKrJW2Xxy6Nc/iWLbE0qP HstQy/XB08TUS1ixKWxQ4qbTaWHkoU04etSgDIvramPJ+kD86WygmoORX+6T3CBsh4mk EaBg== X-Gm-Message-State: ACrzQf0odqm1D1I2ZpcFpIIRqSZ973dJR7HUYzq7/DR7cwwhmbIoqNHS nDNTgf318FmgbS522+Y7ShXANfBD1DgTjA== X-Google-Smtp-Source: AMsMyM5UCtylSZYY/AwsCAr+VqDb6I++9ie48+F9TeP4qsR4hgSStuZ2h7kRHfUeoOB1jga7PwBNuA== X-Received: by 2002:a05:6000:1f9b:b0:22e:504:1bb with SMTP id bw27-20020a0560001f9b00b0022e050401bbmr7602561wrb.90.1664790964644; Mon, 03 Oct 2022 02:56:04 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id z10-20020a5d4c8a000000b002286670bafasm9120637wrs.48.2022.10.03.02.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:56:04 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Oct 2022 10:55:55 +0100 Message-Id: <20221003095558.1993-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221003095558.1993-1-naush@raspberrypi.com> References: <20221003095558.1993-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 1/4] libcamera: bayer_format: Add unpacked mono 12-bit format to the conversion table X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add BayerFormat conversions for formats::R12 (12-bit unpacked) format. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/libcamera/bayer_format.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libcamera/bayer_format.cpp b/src/libcamera/bayer_format.cpp index c2a52f4740d6..f27cc1662d25 100644 --- a/src/libcamera/bayer_format.cpp +++ b/src/libcamera/bayer_format.cpp @@ -191,6 +191,7 @@ const std::unordered_map mbusCodeToBayer{ { MEDIA_BUS_FMT_SRGGB16_1X16, { BayerFormat::RGGB, 16, BayerFormat::Packing::None } }, { MEDIA_BUS_FMT_Y8_1X8, { BayerFormat::MONO, 8, BayerFormat::Packing::None } }, { MEDIA_BUS_FMT_Y10_1X10, { BayerFormat::MONO, 10, BayerFormat::Packing::None } }, + { MEDIA_BUS_FMT_Y12_1X12, { BayerFormat::MONO, 12, BayerFormat::Packing::None } }, }; } /* namespace */ From patchwork Mon Oct 3 09:55:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17499 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6A1EFC327C for ; Mon, 3 Oct 2022 09:56:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C10FB62CEE; Mon, 3 Oct 2022 11:56:08 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664790968; bh=70dY/2yOG09GmxWV4XkYxNxjmwdy+OBE7EfCZ8fYhOQ=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=WcE2WDZkA1A3D3QAKh+aNftHp+wpDpgsnKL6dNpnjm9yjM7KwlUtmg+ZglbfAwgsk GAqNIFvAwv4J2dY80+7w+Iv0Ebv6vgBVmZcMUC5sFAuzFl1VyyMI1yIPRt/0ksya5R dqVxQ8UgHoBkJXKZa8M1nlcRFnr6qRD431ltgjFqpS21nfD4IxbOXROeF2W3zNUTRC jgaAoAqC07kAf6Bt6UnpHFUxJsU9DEarxkL3p+j333n2VINa1Dh8SW0x3Nn8+AvEWu QeHTzlxMogAjUntJC9nybYcfVd2VQbiNDze5whq3aEgiwPPWWTGTIB5IgV9HY9onOG C6hsgGGDoWGFQ== Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DC63262CDF for ; Mon, 3 Oct 2022 11:56:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="eCGhXujS"; dkim-atps=neutral Received: by mail-wr1-x430.google.com with SMTP id j16so3958597wrh.5 for ; Mon, 03 Oct 2022 02:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=5AJn6sGm0U4RPdVN5h5oRKuT8tBty6smtZCUrNTqYQg=; b=eCGhXujSsWJnfF6hyYU1oGoBPF76Adn9olkEkjwnRtjF5D1ExGw7VATdskZtR0GHZU +3iCrV1totICFgVJ/O0PM58nYfK/xsZr0JNOC4sXHKHoFQHtwr7uX3W4/sDUKmDUOAKE b+kCaeeoEKUCDlpJQra2icY/i5wMbsjlCUI48gK21AqUxD+WbPmztLPrOFCW/KYGPdoE iDx/YTk675MR/KSmelYJXkDPZ+bPeH5iYYkXo2JZypZGyACJTPMhIKSI8Wfo3BeGjUgG NAal1o3yd+LNQB6l2CqD7h98DugbXZEv9ea76uDvVo3iYDHzmF4Wk6g+7DVOaUSpdMUW pqmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=5AJn6sGm0U4RPdVN5h5oRKuT8tBty6smtZCUrNTqYQg=; b=ifIgZkdpmnUrRC6nWE9rXW1gecZBoU/UtUH/2luYr4Wxv8cv3p2W6J4WR8IYx6Orjm zhKKfVuQz3hSFwOALMCW6a4DVvr4We8c8ICO6canLvhBTYJztJyptXMmuKHdYTLLc4+P q2mpYCJwbeaHpPiT5no8FRuOHxNgNa7wUbaG+MHxi0Tm4wjoqIVaO5u9wPMJEddlFzst FHLfisBYetfEKucygB3nzGWOyCNt4i4i3clL/DKo2H1SUN0u31Epg3x5DHouA9Kzv5ra JBvu/Jndj8jqevv0UUwvUwwUCdSgjxtIVVnhw25QOLHIey5TTSs54TUD7+WMkEedQTWC XLNg== X-Gm-Message-State: ACrzQf2rXebkSdPq82CGyZQnO+qvVJGpkPTSLGCQzdb+OGwatngCgAnl r21Ykzkdiy/C+pTvYg8u0PQg2lSakfhNFw== X-Google-Smtp-Source: AMsMyM6FaQuXx6uPHzJ2Ksep5dnykcsOJO8lNL8VNoOyFaAs18ceytyhq9lZRJeFDgv18uf7IhcaEw== X-Received: by 2002:a5d:5846:0:b0:22a:f7d2:9045 with SMTP id i6-20020a5d5846000000b0022af7d29045mr13104889wrf.250.1664790965207; Mon, 03 Oct 2022 02:56:05 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id z10-20020a5d4c8a000000b002286670bafasm9120637wrs.48.2022.10.03.02.56.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:56:04 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Oct 2022 10:55:56 +0100 Message-Id: <20221003095558.1993-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221003095558.1993-1-naush@raspberrypi.com> References: <20221003095558.1993-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/4] pipeline: raspberrypi: Update naming convention for tuning files X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Append "_mono" to the sensor name when generating the tuning filename for monochrome sensor variants. So the new naming convention is as follows: .json - Standard colour sensor variant _mono.json - Monochrom sensor variant Rename the existing imx296.json file to imx296_mono.json as this tuning file is based on the monochrome variant of the IMX296. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman --- .../data/{imx296.json => imx296_mono.json} | 0 src/ipa/raspberrypi/data/meson.build | 2 +- .../pipeline/raspberrypi/raspberrypi.cpp | 20 +++++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) rename src/ipa/raspberrypi/data/{imx296.json => imx296_mono.json} (100%) diff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296_mono.json similarity index 100% rename from src/ipa/raspberrypi/data/imx296.json rename to src/ipa/raspberrypi/data/imx296_mono.json diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build index 211811cfa915..465a7a17ce6f 100644 --- a/src/ipa/raspberrypi/data/meson.build +++ b/src/ipa/raspberrypi/data/meson.build @@ -4,7 +4,7 @@ conf_files = files([ 'imx219.json', 'imx219_noir.json', 'imx290.json', - 'imx296.json', + 'imx296_mono.json', 'imx378.json', 'imx477.json', 'imx477_noir.json', diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index dcd81650c32d..39a1c798df2e 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -67,6 +67,14 @@ SensorFormats populateSensorFormats(std::unique_ptr &sensor) return formats; } +bool isMonoSensor(std::unique_ptr &sensor) +{ + unsigned int mbusCode = sensor->mbusCodes()[0]; + const BayerFormat &bayer = BayerFormat::fromMbusCode(mbusCode); + + return bayer.order == BayerFormat::Order::MONO; +} + PixelFormat mbusCodeToPixelFormat(unsigned int mbus_code, BayerFormat::Packing packingReq) { @@ -1551,12 +1559,16 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result) */ std::string configurationFile; char const *configFromEnv = utils::secure_getenv("LIBCAMERA_RPI_TUNING_FILE"); - if (!configFromEnv || *configFromEnv == '\0') - configurationFile = ipa_->configurationFile(sensor_->model() + ".json"); - else + std::string model = sensor_->model(); + if (!configFromEnv || *configFromEnv == '\0') { + if (isMonoSensor(sensor_)) + model += "_mono"; + configurationFile = ipa_->configurationFile(model + ".json"); + } else { configurationFile = std::string(configFromEnv); + } - IPASettings settings(configurationFile, sensor_->model()); + IPASettings settings(configurationFile, model); return ipa_->init(settings, result); } From patchwork Mon Oct 3 09:55:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17500 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id DC62BC0DA4 for ; Mon, 3 Oct 2022 09:56:10 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9C97A62CF9; Mon, 3 Oct 2022 11:56:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664790969; bh=Z2doRG1xMGw+EJ2Bi+4gb1p7J2MWEz/EI9APbW0b2ug=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=wJSyVhBtmmeypWTjMN5K+W3ajox6255f0PFGv27hRgDNCdSnsNBrW6JoWHgfzXqVJ LBfIpvxlh6KmfNco8zbFrUArZFmxCyf2zz/4hICJm+61X9vEzN/o8099pToCX9s6Il nboJPbd+xBs5YWaoFUJg5Q/fw5vHIa73NuY6oVU2ywW+8dGVZKGRFSqzOe0HgFcGyW t8r8T3NjePj8w2oOt3HgH013rsIXao7JeESSIsAhmx6aOs5B1NfiyD/2lrKnUFFcq+ ldZA5oAntoKt0YtkZfvEhuFoDm4IvUNKOLv7+i2lKwW/N0KtLxI5fGWg9qFLE3ThFE NLhVeuDbQ1fUA== Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D4E1262CDD for ; Mon, 3 Oct 2022 11:56:06 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="DstMEJUc"; dkim-atps=neutral Received: by mail-wr1-x429.google.com with SMTP id b4so8932613wrs.1 for ; Mon, 03 Oct 2022 02:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=+t6buDPjGwX0fZfEhLpyXLsdmho09BdU3F8EcMDE5Bg=; b=DstMEJUclp98BFtUJGRnYN9XdXHZsAYmQ9+4+xMt1azFjFshmJyMj+UX8hx/4S5ZbY mZbaRFbzxnZnhpWte4wwp3vIHrKxaNPeiJ8bjYA+AOhubt/+DTmHj2UC/pcdliTg1EyG 0f7lq13KaSdDX0YxDL4rgN7OM3qIEP7vL4ldpgr+a9IaLeDCBsI+QrNBSvIr9sUgLuUk yiVcRM9NjnL0Xhj13DMpw63kNu05wBMDPi1YaUWMO8YhUvMsyiMQ8CEltMILUHxq17eM e/pUnrtdPEIGwdnrbVAVFs6rDcKGRqk5Q3UnP8X+bVOGMZUGvdXOGds8PwTP6KfNGAN3 QPVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=+t6buDPjGwX0fZfEhLpyXLsdmho09BdU3F8EcMDE5Bg=; b=ywDrZBJRJuuXvT6Cq/ynriplbeN+jaUlPm8DhlnxW5OqqXRDcdON3t9mNy/esD6VaA nHPMHGXVj6yXxhiad4UQ9FOlv9Hl0qTKeeKzXxStU2e4LGxoYXUvYjjH2BcaI6IsfgLe pRbpMK6zDf7T1txR1GVuhzLEL5m94kva2qZ6EFpLoEJ3kQtzZGbRFJP42yc+zg2UrO6Y 2/vYKu3TYZiIJKiBFDxDkFns8w+TO+N4WSwOj7BfqPDGOJH8rml4Ub2fZiXuvuNFRACe Fz0tyz17sy0cdLUrjlDl1gtE37dgwaEB3NxpF50iBFdYPqnxZHuWz9px/sldUi3dohFR kDBQ== X-Gm-Message-State: ACrzQf3pI9zh/HSlM2vSoU9nI38nzeDvOk2UosIZhsHrB+UX66lOgWrH fZfSNY5HNAeAsq+XJmpaPePYD5cHXqWYjQ== X-Google-Smtp-Source: AMsMyM7NASMkK5IiAPzceXtn9qWIahJnQAO5w+cGD61vdbPg/GaPMesBt4j2xYeU/RUaMaHhFnu4VA== X-Received: by 2002:a05:6000:1846:b0:22b:66d:12bd with SMTP id c6-20020a056000184600b0022b066d12bdmr12807059wri.572.1664790965969; Mon, 03 Oct 2022 02:56:05 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id z10-20020a5d4c8a000000b002286670bafasm9120637wrs.48.2022.10.03.02.56.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:56:05 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Oct 2022 10:55:57 +0100 Message-Id: <20221003095558.1993-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221003095558.1993-1-naush@raspberrypi.com> References: <20221003095558.1993-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 3/4] ipa: raspberrypi: Add a tuning file for the colour variant of IMX296 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add the tuning file (imx296.json) for the colour variant of the IMX296 sensor. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/data/imx296.json | 424 +++++++++++++++++++++++++++ src/ipa/raspberrypi/data/meson.build | 1 + 2 files changed, 425 insertions(+) create mode 100644 src/ipa/raspberrypi/data/imx296.json diff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296.json new file mode 100644 index 000000000000..4e8305176039 --- /dev/null +++ b/src/ipa/raspberrypi/data/imx296.json @@ -0,0 +1,424 @@ +{ + "version": 2.0, + "target": "bcm2835", + "algorithms": [ + { + "rpi.black_level": + { + "black_level": 3840 + } + }, + { + "rpi.dpc": { } + }, + { + "rpi.lux": + { + "reference_shutter_speed": 7598, + "reference_gain": 1.0, + "reference_aperture": 1.0, + "reference_lux": 800, + "reference_Y": 14028 + } + }, + { + "rpi.noise": + { + "reference_constant": 0, + "reference_slope": 2.671 + } + }, + { + "rpi.geq": + { + "offset": 215, + "slope": 0.01058 + } + }, + { + "rpi.sdn": { } + }, + { + "rpi.awb": + { + "priors": [ + { + "lux": 0, + "prior": + [ + 2000, 1.0, + 3000, 0.0, + 13000, 0.0 + ] + }, + { + "lux": 800, + "prior": + [ + 2000, 0.0, + 6000, 2.0, + 13000, 2.0 + ] + }, + { + "lux": 1500, + "prior": + [ + 2000, 0.0, + 4000, 1.0, + 6000, 6.0, + 6500, 7.0, + 7000, 1.0, + 13000, 1.0 + ] + } + ], + "modes": + { + "auto": + { + "lo": 2500, + "hi": 8000 + }, + "incandescent": + { + "lo": 2500, + "hi": 3000 + }, + "tungsten": + { + "lo": 3000, + "hi": 3500 + }, + "fluorescent": + { + "lo": 4000, + "hi": 4700 + }, + "indoor": + { + "lo": 3000, + "hi": 5000 + }, + "daylight": + { + "lo": 5500, + "hi": 6500 + }, + "cloudy": + { + "lo": 7000, + "hi": 8600 + } + }, + "bayes": 1, + "ct_curve": + [ + 2500.0, 0.5386, 0.2458, + 2800.0, 0.4883, 0.3303, + 2900.0, 0.4855, 0.3349, + 3620.0, 0.4203, 0.4367, + 4560.0, 0.3455, 0.5444, + 5600.0, 0.2948, 0.6124, + 7400.0, 0.2336, 0.6894 + ], + "sensitivity_r": 1.0, + "sensitivity_b": 1.0, + "transverse_pos": 0.03093, + "transverse_neg": 0.02374 + } + }, + { + "rpi.agc": + { + "metering_modes": + { + "centre-weighted": + { + "weights": [ 3, 3, 3, 2, 2, 2, 2, 1, 1, 1, 1, 0, 0, 0, 0 ] + }, + "spot": + { + "weights": [ 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] + }, + "matrix": + { + "weights": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] + } + }, + "exposure_modes": + { + "normal": + { + "shutter": [ 100, 30000, 45000, 60000, 120000 ], + "gain": [ 1.0, 1.0, 2.0, 4.0, 12.0 ] + }, + "short": + { + "shutter": [ 100, 5000, 10000, 20000, 30000 ], + "gain": [ 1.0, 2.0, 4.0, 8.0, 16.0 ] + } + }, + "constraint_modes": + { + "normal": [ + { + "bound": "LOWER", + "q_lo": 0.98, + "q_hi": 1.0, + "y_target": + [ + 0, 0.5, + 1000, 0.5 + ] + } + ], + "highlight": [ + { + "bound": "LOWER", + "q_lo": 0.98, + "q_hi": 1.0, + "y_target": + [ + 0, 0.5, + 1000, 0.5 + ] + }, + { + "bound": "UPPER", + "q_lo": 0.98, + "q_hi": 1.0, + "y_target": + [ + 0, 0.8, + 1000, 0.8 + ] + } + ] + }, + "y_target": + [ + 0, 0.16, + 1000, 0.165, + 10000, 0.17 + ] + } + }, + { + "rpi.alsc": + { + "omega": 1.3, + "n_iter": 100, + "luminance_strength": 0.5, + "calibrations_Cr": [ + { + "ct": 4000, + "table": + [ + 2.726, 2.736, 2.737, 2.739, 2.741, 2.741, 2.742, 2.742, 2.743, 2.743, 2.742, 2.742, 2.742, 2.742, 2.741, 2.739, + 2.728, 2.736, 2.739, 2.741, 2.742, 2.743, 2.744, 2.745, 2.746, 2.746, 2.745, 2.743, 2.742, 2.742, 2.742, 2.741, + 2.729, 2.737, 2.741, 2.744, 2.746, 2.747, 2.748, 2.749, 2.751, 2.751, 2.749, 2.746, 2.744, 2.743, 2.743, 2.743, + 2.729, 2.738, 2.743, 2.746, 2.749, 2.749, 2.751, 2.752, 2.753, 2.753, 2.752, 2.751, 2.746, 2.744, 2.744, 2.746, + 2.728, 2.737, 2.742, 2.746, 2.749, 2.751, 2.754, 2.755, 2.754, 2.755, 2.754, 2.751, 2.748, 2.746, 2.747, 2.748, + 2.724, 2.738, 2.742, 2.746, 2.749, 2.752, 2.755, 2.755, 2.755, 2.755, 2.754, 2.752, 2.749, 2.749, 2.748, 2.748, + 2.726, 2.738, 2.741, 2.745, 2.749, 2.753, 2.754, 2.755, 2.755, 2.755, 2.754, 2.753, 2.749, 2.748, 2.748, 2.748, + 2.726, 2.738, 2.741, 2.745, 2.746, 2.752, 2.753, 2.753, 2.753, 2.753, 2.754, 2.751, 2.748, 2.748, 2.746, 2.745, + 2.726, 2.736, 2.738, 2.742, 2.745, 2.749, 2.752, 2.753, 2.752, 2.752, 2.751, 2.749, 2.747, 2.745, 2.744, 2.742, + 2.724, 2.733, 2.736, 2.739, 2.742, 2.745, 2.748, 2.749, 2.749, 2.748, 2.748, 2.747, 2.744, 2.743, 2.742, 2.741, + 2.722, 2.726, 2.733, 2.735, 2.737, 2.741, 2.743, 2.744, 2.744, 2.744, 2.744, 2.742, 2.741, 2.741, 2.739, 2.737, + 2.719, 2.722, 2.727, 2.729, 2.731, 2.732, 2.734, 2.734, 2.735, 2.735, 2.735, 2.734, 2.733, 2.732, 2.732, 2.732 + ] + }, + { + "ct": 6000, + "table": + [ + 3.507, 3.522, 3.525, 3.527, 3.531, 3.533, 3.534, 3.535, 3.535, 3.536, 3.536, 3.537, 3.537, 3.538, 3.537, 3.536, + 3.511, 3.524, 3.528, 3.532, 3.533, 3.535, 3.537, 3.538, 3.538, 3.541, 3.539, 3.539, 3.539, 3.539, 3.538, 3.538, + 3.513, 3.528, 3.532, 3.535, 3.538, 3.542, 3.543, 3.546, 3.548, 3.551, 3.547, 3.543, 3.541, 3.541, 3.541, 3.541, + 3.513, 3.528, 3.533, 3.539, 3.544, 3.546, 3.548, 3.552, 3.553, 3.553, 3.552, 3.548, 3.543, 3.542, 3.542, 3.545, + 3.513, 3.528, 3.534, 3.541, 3.547, 3.549, 3.552, 3.553, 3.554, 3.554, 3.553, 3.549, 3.546, 3.544, 3.547, 3.549, + 3.508, 3.528, 3.533, 3.541, 3.548, 3.551, 3.553, 3.554, 3.555, 3.555, 3.555, 3.551, 3.548, 3.547, 3.549, 3.551, + 3.511, 3.529, 3.534, 3.541, 3.548, 3.551, 3.553, 3.555, 3.555, 3.555, 3.556, 3.554, 3.549, 3.548, 3.548, 3.548, + 3.511, 3.528, 3.533, 3.539, 3.546, 3.549, 3.553, 3.554, 3.554, 3.554, 3.554, 3.553, 3.549, 3.547, 3.547, 3.547, + 3.511, 3.527, 3.533, 3.536, 3.541, 3.547, 3.551, 3.553, 3.553, 3.552, 3.551, 3.551, 3.548, 3.544, 3.542, 3.543, + 3.507, 3.523, 3.528, 3.533, 3.538, 3.541, 3.546, 3.548, 3.549, 3.548, 3.548, 3.546, 3.542, 3.541, 3.541, 3.541, + 3.505, 3.514, 3.523, 3.527, 3.532, 3.537, 3.538, 3.544, 3.544, 3.544, 3.542, 3.541, 3.537, 3.537, 3.536, 3.535, + 3.503, 3.508, 3.515, 3.519, 3.521, 3.523, 3.524, 3.525, 3.526, 3.526, 3.527, 3.526, 3.524, 3.526, 3.527, 3.527 + ] + } + ], + "calibrations_Cb": [ + { + "ct": 4000, + "table": + [ + 2.032, 2.037, 2.039, 2.041, 2.041, 2.042, 2.043, 2.044, 2.045, 2.045, 2.044, 2.043, 2.042, 2.041, 2.041, 2.034, + 2.032, 2.036, 2.039, 2.041, 2.042, 2.042, 2.043, 2.044, 2.045, 2.046, 2.045, 2.044, 2.042, 2.041, 2.039, 2.035, + 2.032, 2.036, 2.038, 2.041, 2.043, 2.044, 2.044, 2.045, 2.046, 2.047, 2.047, 2.045, 2.043, 2.042, 2.041, 2.037, + 2.032, 2.035, 2.039, 2.042, 2.043, 2.044, 2.045, 2.046, 2.048, 2.048, 2.047, 2.046, 2.045, 2.044, 2.042, 2.039, + 2.031, 2.034, 2.037, 2.039, 2.043, 2.045, 2.045, 2.046, 2.047, 2.047, 2.047, 2.046, 2.045, 2.044, 2.043, 2.039, + 2.029, 2.033, 2.036, 2.039, 2.042, 2.043, 2.045, 2.046, 2.046, 2.046, 2.046, 2.046, 2.046, 2.045, 2.044, 2.041, + 2.028, 2.032, 2.035, 2.039, 2.041, 2.043, 2.044, 2.045, 2.045, 2.046, 2.046, 2.046, 2.046, 2.045, 2.044, 2.039, + 2.027, 2.032, 2.035, 2.038, 2.039, 2.041, 2.044, 2.044, 2.044, 2.045, 2.046, 2.046, 2.046, 2.045, 2.044, 2.039, + 2.027, 2.031, 2.034, 2.035, 2.037, 2.039, 2.042, 2.043, 2.044, 2.045, 2.045, 2.046, 2.045, 2.044, 2.043, 2.038, + 2.025, 2.028, 2.032, 2.034, 2.036, 2.037, 2.041, 2.042, 2.043, 2.044, 2.044, 2.044, 2.044, 2.043, 2.041, 2.036, + 2.024, 2.026, 2.029, 2.032, 2.034, 2.036, 2.038, 2.041, 2.041, 2.042, 2.043, 2.042, 2.041, 2.041, 2.037, 2.036, + 2.022, 2.024, 2.027, 2.029, 2.032, 2.034, 2.036, 2.039, 2.039, 2.039, 2.041, 2.039, 2.039, 2.038, 2.036, 2.034 + ] + }, + { + "ct": 6000, + "table": + [ + 1.585, 1.587, 1.589, 1.589, 1.589, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.589, 1.588, 1.588, 1.587, 1.581, + 1.585, 1.587, 1.588, 1.589, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.588, 1.588, 1.587, 1.582, + 1.585, 1.586, 1.588, 1.589, 1.591, 1.591, 1.591, 1.591, 1.592, 1.592, 1.591, 1.591, 1.589, 1.588, 1.587, 1.584, + 1.585, 1.586, 1.588, 1.589, 1.591, 1.592, 1.592, 1.592, 1.593, 1.593, 1.592, 1.591, 1.589, 1.589, 1.588, 1.586, + 1.584, 1.586, 1.587, 1.589, 1.591, 1.591, 1.592, 1.592, 1.592, 1.592, 1.591, 1.591, 1.591, 1.589, 1.589, 1.586, + 1.583, 1.585, 1.587, 1.588, 1.589, 1.591, 1.591, 1.592, 1.592, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.586, + 1.583, 1.584, 1.586, 1.588, 1.589, 1.589, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.585, + 1.581, 1.584, 1.586, 1.587, 1.588, 1.588, 1.589, 1.591, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.589, 1.585, + 1.581, 1.583, 1.584, 1.586, 1.587, 1.588, 1.589, 1.589, 1.591, 1.591, 1.591, 1.591, 1.591, 1.589, 1.589, 1.585, + 1.579, 1.581, 1.583, 1.584, 1.586, 1.586, 1.588, 1.589, 1.589, 1.589, 1.589, 1.589, 1.589, 1.589, 1.587, 1.584, + 1.578, 1.579, 1.581, 1.583, 1.584, 1.585, 1.586, 1.587, 1.588, 1.588, 1.588, 1.588, 1.588, 1.587, 1.585, 1.583, + 1.577, 1.578, 1.579, 1.582, 1.583, 1.584, 1.585, 1.586, 1.586, 1.587, 1.587, 1.587, 1.586, 1.586, 1.584, 1.583 + ] + } + ], + "luminance_lut": + [ + 1.112, 1.098, 1.078, 1.062, 1.049, 1.039, 1.031, 1.027, 1.026, 1.027, 1.034, 1.043, 1.054, 1.069, 1.087, 1.096, + 1.106, 1.091, 1.073, 1.056, 1.042, 1.032, 1.025, 1.021, 1.021, 1.022, 1.027, 1.036, 1.047, 1.061, 1.077, 1.088, + 1.101, 1.085, 1.066, 1.049, 1.035, 1.026, 1.019, 1.013, 1.013, 1.015, 1.021, 1.028, 1.039, 1.052, 1.069, 1.083, + 1.098, 1.081, 1.059, 1.045, 1.031, 1.021, 1.013, 1.007, 1.007, 1.009, 1.014, 1.021, 1.033, 1.046, 1.063, 1.081, + 1.097, 1.076, 1.057, 1.041, 1.027, 1.016, 1.007, 1.004, 1.002, 1.005, 1.009, 1.017, 1.028, 1.043, 1.061, 1.077, + 1.096, 1.075, 1.054, 1.039, 1.025, 1.014, 1.005, 1.001, 1.001, 1.002, 1.006, 1.015, 1.027, 1.041, 1.058, 1.076, + 1.096, 1.074, 1.054, 1.039, 1.025, 1.013, 1.005, 1.001, 1.001, 1.001, 1.006, 1.015, 1.026, 1.041, 1.058, 1.076, + 1.096, 1.075, 1.056, 1.041, 1.026, 1.014, 1.007, 1.003, 1.002, 1.004, 1.008, 1.016, 1.028, 1.041, 1.059, 1.076, + 1.096, 1.079, 1.059, 1.044, 1.029, 1.018, 1.011, 1.007, 1.005, 1.008, 1.012, 1.019, 1.031, 1.044, 1.061, 1.077, + 1.101, 1.084, 1.065, 1.049, 1.035, 1.024, 1.017, 1.011, 1.011, 1.012, 1.018, 1.025, 1.036, 1.051, 1.068, 1.081, + 1.106, 1.092, 1.072, 1.055, 1.042, 1.033, 1.024, 1.019, 1.018, 1.019, 1.025, 1.032, 1.044, 1.058, 1.076, 1.088, + 1.113, 1.097, 1.079, 1.063, 1.049, 1.039, 1.031, 1.025, 1.025, 1.025, 1.031, 1.039, 1.051, 1.065, 1.083, 1.094 + ], + "sigma": 0.00047, + "sigma_Cb": 0.00056 + } + }, + { + "rpi.contrast": + { + "ce_enable": 1, + "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, + 65535, 65535 + ] + } + }, + { + "rpi.ccm": + { + "ccms": [ + { + "ct": 2500, + "ccm": + [ + 1.73697, -0.36758, -0.36939, + -0.46469, 1.75868, -0.29399, + 0.14353, -1.26221, 2.11867 + ] + }, + { + "ct": 2800, + "ccm": + [ + 1.77684, -0.48089, -0.29595, + -0.41669, 1.74344, -0.32675, + 0.11995, -1.10172, 1.98177 + ] + }, + { + "ct": 2900, + "ccm": + [ + 1.83447, -0.50694, -0.32754, + -0.44924, 1.86236, -0.41312, + 0.06159, -0.91231, 1.85071 + ] + }, + { + "ct": 3620, + "ccm": + [ + 1.91315, -0.61463, -0.29852, + -0.38782, 1.80483, -0.41701, + 0.00632, -0.74309, 1.73678 + ] + }, + { + "ct": 4560, + "ccm": + [ + 2.13144, -0.79703, -0.33441, + -0.41488, 2.10864, -0.69376, + -0.03975, -0.70785, 1.74761 + ] + }, + { + "ct": 5600, + "ccm": + [ + 1.95828, -0.76779, -0.19049, + -0.26299, 1.70577, -0.44278, + -0.05451, -0.51918, 1.57369 + ] + }, + { + "ct": 7400, + "ccm": + [ + 2.14829, -0.65425, -0.49405, + -0.46729, 2.66571, -1.19841, + -0.28128, -0.56248, 1.84377 + ] + } + ] + } + }, + { + "rpi.sharpen": { } + } + ] +} \ No newline at end of file diff --git a/src/ipa/raspberrypi/data/meson.build b/src/ipa/raspberrypi/data/meson.build index 465a7a17ce6f..6c5beb0e0f67 100644 --- a/src/ipa/raspberrypi/data/meson.build +++ b/src/ipa/raspberrypi/data/meson.build @@ -4,6 +4,7 @@ conf_files = files([ 'imx219.json', 'imx219_noir.json', 'imx290.json', + 'imx296.json', 'imx296_mono.json', 'imx378.json', 'imx477.json', From patchwork Mon Oct 3 09:55:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17501 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 2D887C3285 for ; Mon, 3 Oct 2022 09:56:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3F0EB62CF7; Mon, 3 Oct 2022 11:56:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664790970; bh=JT4AFghXZuf9Q/NysMYblrKvQvGHwjVe7qUN6YYkKnk=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=RBrnTnXeKXh2gGvN55PnshOlRnoMxZtujaHPQ8OzwiepqsflENm5Qy/CICP4+Lj4d wuToYM0uU82Sb+OQhRQi/vNHAagcRiJ5miYBv2Sn0kvt/beTA/xdg5uQC0dmfaOpPw 5qL0lucCdoW4ETNt408Bgm4wrv/EpArx1wbi/PUgxBSCQRXbjCfsAEsVRedvOmRrwi 73glGhf33DRzW8VhIcfk0mkyJJzlwj3YzQOyN/oZpl3pDQ/SsmUqexuH55cBJw+7we ZHf4j40sv2bI5Y7eenTZTFA111KkeLM8gtY06582SKhXjjbYoXNBX/qFvpWAEVhI0C /fvmUy5/b4Z5Q== Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1694162CEE for ; Mon, 3 Oct 2022 11:56:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="DPQ4XeR2"; dkim-atps=neutral Received: by mail-wr1-x429.google.com with SMTP id b4so8932635wrs.1 for ; Mon, 03 Oct 2022 02:56:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=DLXRwbDstI4WRv//kM0uwMejJ/GlpYuWvQLlXNsMeWE=; b=DPQ4XeR2bIk18pzrlvZnOnZhiv3zhIX81YJpZ7EkNBhi6WgjF6q2NAgDJxeFScVD8Z 7dO+pN6KjOpxQzHGz/rdPtXjti8GvGdnvdxJKMRnQ90mATxhzwJzoljFGnrj7TsdtULN GW5puzu01CdyuZLullFYkFZAOqa2/devmMcTV+qVPXes1eLY++Mn1JgpI74GEieLwVeI WLuZEqqCpCB+ML39MmvB45l9U39CzmNXx4xv8J8ozrfApUjL9quyDIjP9jFZmaG/rvln N8UkgRj0MmT4I9i7NadEUL/wyU7cEuFDtFU244kzHZDDtrjOxON8TFzUXCvym1+fzsCv AR7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=DLXRwbDstI4WRv//kM0uwMejJ/GlpYuWvQLlXNsMeWE=; b=WWDEviKiA8VwYbqy+J0nxLiVBg8smL1lMNz/QWUysvCnwO/KzDi9z4gigpqLtGEQaU u37tkTxKX7a4oywtDi9UHl8KrnhtmeVEX94LFOLMvfhhUE4l3N5dYkFK3T5WXVIcqVZB hfNLsazsaKu0r8MVsPu5EW6zIX+ov4KYhI2yBV4wDXYDwkSNmtMhfg+2b/fFkr+OHQP3 zlBnedDN82odcWuwqc+Km3xppKSZTXnp+dC4TAiCRwP6/x8zCdiIH8JaCCrRbr+0fjjg GFuTFs/5e+ZCHxBCMGq3gTdLBtQ3FOVSn5NxjQIU/+AVo0tImlb2pJm4Ey97V1mTwiHw DnLw== X-Gm-Message-State: ACrzQf1Y6qJX0+zo0eNlZEOJM9KorjhMjkQxXO8+DQX0LOWI4wr3h0Gr chvD/AjlCwptfXfX5ZA/YCGEtunUraQ8UA== X-Google-Smtp-Source: AMsMyM52C9WwjTIFiLgr7KITlGgst0BaFSEezAdGPWdm0vrfRIeOBe289Pgguq1uw73FetqPs+FW2g== X-Received: by 2002:adf:f18c:0:b0:22c:df1c:92cd with SMTP id h12-20020adff18c000000b0022cdf1c92cdmr10140248wro.52.1664790966585; Mon, 03 Oct 2022 02:56:06 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id z10-20020a5d4c8a000000b002286670bafasm9120637wrs.48.2022.10.03.02.56.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 02:56:06 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 3 Oct 2022 10:55:58 +0100 Message-Id: <20221003095558.1993-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221003095558.1993-1-naush@raspberrypi.com> References: <20221003095558.1993-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/4] ipa: raspberrypi: Fix the imx296 mono tuning black level X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The sensor black level is 60 (in 10-bits), fix this in the mono variant tuning file. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart --- src/ipa/raspberrypi/data/imx296_mono.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ipa/raspberrypi/data/imx296_mono.json b/src/ipa/raspberrypi/data/imx296_mono.json index 490c0fda0cca..b68b11dbd609 100644 --- a/src/ipa/raspberrypi/data/imx296_mono.json +++ b/src/ipa/raspberrypi/data/imx296_mono.json @@ -5,7 +5,7 @@ { "rpi.black_level": { - "black_level": 4096 + "black_level": 3840 } }, {