From patchwork Thu Jun 16 08:07:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Sylvestre X-Patchwork-Id: 16231 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 CF960C3277 for ; Thu, 16 Jun 2022 08:07:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5A83165642; Thu, 16 Jun 2022 10:07:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1655366879; bh=29OqngR+0TO3qrFkT47JPsBOnydwJ/KGahKrNy0CWmw=; 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=cUEubEix50VQPErWsIN4oziDplLDDtbAuooUia9crCWNpZihXGge52/Q7aCVvmOaZ 09+Kd/3UlKL1WhJ0VcIuRmIZrMEnMarX/wfF0bepT7nO/eMj5zk1Q2GJVNoCydYx0O a53iIRIVicOZ7bivbrt0RiO5jMIta0yeUIaZKd8ZD7/ZxOzQvshjqyNQIrJSHPGCYd wC9LO6m4SZhRUNauavH4nk/1grAYf3uPpnr1z6F9afYDojdt2DdqHu70NljbcjbuLe kJB1k9uM8sGpE5IrMulzDUoUvFNyi874v+4ViVnZ77EqOmFuu9M0pboX9g6QZltV7i +Crqj1gYm6PRg== Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id A58DD65643 for ; Thu, 16 Jun 2022 10:07:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="mRX5MbLM"; dkim-atps=neutral Received: by mail-wm1-x331.google.com with SMTP id r123-20020a1c2b81000000b0039c1439c33cso421786wmr.5 for ; Thu, 16 Jun 2022 01:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TzkRnFHPJooBIanc97YPUDjaXPXID3iQdPHXvHFZbqg=; b=mRX5MbLMGB1yMSvCn3HcXVME1fI/gYy0JC63xxG2i4gJC+//nt17VKzhowwfIEoU62 Lxk5xYNx2iFrhZVSpyHgzYk4nyEkq4vmj3cO3awsks9yEG8yufCFmJUDV/eof8iN/twk Rbj4nhOSs6DLky2Me2Y6mWtLV6PeNYe5MtqG6oGlS2fTmgobzkwTsyNONKGlWINScxHx RZ919y+Q1b3GcQO1WVWpIVALRVKFTSb/njE7/vU2LSw09mcTWYRten2Vl3j4f3eCORNL d/1+GOay+Uv1ZdXmEl94W/j5irGS0nja/9/+vgCD2TG2CdDuQh9aUpt03krrm58SEGh5 A7NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TzkRnFHPJooBIanc97YPUDjaXPXID3iQdPHXvHFZbqg=; b=PqxTou0hrTUU+sW1wL2EKeaMe8EFPOwUi+lkCzWfdb1onfqfJF/AUK8FKPJALoivMw wlvNvY5Xk9Fe3CaNWtDh/XX9t4czgadvoYyIP0GzbpVETeQ4/WQASlTBOUmsfMKZ1Spg XQ0UXhwNC6Qcq+u8fy+k49+ob7UOXBysZVIyTzTT+JI33lz7pykEGv92uB3pLTkZh9UY m/QQoFJeskYl3Dbrg/V5E1zgnNHv1/YGTMpeA6fwLe6v/wT0BVH6BnY7H08ZFrgVYQ6o q6//KGxrtKt1Ca1bjGbuhtHlZ4xAbJzyShja8XBjf4QqPmrgFQMmEYwUMh8R7lgNYWqX Butg== X-Gm-Message-State: AOAM533s6xUxDSu7RbYOPShsEA0jNMdUO3iyojEpfOpqGWN4GCLXqJcG UbWGWQ5ZyGqOvma+EdLQn4QF2xN9dpM0gQ== X-Google-Smtp-Source: ABdhPJzxkHTeTDte46ppRiVrcozP+HelYOv8ONWMZUvyBbeYnvfSgyBpQzgo5RL0nMeTLQeHFijWCg== X-Received: by 2002:a05:600c:2847:b0:39c:4f07:e31f with SMTP id r7-20020a05600c284700b0039c4f07e31fmr14474815wmb.53.1655366875875; Thu, 16 Jun 2022 01:07:55 -0700 (PDT) Received: from localhost.localdomain (lfbn-nic-1-76-188.w2-15.abo.wanadoo.fr. [2.15.166.188]) by smtp.gmail.com with ESMTPSA id r15-20020adff70f000000b002185d79dc7fsm1098868wrp.75.2022.06.16.01.07.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jun 2022 01:07:55 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 16 Jun 2022 10:07:44 +0200 Message-Id: <20220616080744.548995-6-fsylvestre@baylibre.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220616080744.548995-1-fsylvestre@baylibre.com> References: <20220616080744.548995-1-fsylvestre@baylibre.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 5/5] ipa: rkisp1: add support of Black Level Correction default values 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: Florian Sylvestre via libcamera-devel From: Florian Sylvestre Reply-To: Florian Sylvestre Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Get default values for Black Level Correction algorithm form Yaml tuning file. Signed-off-by: Florian Sylvestre --- src/ipa/rkisp1/algorithms/blc.cpp | 71 +++++++++++++++++++++++++------ src/ipa/rkisp1/algorithms/blc.h | 8 ++++ 2 files changed, 66 insertions(+), 13 deletions(-) diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp index 0c5948ff..d11160d3 100644 --- a/src/ipa/rkisp1/algorithms/blc.cpp +++ b/src/ipa/rkisp1/algorithms/blc.cpp @@ -7,6 +7,10 @@ #include "blc.h" +#include + +#include "libcamera/internal/yaml_parser.h" + /** * \file blc.h */ @@ -29,6 +33,45 @@ namespace ipa::rkisp1::algorithms { * isn't currently supported. */ +LOG_DEFINE_CATEGORY(RkISP1Blc) + +/** + * \copydoc libcamera::ipa::Algorithm::init + */ +int BlackLevelCorrection::init(IPAContext &, + const YamlObject *params) +{ + tuningParameters_ = false; + + /* Parse property "BlackLevelCorrection". */ + if (!params->contains("BlackLevelCorrection")) { + LOG(RkISP1Blc, Debug) << "No tuning parameters found for BlackLevelCorrection"; + return 0; + } + + const YamlObject &blcObject = (*params)["BlackLevelCorrection"]; + + if (!blcObject.isDictionary()) { + LOG(RkISP1Blc, Error) << "'BlackLevelCorrection' in tuning file is not a dictionnary"; + return -EINVAL; + } + + blackLevelRed_ = blcObject["R"].get(256); + blackLevelGreenR_ = blcObject["Gr"].get(256); + blackLevelGreenB_ = blcObject["Gb"].get(256); + blackLevelBlue_ = blcObject["B"].get(256); + + tuningParameters_ = true; + + LOG(RkISP1Blc, Debug) + << " Read black levels red " << blackLevelRed_ + << " green (red) " << blackLevelGreenR_ + << " green (blue) " << blackLevelGreenB_ + << " blue " << blackLevelBlue_; + + return 0; +} + /** * \copydoc libcamera::ipa::Algorithm::prepare */ @@ -37,19 +80,21 @@ void BlackLevelCorrection::prepare(IPAContext &context, { if (context.frameContext.frameCount > 0) return; - /* - * Substract fixed values taken from imx219 tuning file. - * \todo Use a configuration file for it ? - */ - params->others.bls_config.enable_auto = 0; - params->others.bls_config.fixed_val.r = 256; - params->others.bls_config.fixed_val.gr = 256; - params->others.bls_config.fixed_val.gb = 256; - params->others.bls_config.fixed_val.b = 256; - - params->module_en_update |= RKISP1_CIF_ISP_MODULE_BLS; - params->module_ens |= RKISP1_CIF_ISP_MODULE_BLS; - params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_BLS; + + if (tuningParameters_) { + /* + * Substract fixed values taken from imx219 tuning file. + */ + params->others.bls_config.enable_auto = 0; + params->others.bls_config.fixed_val.r = blackLevelRed_; + params->others.bls_config.fixed_val.gr = blackLevelGreenR_; + params->others.bls_config.fixed_val.gb = blackLevelGreenB_; + params->others.bls_config.fixed_val.b = blackLevelBlue_; + + params->module_en_update |= RKISP1_CIF_ISP_MODULE_BLS; + params->module_ens |= RKISP1_CIF_ISP_MODULE_BLS; + params->module_cfg_update |= RKISP1_CIF_ISP_MODULE_BLS; + } } } /* namespace ipa::rkisp1::algorithms */ diff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h index 69874d8f..ed2e8ed9 100644 --- a/src/ipa/rkisp1/algorithms/blc.h +++ b/src/ipa/rkisp1/algorithms/blc.h @@ -23,7 +23,15 @@ public: BlackLevelCorrection() = default; ~BlackLevelCorrection() = default; + int init(IPAContext &context, const YamlObject *params) override; void prepare(IPAContext &context, rkisp1_params_cfg *params) override; + +private: + bool tuningParameters_; + int16_t blackLevelRed_; + int16_t blackLevelGreenR_; + int16_t blackLevelGreenB_; + int16_t blackLevelBlue_; }; } /* namespace ipa::rkisp1::algorithms */