From patchwork Mon Sep 26 12:29:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17406 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 3E2BABD16B for ; Mon, 26 Sep 2022 12:29:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 659A76225A; Mon, 26 Sep 2022 14:29:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664195362; bh=yj/jTMvBsZS1ayEbLDZyvfn94nLkIwbn9g4dR4W+CXM=; 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=mfjMvm6i1DVO7m19zm54Tf3b+PZ2hGMTgNcUQs27cFUW6fQvOzjNrKt9xf6Px3BV4 unA0YFkGqWFTJgGPS0yFLs5xpRJgpLuIrugPx1CcfaHZ+FkwK6CJDe/JkP0aRI8qYg xXYYfKZgAtNzDAoVG3hGAxLyT/aVNJiETN84Ez92Egzrs8p6KqiIQe8HK1y79WTZtK ANIDnS65pgKZMEvd16+HSC6KzxZsy0IUGQMkgTleXDogEZxzGl3p5utGwpWxo/QXtv Ym0uQfPEqGW3B4H7daLRkuIk8VU+pK/jNiPdXlwNlxuLXlYwmYa/rlnRYS+OG7z3hZ 8eSZez2ZwNjvw== Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 09F116218B for ; Mon, 26 Sep 2022 14:29:21 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="glfKQKYS"; dkim-atps=neutral Received: by mail-wm1-x32b.google.com with SMTP id ay36so4403743wmb.0 for ; Mon, 26 Sep 2022 05:29:21 -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=1dZeFwrbwJ+KJHzRqVZrZyvDMarrSJCU4CMpHHuzvAI=; b=glfKQKYSU/wgCpe2Mfjr5s4Lly1LeLV/WizLlks/nuww+2OC4dhwRICXJaLJHhBJKo 7swhkulPmRJkGfv78a8FXfpFLl1oKdraOuwx/Xt/Y44ORyLyxW1v/qDWOd2SVyUGQGhI Lsw2xjLlbE5To2hpgg4LjCpIf4wvz6Gm07d5Sb+23wYj5uoqn5vvDZUuG27tx1nYJhWm 7DZFpAv8AgVj9ber07HVTh6RRw5wCe+JGgMVzcoF40xr7p2dJgf4yY/gSMjYT5et1bZS M/s1ehIEBTrzHiNdZL30SlsPMne0Megob8BVb69cN7eW5iY9tE/2cXXYMEpSCZMcfdmO gCyw== 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=1dZeFwrbwJ+KJHzRqVZrZyvDMarrSJCU4CMpHHuzvAI=; b=BsEVl6oCX8UFn8rtPf4/JTbizyXxSK+ebPPKYL8Jbr4fo5Mq4Xx1ZjUUJ4nL/Fn88N QDhh+5PGthtzbGmzDcRzV4e7v5PJFERpeg43u1ThMPt06e5K+UIiFVGsrfkTR05ecfLx xpg5kjmHx/vehydadmDAWYfi5Pr5kqwm7nWG3D9Y3/WF8Tj25xqPIVvuF+x9lFKhpusJ Ip6HYmA/YZOzuFIi3tX//qU/teB4VK3qDoQ1lNQ9lugrQTbwijlLZvBIXoAU9i3jH37m C65h/PNSTOUuEVzD3ETCFYSmH/mKpfawaCVB8ge+HRRJ2KjQD5dLSDb/16G2XXfI78em 6d4g== X-Gm-Message-State: ACrzQf35SQ0teJYOzX6ZHZE8+fNnWGAOtl6oT4qc0zMMS5MVsJctwf7x DQWIacFR/RGWZdidRJ4ZF5Qmmsat2xBupDIA X-Google-Smtp-Source: AMsMyM71Xe7R2O8NGaXhIdkba2+52nDDNREuwbpyGkXA9iUSKtCMRgQgRHIn5DpfkGIUKifMeHjCzA== X-Received: by 2002:a05:600c:1d28:b0:3b4:91f4:897d with SMTP id l40-20020a05600c1d2800b003b491f4897dmr14691877wms.137.1664195360451; Mon, 26 Sep 2022 05:29:20 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i24-20020a1c5418000000b003a601a1c2f7sm11243700wmb.19.2022.09.26.05.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 05:29:20 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 26 Sep 2022 13:29:08 +0100 Message-Id: <20220926122911.13412-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926122911.13412-1-naush@raspberrypi.com> References: <20220926122911.13412-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 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 --- 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 Sep 26 12:29:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17407 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 66C97BD16B for ; Mon, 26 Sep 2022 12:29:26 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1356F62266; Mon, 26 Sep 2022 14:29:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664195366; bh=/W+6w22mwo/UbUeLx2OiB9XQvA7QNLWp3TyyjuUiy9E=; 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=yuTqvLtwyvbd5Fc0WIBxoZD/hoNwr+aD6jq1W9MZy1blqaQmuzjD8Fc9aMp1XS6t6 XLIwAiBxJwGTC9xrcSXnQCADKLkDiZSdWsfR0ZjtadTrTWh5b+wFrr+kTU3tlwSCdr sOJCJ+gxqDU+vZ8+r4tvkn3RakHGJqYmiJC64ty/OYkzDfojMmapSh+c5XiXB2BCEy 2AVRcQ1lSlyVFkWZasBrdvSNYsokcsv1r/+feuRqUlrUuEBKWWXvjqgWml1I6nxKqX PljOZFEtoAiniySyPSUKNuWlPpYrMj8x2RmW5Kf215BC+Q+xfkzq4JY19i05FSXJoF OV+wNCcSMb6gQ== Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 24A126225F for ; Mon, 26 Sep 2022 14:29:22 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="W6NtRKYT"; dkim-atps=neutral Received: by mail-wr1-x42d.google.com with SMTP id cc5so9975798wrb.6 for ; Mon, 26 Sep 2022 05:29:22 -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=lk4xKf8q+Qd6eW3jkL4LSWFq+x5ua71EkVwKLtYfjmg=; b=W6NtRKYTbOEIkDsg9kShavtE1LntET6KRfqqDGrOC+Y7wXJaCq5vYA1ayOSirhk5VE ulBFDfzm/bb5dZSw1BDuxlRS3AuRWfy70WPOgjjpZRv8vlpdemAci0g/kYrpJdc3Gqb2 JY3KWC3HdGeOseOhZjkKbowMwI6Xwv7ePDc06mo72vwmFk3ezMmrOQLMG258GfYs/29y ZpRCmcgTh4XNUTHTLJaOVXWYJkQ5HTVOoAW2xGupIWdYvzhQOgPkEbjRZ8v9xye6L939 YO3w5ssmAaNLZ8H0TI2ilcX24aXeOFxRR6MuGIUH3pSzekkLFITUxEQuIKDF2vvZl5JB 1+bQ== 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=lk4xKf8q+Qd6eW3jkL4LSWFq+x5ua71EkVwKLtYfjmg=; b=M6zxsVUT5fQMS9MrxQuIHdCOfYe8kh802b1rhNklmWEk1yxSuwLjptDOdyqrKbJkL0 MdriqYlf9PmVyWDbJ7b792pslVfNtB/UxcHWtHbOCApn3oEVmYGP7LsvnsdFCVWE3Yxm xHjoFiwIgXVASzYnx0OGZLXyNT9oKo55CE1ILQ2qSTObdjHUMSdORGO+jpjtbiBjgEJK A1B5JunqeDq2Jggv6KluhZEFfgKEkyXctw4ZAuqxOMB9RSqlT6xnBwiuHDi9qWzBHcmM S2fovIYsDkm6f4pBIyPmcKSXtFCRTPJ6J9uZmiKo5y7dfbB+wDZWYQ4X9ZiEiXSZptYh 6LqQ== X-Gm-Message-State: ACrzQf2mTSi1lr/K+/aYKfX+kewB2L4ptACKI4X2QiMuQiV91p4GxmYC ns0JI/aAlcTIo1EJRaIkq9y8THD0+RuIB7wn X-Google-Smtp-Source: AMsMyM6tOlzkXbay2n4KkhHxbk9Q/340Hf4c7lTGg2nZuehP3WHRE38B+FZL8kPF2HFFpUKxdqWqoQ== X-Received: by 2002:adf:ecd2:0:b0:228:6439:a24 with SMTP id s18-20020adfecd2000000b0022864390a24mr13271914wro.401.1664195361168; Mon, 26 Sep 2022 05:29:21 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i24-20020a1c5418000000b003a601a1c2f7sm11243700wmb.19.2022.09.26.05.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 05:29:20 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 26 Sep 2022 13:29:09 +0100 Message-Id: <20220926122911.13412-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926122911.13412-1-naush@raspberrypi.com> References: <20220926122911.13412-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 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 --- .../data/{imx296.json => imx296_mono.json} | 0 src/ipa/raspberrypi/data/meson.build | 2 +- .../pipeline/raspberrypi/raspberrypi.cpp | 19 +++++++++++++++---- 3 files changed, 16 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..c068b07b31fe 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]; + BayerFormat bayer = BayerFormat::fromMbusCode(mbusCode); + + return bayer.order == BayerFormat::Order::MONO; +} + PixelFormat mbusCodeToPixelFormat(unsigned int mbus_code, BayerFormat::Packing packingReq) { @@ -1551,10 +1559,13 @@ 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 - configurationFile = std::string(configFromEnv); + std::string sensorStr = sensor_->model(); + if (!configFromEnv || *configFromEnv == '\0') { + if (isMonoSensor(sensor_)) + configurationFile += "_mono"; + configurationFile = ipa_->configurationFile(sensorStr + ".json"); + } else + configurationFile = sensorStr; IPASettings settings(configurationFile, sensor_->model()); From patchwork Mon Sep 26 12:29:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17408 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 88981C327E for ; Mon, 26 Sep 2022 12:29:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 39E9B62263; Mon, 26 Sep 2022 14:29:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664195367; bh=Z0m25t5EBKglmrVf5geFcRO3+Zfp77VtyrkQ/t6+P6E=; 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=M6exqtPwBo6IPZ0hvVc5hl5lUp6oUH27YxNOnaprRbRSNYVJpT7WJj0ZSxQQLNh+T 4D5H8/how65VrWg4XntQsA1tUUttH8Xv/MTDk/sv2PeJn9p88dQImReRrs6vsGmvCy 8z1hqZN0ilZP0AuQfZQF5UAEDNdAXxeQWiUMSQoX5EqBX6/KTL80FefEfRQoCqlD2t mXxLaEfdWxHOse/vue958hCnMI8LxpwaqaP5Xq+cbviedw4PFipPReZE2OjBjfdxrN HwOnGtvzPn3g5/R0kcNTS1YRlh/ZW37Zy7TlqBwyN2gay4YYESP3nLLZKgONXfleqI OWOGkX0VtF41g== Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E73EA62263 for ; Mon, 26 Sep 2022 14:29:22 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="txKg61mh"; dkim-atps=neutral Received: by mail-wr1-x42a.google.com with SMTP id x18so9956839wrm.7 for ; Mon, 26 Sep 2022 05:29:22 -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=02gW0ToGvgI9jIq/4ulZLmzrMxwRniMsriGY1FBbLpE=; b=txKg61mh60Cg7Eq0vWjW+CJO3TSz7TMICkoEhmu+UohRjOYe8L8r6sy0q68dRU5A9l Q09+ixOqz/ald4Qnrba4SvWcqMrA8LjMESAY17f+kUUHpPDiwo34hD2KA3vSjLC1JMkk BFzmwS/jFV33knK44VtgWrdhyr6G1GanD++uOhWf+5/e9r+Siy3G65N7BPTKsM+HInrm Ncyen/J3bAH8eyDsMxQCnji6x/34//ELGAOmB2VdGY/q165JY51+iPUyflfl6H4ITAzd WxfctKB9veVOeY9ORMM1d65eW9U3vGBXLBhQFwyO2RsaMeyBOeFCGqvFNiHbDDVYXpOb cADg== 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=02gW0ToGvgI9jIq/4ulZLmzrMxwRniMsriGY1FBbLpE=; b=Z4OPpDTm31GXkdpl93o1RVBeSccZGsaOFk/vzkDCH8USJaxYnKDEsZ/umyJpFDfl3J KCfxP9/luTH3l0aY9vx8GVOp9D3pC4DuT6RfF5xZtf9/8aXniHfD0kKLj+PdNH2cPGXx CNBu2OD1tnX2bE+pu7qYYUF8V9H5dW2hoT9O55AcfcACMf93NFCOYeTGlNz18D0oGDcM +n+oG/3/NGASZoNL4pY6ctDqPAm3eT43wpMR1ghkqp61uXAllZ8SzCLonyKzr62xTk8J MeJTkxOUNJ517zIHgrOc7byixsHpznGASvQFgXtXo++RFYo5e3iuCNm+1sn6dIxqiNWG STJQ== X-Gm-Message-State: ACrzQf3JxYwTWueNkXGeAV8qTQJ6SfTuDIgYMIbfkP4damCbpkICn9pY zaMHQPk0lh/3cFXw94yWrlyE10PyBH7JcfLV X-Google-Smtp-Source: AMsMyM6055qK4dsOJ2O3cQGuuIHoT+FKp8du81qq+K/UbZttdZvW6Xbd3AnV1ZDT7m5SOl3+OifAUA== X-Received: by 2002:a05:6000:1c8:b0:22a:5a6d:c77a with SMTP id t8-20020a05600001c800b0022a5a6dc77amr12526161wrx.242.1664195361772; Mon, 26 Sep 2022 05:29:21 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i24-20020a1c5418000000b003a601a1c2f7sm11243700wmb.19.2022.09.26.05.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 05:29:21 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 26 Sep 2022 13:29:10 +0100 Message-Id: <20220926122911.13412-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926122911.13412-1-naush@raspberrypi.com> References: <20220926122911.13412-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 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 --- 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 Sep 26 12:29:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17409 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 6CA41BD16B for ; Mon, 26 Sep 2022 12:29:28 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0F49962264; Mon, 26 Sep 2022 14:29:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664195368; bh=s6Qyar8cASDkbnmgt76GRFCsd7QGpI7gHFNyRBT3xVA=; 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=RULABlcP8K0Fj7vIMHuGkFL0h6b/g2qR/wcv6ocO5Uy9Xn19jEEm7khM5e/+uqj2s mMpHED0aoN6mlWyZnWEEjd8IDt5v4fANdD+UO5AZTRG73iFUVw+b/QDwSXjicCmzHA oAW4i4V2MrVY0uL/uze5sh/R7jSMXXgwu8diXNi4KHxI380rEGRNa1HFgHnMWLfkkh UactOnA8U50qLuST9EqiASCv28ANg6FCthWqSmGf6gNzUtKjVB7DiUvA2t5VgFeSmd ztTHhK6e7PNkx8gE+QzoA87VzQjn4D2V9sNUQr6uGLYKKgvLMEew2y7rXT1jJFlZ3S M7G4lQv077QpA== 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 0E10362259 for ; Mon, 26 Sep 2022 14:29:23 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="ftJdbtM5"; dkim-atps=neutral Received: by mail-wr1-x429.google.com with SMTP id r7so10006045wrm.2 for ; Mon, 26 Sep 2022 05:29:23 -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=2V6WkCSZ3l7A+a9klEI4YI4/8ToveYtFSjtBeHp9+s4=; b=ftJdbtM5B5tcKM1hJiqPWKJdxkKJs3OXTKAYhpI33z3KZzjBiJTsFJVheODUgSTkjY T5rmRM9Jfv8rCv/Yp/964Z1JNqixwWB+el+UuBOs5WeDhG4PvIy4T/Vi2W1w6UmCkEfx fVW28k/MaYpLxCBFzEaj4zSDkQZ7SoVXEAytUAqVYeI2gj2ezPgKBmI7zblXta3NVHYM TrWcOYD32tqwt+u2R7k4v5YipCOBgO88NVdz8muNCDyBSGj1DFHMztcCIEPuEx2jDTNo pABgYvI5T3XaxYyJRj7BgV0Mb3ONdP8YK87Ulgo6kE/6Gu9cm969d3Qga3xK5SP8o1kx sSgA== 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=2V6WkCSZ3l7A+a9klEI4YI4/8ToveYtFSjtBeHp9+s4=; b=oPrefKvniiOmO7Ar49YOV95rBuierMJszjYHhm8fFmFzNw4VYULF77oRTU8DxSzTP+ mEz6jASY26yJpGbI4jR24I/+2ffpwtfcpKYGozxdAB7r6EEAFW4GFKAr4aJ6ar4nTdCR UfhU3LmryoLF7O6uws8YwOXVk5qrIlSHbDl+p50XM0FMVUBCXKK/bsxfHU0FuWbTFcfN Ecrk/QsNKJmU65vOW0yCPNm5rH3DQR6CjWRWCsROAi8i8QlCrwRpRL/JWnpK5qoiSK/k 9cW5g8cJvNg0MnDmJiUVV20kctn9Af95tna0dT7gH4xlU0uC5mGxqCmjAreN4lwJe8R7 V7+A== X-Gm-Message-State: ACrzQf07TlQ2GzvNxeql+jeGtVDpdzxJptvFc5EBDxtZx1THBMH0eLaS /+X+e5NQXGCxrQKCGvCgz2E9NaE5xypSs6qg X-Google-Smtp-Source: AMsMyM6dW5Jp2hK228B/8C+PBjjU8o0fF/auRU69SfnSSazsxKaHYnjFQQx9ZJbBm79JB7Ujy9Jdng== X-Received: by 2002:a05:6000:18a5:b0:22c:943d:221 with SMTP id b5-20020a05600018a500b0022c943d0221mr6719890wri.562.1664195362327; Mon, 26 Sep 2022 05:29:22 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id i24-20020a1c5418000000b003a601a1c2f7sm11243700wmb.19.2022.09.26.05.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 05:29:22 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 26 Sep 2022 13:29:11 +0100 Message-Id: <20220926122911.13412-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926122911.13412-1-naush@raspberrypi.com> References: <20220926122911.13412-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 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 --- 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 } }, {