From patchwork Thu Sep 29 07:23:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17456 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 C24D9BD16B for ; Thu, 29 Sep 2022 07:23:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 861196237B; Thu, 29 Sep 2022 09:23:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664436224; bh=Esw+PKlMUhzQZjzyZlzUb+GCgSrKDjftt/ovMCu6bc8=; 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=324ugnX04Ax/5UF2Ql7Wbd2o3RfdWJhZEz2VO7q7c8UtEP+ub7IAolB1/8Qdj6Tie zb3OjZAFvVRr7EIuTFBaCCoa70IWKUrOQpbIo3y/sk8bOHmeIecVkp/1mxCSDvfmUa pir/jfu8Bwh4ZNSLGtoZ7OYNWkfOYjZQPdopfShNUjlgdoEPKLw1sPj6mHm1fvWuu9 kcWUASB4jT4wiC21fnAla8PgvYtnJoRIw2wLrtzyiW8jH8Z8d5JZVnVfxpjfSwLg+N XCbiU3MHEnyNER0OAzcQQ+jXR+3GZDFI29uvulWK7H/9z9jmJVWt2J2QPq325ajIx9 s3GrdN1aJ9PJw== 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 87913603DE for ; Thu, 29 Sep 2022 09:23:43 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Ez/jS9Lb"; dkim-atps=neutral Received: by mail-wr1-x42d.google.com with SMTP id u10so609055wrq.2 for ; Thu, 29 Sep 2022 00:23:43 -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=8wtxZwObFHA9ilu7XqVJV7T6C7uNmlcSOsuQirRslTk=; b=Ez/jS9LbNwSkAmL6znhVgzk0AxptHWkRigfYaWup2HFBbFJmiku5C7qBep893qSx1X vcc5HprH8/IAyoZXhxBeofAFlakuz4ExKrZ0goHjo6nrEKujwCsmbEorrPIHaAxdI8M2 drz2Z7MNlQ8Ac/yXDEM8mZpCn0Q3UubFs5TLAo9raOMX1sYxtDSSt0KOIuC1nO2SwD4u kLCCKr4sUM/4+y9Au97D01FFhgpaATOD8pygXQcNB07WSIDTkhpYUzn4FdY4SklHLSF7 ZZjPnJ7WWmvsOm5Ijd+YNHB+ZMa3KFq8pX9tXetoktg479IFlM+8et6QLYJVoXvn67TM g/sA== 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=8wtxZwObFHA9ilu7XqVJV7T6C7uNmlcSOsuQirRslTk=; b=O4AyDeoFeoCgNhMeV/hMHrGcQ6L7GF68LeAHJK6PJGqybru5s2VDPHNd9n2oOjo1Io EPhg7E2W8gmgcNsAqtapu8Swa4TOO35AaqBScXxO2M9KWRw7jek8jNgp5f8fTsX9fuX2 cav1MlEsQMuP8ITiKPmX38XGXM32LyuVALUJCLyrzQ1TZUZs/rFX0xVJ1TY/1EnSNRS6 loUX8lPP9xtkLId6tg1GfSWvBx3Xx6RCLqnkI/x/WpYDZgn9+RlTmQU/B9Cz79zxmlAQ hRpdUSJKIR19+srsijqG/CRDiEMdwZnHOYTX0OxDY6+pAKAjsL2SrfgR26IG6lBFV7z5 zdLw== X-Gm-Message-State: ACrzQf2SirLdKwZ+HIvC+ClU1JEP8O2VtN08qlemZXSy+fTcB7AcJ7ps NYq62nvU9AGFhi53H7GxFgxJNrkT5DnIcQ== X-Google-Smtp-Source: AMsMyM6pjCwfNR3gu8OPj7nJuR/vSU8z+RG3pl5CoN/D9CLRiAm4EmMWmF979Wg+0Vgwp0Xgsf2qKg== X-Received: by 2002:a5d:47a6:0:b0:22a:3764:cdfa with SMTP id 6-20020a5d47a6000000b0022a3764cdfamr1062261wrb.547.1664436223028; Thu, 29 Sep 2022 00:23:43 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c1c0600b003b483000583sm3929805wms.48.2022.09.29.00.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 00:23:42 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 29 Sep 2022 08:23:20 +0100 Message-Id: <20220929072323.7400-2-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220929072323.7400-1-naush@raspberrypi.com> References: <20220929072323.7400-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 --- 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 Thu Sep 29 07:23:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17457 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 2E736C327E for ; Thu, 29 Sep 2022 07:23:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D83476238C; Thu, 29 Sep 2022 09:23:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664436227; bh=kU9wz2MQ4WGRhLr0lOWv5a/QXb2aqxiDnVXEonkk9NQ=; 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=pIupJ0/HeRsnYTnStWkvGl4cw9bEnBV5WsnuK1BArZ84CMJ6/VRAXlFuZHv/vUlbN hUGRc81eZTPVOe/EzODe6LZJMIesvHvSxcPUb+Tag6iqa6WCgBAzy9mmZH8g/TougO lJ/f6uV9YmYaQ8y6suStVmeM2CQYL1OXBlj3mmJLVG3od7IrneOiYAgeQGCuAyPPTe OkcWPmb/mAA6TEDWYAmilviYtcAFDr9WzesBdhI4YXhXRPZqC+1cbUcUW7GjJUJgnI Lolho+bT6Iz065967FrtD2Nb781iIACgkfNZnvlQLIqPwtAtLl+aC2n7GcXH6FE/CX oyoTy9f8CAu7w== Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 34B6562382 for ; Thu, 29 Sep 2022 09:23:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="bwyGdUTV"; dkim-atps=neutral Received: by mail-wr1-x42b.google.com with SMTP id l18so715209wrw.9 for ; Thu, 29 Sep 2022 00:23:44 -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=kUDItE9+1JuV24FNoBhZOcSOH20Ov/sgW1kXAAJzY2k=; b=bwyGdUTVgyPAIKs4PBQzxhquMSON/aZYsjg1xQG3OjeBhwRawuTsApFySSQla5tf9P E/J+8DyNBjEx0qgNH1Vg7cnKRXiZ6YzCTvyorL+HBPUz4sx+AJhFHkkOE+HfhVmTfYx9 qfMgwjJpTwKpum3YbK4vW1bVaAzj8D2BV1Dujd2xKeG2G9qLVmjpvxBT9EU5W5nL3Qxq zOQqo6x+sRTGuGV6B5xjgJ0V/nWiVFOf6in5CcvFoY1ARuNw1pSNgkT5Y7xGx2+UaVvF mdT4SdBip+N/iVX28Q50jKqDJnL9w/jDzTvr7KTOroj0r2SBLIzWDnWq3wzYNZkEUXRp NFgw== 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=kUDItE9+1JuV24FNoBhZOcSOH20Ov/sgW1kXAAJzY2k=; b=hZpcdoFjapYXfpDBXN0KRYxj8JNfAVFNhw/FXrthQlG6bxp+VyXykm00q9+0IN3wbk HOgkm5A38I68CFQry+0tsa88qPLAjOb+jLgfUqX1cLXgZ+8nN+vda9fKTiHVS2gQQPbk KVq5r5uc/gq8Dhmk2EqCIGf4f7CMfTnfVVtuWKfe/9W9d0HIgOjE8G7TJkY8EZ44QOf2 a88Z5Rg+lXmYMroA0KlWHJJ1OznKIVPkqrL6S8WbgrVvi/Y2VdHzX2vbLbHBGP57ly9+ M5itHtlSAtQ1oNxQSHvthRCMeG4SVWadjQ0/so7MmVRtOjEaLIdUdAV9gBC/3+TqmUUz N8Vg== X-Gm-Message-State: ACrzQf1yh4n8LRHTZR577QTaa16u78Of2YS8Ddv4XxCw8Xbxy1Y4EuKW NiTOJg3iDyowCS5p5x5NoczzUrRMzP3NOw== X-Google-Smtp-Source: AMsMyM5NvljjxQV3znqTfkg7IxOJwk0rhBRFLoklkshFU3IWMO9cd9tYropKgAIJkqV3CEM4lOVKzQ== X-Received: by 2002:a05:6000:887:b0:21e:24a0:f302 with SMTP id ca7-20020a056000088700b0021e24a0f302mr1044314wrb.466.1664436223630; Thu, 29 Sep 2022 00:23:43 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c1c0600b003b483000583sm3929805wms.48.2022.09.29.00.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 00:23:43 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 29 Sep 2022 08:23:21 +0100 Message-Id: <20220929072323.7400-3-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220929072323.7400-1-naush@raspberrypi.com> References: <20220929072323.7400-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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: Jacopo Mondi --- .../data/{imx296.json => imx296_mono.json} | 0 src/ipa/raspberrypi/data/meson.build | 2 +- .../pipeline/raspberrypi/raspberrypi.cpp | 22 ++++++++++++++----- 3 files changed, 18 insertions(+), 6 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..dab17c34d370 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 - configurationFile = std::string(configFromEnv); + std::string model = sensor_->model(); + if (!configFromEnv || *configFromEnv == '\0') { + if (isMonoSensor(sensor_)) + model += "_mono"; + configurationFile = ipa_->configurationFile(model + ".json"); + } else { + configurationFile = model; + } - IPASettings settings(configurationFile, sensor_->model()); + IPASettings settings(configurationFile, model); return ipa_->init(settings, result); } From patchwork Thu Sep 29 07:23:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17458 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 8ED4ABD16B for ; Thu, 29 Sep 2022 07:23:48 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4961F6238B; Thu, 29 Sep 2022 09:23:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664436228; bh=kgf2hHImpHZuVcgj/8N2AXPLGHxE/frTXEzhV6Qd50I=; 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=icjzVqVy0sZBUcjL8xTRb8ZVGqv3dI7qRSvKFq1Pm2In2l6bnsJN6PaS9SnxS12/6 KnF9J6zmb2LtOb/UwiisSG2ua5AAZ1yPojtPL4gduhvpswb+V3JxHae4Ouhkeerigs ZgMbvekB7m7bwifnRKI+tHeibMHdYcnZDxw5qvFmmGqsWZsdWsD5QlsM7uq+hlXgUr TWWxQ/1NBShF0Ol6sDFTuV8aJz7tZflc8JKHJPh7nHLNEOk60JeNkboiqDO60KclyT rcamdEkSEQ1KSRP/1OjuX9SF1JJEITAGwMAMSN1TH4yrtqf8ReLAS1TIae3RyyG2PT y5bl9TNPLhvHg== Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E451662387 for ; Thu, 29 Sep 2022 09:23:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="MSxzFJsO"; dkim-atps=neutral Received: by mail-wr1-x42b.google.com with SMTP id l18so715267wrw.9 for ; Thu, 29 Sep 2022 00:23:44 -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=NU4MIPampEfmG2fhOxr1NX29rg+UggE4ukhHx/79t74=; b=MSxzFJsOW7AMyGWxJDI95hKt0GcJ7WsMhh34jxTKkqQVUmXSYx8ECMy6g0vTgP5gjS EVoArPpqklEMpml7Zkn52mJXMXQ4EhB9Qiq4+ZjvXuMKhwuG+qoTlY+B9/7/cwz5UV9U xVKnUiPRqWkZ+L4Lqx5Q7vF+VU+NPJ/D6Xq0Q20OXsKnCxymx6e8WR8fx3vgnikAPxfa 0GDy/rmPk/RgJBZKyMpxguBlMpqaDgm11Wb3Np+6fZScwH4K4WpDuuPsqX4Yg0VvV7T7 ZHmJvBMxZiRa4U6pjpHhGwiwEkW6sD8m0sJOwOAlH91kGrlYx1dKagsqBQq66HQzvi4R DLHg== 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=NU4MIPampEfmG2fhOxr1NX29rg+UggE4ukhHx/79t74=; b=DOCoV/1rM04VC72o+K03ydl76xxn/4udKSjDuVMud/EXblKygBNO2R0ASqLR1irjae jTC9AqXgdVF25yot6F1UVNLDXU5VXAnyzVNOJH0VTr+ckgLTluzqq00etegCS64R/B8c kTKrq7aWPSYDAMhKmx1Y9CuX/uf54b7299+yFqCqGe5qErMvXUtUXNoPdBS1mnOC8a3L j/mLvM+d44SbW9IW0QsaQtTmexHRxlnrNJ62M95Ki4cLxlkpkJc1ntq0gI/cbiGkq8DK cTdOt2+Xu1Gap5tjNXWh4g8Fm0kdCF9WuxRtyWYc6j57gxsRVIx74XHJ/MgK7COm375R xOOQ== X-Gm-Message-State: ACrzQf0Il7w20YWA+UX3yqgjXAOJDucOmHTLmqRhsB6eEFT6n++qKo/h hXdsICa+U6J+WdLXumWZqZg2f582OOeEKA== X-Google-Smtp-Source: AMsMyM4H5coNxGe6ihZSYoX1k57v7HJ2MDRKQ4+exGvFTs/MNRxovc2yOVX/utesez52yQzm+0xM5A== X-Received: by 2002:a5d:5504:0:b0:228:b90c:e5e0 with SMTP id b4-20020a5d5504000000b00228b90ce5e0mr1091278wrv.624.1664436224299; Thu, 29 Sep 2022 00:23:44 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c1c0600b003b483000583sm3929805wms.48.2022.09.29.00.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 00:23:43 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 29 Sep 2022 08:23:22 +0100 Message-Id: <20220929072323.7400-4-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220929072323.7400-1-naush@raspberrypi.com> References: <20220929072323.7400-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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 --- 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 Thu Sep 29 07:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 17459 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 2D76EC327F for ; Thu, 29 Sep 2022 07:23:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A2E8A62390; Thu, 29 Sep 2022 09:23:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664436228; 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=LUdWCHmDVFEYNBNya1MSsAVhPN8ZSX8EJ2LnP9Lk6sVtXBd6cQuvNJNsW6T8B87LZ Tx4YQ5r0uvfY27gjod8m7I2WeBq6oi2mah+QraXRiNPVw4Namw8wTMxSzcNJsomGH7 n6DEd3NtTBhaPLPmsrhwg0dtBGTZA1BIaOZvO+pKjaj5/kRWj2Ma8J782g/mFDiFaM SbOCZDEu+iyn6rLBlOMkv0xLtuWMCZRr+akm5/b2o77NIAOQoYDWRQxIGWMGEYizD4 cSE7PsbcrsTngcj9Xo+NJ9ZL1v04dg1JPiecnaUW7wsalEEnfXo62pMwsH4FMtJKLl 3t6vLtRD4n9RQ== Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 430FD6237D for ; Thu, 29 Sep 2022 09:23:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="a0Ftgqks"; dkim-atps=neutral Received: by mail-wm1-x329.google.com with SMTP id ay36so348878wmb.0 for ; Thu, 29 Sep 2022 00:23:45 -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=a0FtgqksTOJUnxVBRxXYVV9EwdYcftr/K4AhzOG5+EO3L3Xdl5UbVAv6fUYAp+Mbtl 2jQ/aPxlIUI6EmKmuWSVA5h0qTIBLNkTvmce0dUOneH9Wa0Tss5j9KDCUz8zEPKauAft eQzTMpAdTPQwdmYMvjUKSDaSaJM7Bd3ZptVXTG/lDaemitZu1M6e0dAgGOtiIyW7CUb8 oydDn/x+Er4WMlPnI3IJc3q/UTBfziN5EyjtUY2Osux4iJYiE8tvBbmwEtDpw3375xPQ OjHUp4f5340lhQjj0i/DawqZCdJGo4Z5Dq2hQAy0UkNMLPd4IZxV06QkcOb6liwUaTJ+ /kqw== 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=wyrbzcbIfQgXC9Jkezz2Tjp9Eazd2Crbk7f/NVxjsMNosuUHnZXfAAGDmPwo/b1xix mho/xbXnhFD68576dvNmZsc7QIZqOIDKP7A8KCON5RUNDPX5mCWgpq/gKN1+c9K4cv6H nu4rmmidF69N3GUpxrbtyaiyFpp8MSnV8FlELc8+A+rRDA2Otgzl7/dKDbX6dKSAFq/k MiGpynC/TrmqF69J5NNXM4OnxLkROvfSPjQJkXawyp5bjbEcesH3yOO+0jEdgdQZJEWc JAWp/97wd/BMAiitfgsPmrozXYzh5WhK26UmHaosCwbYToINPSDxdek/GlW7I15LF5Mv nvkw== X-Gm-Message-State: ACrzQf08M5bmq51vYLAfZv0HNRlY0D8k2aTIXceivS3bsK6XHGzxUco4 VrbsIFiE7uS/g2PUh+q/xG3xNpFPLl9QYQ== X-Google-Smtp-Source: AMsMyM6csvCOoRwCct0oKtGWLoObSWnGT+wrSpTVZRuG5cXWLd9BabGEHlGU1oX7139PmFVQmOGDAA== X-Received: by 2002:a05:600c:594:b0:3b4:7637:9444 with SMTP id o20-20020a05600c059400b003b476379444mr9705034wmd.52.1664436224824; Thu, 29 Sep 2022 00:23:44 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id j6-20020a05600c1c0600b003b483000583sm3929805wms.48.2022.09.29.00.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 00:23:44 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 29 Sep 2022 08:23:23 +0100 Message-Id: <20220929072323.7400-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220929072323.7400-1-naush@raspberrypi.com> References: <20220929072323.7400-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 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: Jacopo Mondi Reviewed-by: David Plowman --- 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 } }, {