{"id":16231,"url":"https://patchwork.libcamera.org/api/1.1/patches/16231/?format=json","web_url":"https://patchwork.libcamera.org/patch/16231/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220616080744.548995-6-fsylvestre@baylibre.com>","date":"2022-06-16T08:07:44","name":"[libcamera-devel,v2,5/5] ipa: rkisp1: add support of Black Level Correction default values","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6e67e6268f4ba3ba6326ce26a2d09c75d8dae959","submitter":{"id":123,"url":"https://patchwork.libcamera.org/api/1.1/people/123/?format=json","name":"Florian Sylvestre","email":"fsylvestre@baylibre.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16231/mbox/","series":[{"id":3177,"url":"https://patchwork.libcamera.org/api/1.1/series/3177/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3177","date":"2022-06-16T08:07:39","name":"Add tuning file support for rkisp1 blc algo","version":2,"mbox":"https://patchwork.libcamera.org/series/3177/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16231/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16231/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id CF960C3277\n\tfor ;\n\tThu, 16 Jun 2022 08:07:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5A83165642;\n\tThu, 16 Jun 2022 10:07:59 +0200 (CEST)","from mail-wm1-x331.google.com (mail-wm1-x331.google.com\n\t[IPv6:2a00:1450:4864:20::331])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A58DD65643\n\tfor ;\n\tThu, 16 Jun 2022 10:07:56 +0200 (CEST)","by mail-wm1-x331.google.com with SMTP id\n\tr123-20020a1c2b81000000b0039c1439c33cso421786wmr.5\n\tfor ;\n\tThu, 16 Jun 2022 01:07:56 -0700 (PDT)","from localhost.localdomain (lfbn-nic-1-76-188.w2-15.abo.wanadoo.fr.\n\t[2.15.166.188]) by smtp.gmail.com with ESMTPSA id\n\tr15-20020adff70f000000b002185d79dc7fsm1098868wrp.75.2022.06.16.01.07.54\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 16 Jun 2022 01:07:55 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1655366879;\n\tbh=29OqngR+0TO3qrFkT47JPsBOnydwJ/KGahKrNy0CWmw=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=cUEubEix50VQPErWsIN4oziDplLDDtbAuooUia9crCWNpZihXGge52/Q7aCVvmOaZ\n\t09+Kd/3UlKL1WhJ0VcIuRmIZrMEnMarX/wfF0bepT7nO/eMj5zk1Q2GJVNoCydYx0O\n\ta53iIRIVicOZ7bivbrt0RiO5jMIta0yeUIaZKd8ZD7/ZxOzQvshjqyNQIrJSHPGCYd\n\twC9LO6m4SZhRUNauavH4nk/1grAYf3uPpnr1z6F9afYDojdt2DdqHu70NljbcjbuLe\n\tkJB1k9uM8sGpE5IrMulzDUoUvFNyi874v+4ViVnZ77EqOmFuu9M0pboX9g6QZltV7i\n\t+Crqj1gYm6PRg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20210112.gappssmtp.com; s=20210112;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=TzkRnFHPJooBIanc97YPUDjaXPXID3iQdPHXvHFZbqg=;\n\tb=mRX5MbLMGB1yMSvCn3HcXVME1fI/gYy0JC63xxG2i4gJC+//nt17VKzhowwfIEoU62\n\tLxk5xYNx2iFrhZVSpyHgzYk4nyEkq4vmj3cO3awsks9yEG8yufCFmJUDV/eof8iN/twk\n\tRbj4nhOSs6DLky2Me2Y6mWtLV6PeNYe5MtqG6oGlS2fTmgobzkwTsyNONKGlWINScxHx\n\tRZ919y+Q1b3GcQO1WVWpIVALRVKFTSb/njE7/vU2LSw09mcTWYRten2Vl3j4f3eCORNL\n\td/1+GOay+Uv1ZdXmEl94W/j5irGS0nja/9/+vgCD2TG2CdDuQh9aUpt03krrm58SEGh5\n\tA7NA=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=baylibre-com.20210112.gappssmtp.com\n\theader.i=@baylibre-com.20210112.gappssmtp.com header.b=\"mRX5MbLM\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=TzkRnFHPJooBIanc97YPUDjaXPXID3iQdPHXvHFZbqg=;\n\tb=PqxTou0hrTUU+sW1wL2EKeaMe8EFPOwUi+lkCzWfdb1onfqfJF/AUK8FKPJALoivMw\n\twlvNvY5Xk9Fe3CaNWtDh/XX9t4czgadvoYyIP0GzbpVETeQ4/WQASlTBOUmsfMKZ1Spg\n\tXQ0UXhwNC6Qcq+u8fy+k49+ob7UOXBysZVIyTzTT+JI33lz7pykEGv92uB3pLTkZh9UY\n\tm/QQoFJeskYl3Dbrg/V5E1zgnNHv1/YGTMpeA6fwLe6v/wT0BVH6BnY7H08ZFrgVYQ6o\n\tq6//KGxrtKt1Ca1bjGbuhtHlZ4xAbJzyShja8XBjf4QqPmrgFQMmEYwUMh8R7lgNYWqX\n\tButg==","X-Gm-Message-State":"AOAM533s6xUxDSu7RbYOPShsEA0jNMdUO3iyojEpfOpqGWN4GCLXqJcG\n\tUbWGWQ5ZyGqOvma+EdLQn4QF2xN9dpM0gQ==","X-Google-Smtp-Source":"ABdhPJzxkHTeTDte46ppRiVrcozP+HelYOv8ONWMZUvyBbeYnvfSgyBpQzgo5RL0nMeTLQeHFijWCg==","X-Received":"by 2002:a05:600c:2847:b0:39c:4f07:e31f with SMTP id\n\tr7-20020a05600c284700b0039c4f07e31fmr14474815wmb.53.1655366875875; \n\tThu, 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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 5/5] ipa: rkisp1: add support of Black\n\tLevel Correction default values","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Florian Sylvestre via libcamera-devel\n\t","Reply-To":"Florian Sylvestre ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Get default values for Black Level Correction algorithm form Yaml\ntuning file.\n\nSigned-off-by: Florian Sylvestre \n---\n src/ipa/rkisp1/algorithms/blc.cpp | 71 +++++++++++++++++++++++++------\n src/ipa/rkisp1/algorithms/blc.h | 8 ++++\n 2 files changed, 66 insertions(+), 13 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/blc.cpp b/src/ipa/rkisp1/algorithms/blc.cpp\nindex 0c5948ff..d11160d3 100644\n--- a/src/ipa/rkisp1/algorithms/blc.cpp\n+++ b/src/ipa/rkisp1/algorithms/blc.cpp\n@@ -7,6 +7,10 @@\n \n #include \"blc.h\"\n \n+#include \n+\n+#include \"libcamera/internal/yaml_parser.h\"\n+\n /**\n * \\file blc.h\n */\n@@ -29,6 +33,45 @@ namespace ipa::rkisp1::algorithms {\n * isn't currently supported.\n */\n \n+LOG_DEFINE_CATEGORY(RkISP1Blc)\n+\n+/**\n+ * \\copydoc libcamera::ipa::Algorithm::init\n+ */\n+int BlackLevelCorrection::init(IPAContext &,\n+\t\t\t const YamlObject *params)\n+{\n+\ttuningParameters_ = false;\n+\n+\t/* Parse property \"BlackLevelCorrection\". */\n+\tif (!params->contains(\"BlackLevelCorrection\")) {\n+\t\tLOG(RkISP1Blc, Debug) << \"No tuning parameters found for BlackLevelCorrection\";\n+\t\treturn 0;\n+\t}\n+\n+\tconst YamlObject &blcObject = (*params)[\"BlackLevelCorrection\"];\n+\n+\tif (!blcObject.isDictionary()) {\n+\t\tLOG(RkISP1Blc, Error) << \"'BlackLevelCorrection' in tuning file is not a dictionnary\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tblackLevelRed_ = blcObject[\"R\"].get(256);\n+\tblackLevelGreenR_ = blcObject[\"Gr\"].get(256);\n+\tblackLevelGreenB_ = blcObject[\"Gb\"].get(256);\n+\tblackLevelBlue_ = blcObject[\"B\"].get(256);\n+\n+\ttuningParameters_ = true;\n+\n+\tLOG(RkISP1Blc, Debug)\n+\t\t<< \" Read black levels red \" << blackLevelRed_\n+\t\t<< \" green (red) \" << blackLevelGreenR_\n+\t\t<< \" green (blue) \" << blackLevelGreenB_\n+\t\t<< \" blue \" << blackLevelBlue_;\n+\n+\treturn 0;\n+}\n+\n /**\n * \\copydoc libcamera::ipa::Algorithm::prepare\n */\n@@ -37,19 +80,21 @@ void BlackLevelCorrection::prepare(IPAContext &context,\n {\n \tif (context.frameContext.frameCount > 0)\n \t\treturn;\n-\t/*\n-\t * Substract fixed values taken from imx219 tuning file.\n-\t * \\todo Use a configuration file for it ?\n-\t */\n-\tparams->others.bls_config.enable_auto = 0;\n-\tparams->others.bls_config.fixed_val.r = 256;\n-\tparams->others.bls_config.fixed_val.gr = 256;\n-\tparams->others.bls_config.fixed_val.gb = 256;\n-\tparams->others.bls_config.fixed_val.b = 256;\n-\n-\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_BLS;\n-\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_BLS;\n-\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_BLS;\n+\n+\tif (tuningParameters_) {\n+\t\t/*\n+\t\t* Substract fixed values taken from imx219 tuning file.\n+\t\t*/\n+\t\tparams->others.bls_config.enable_auto = 0;\n+\t\tparams->others.bls_config.fixed_val.r = blackLevelRed_;\n+\t\tparams->others.bls_config.fixed_val.gr = blackLevelGreenR_;\n+\t\tparams->others.bls_config.fixed_val.gb = blackLevelGreenB_;\n+\t\tparams->others.bls_config.fixed_val.b = blackLevelBlue_;\n+\n+\t\tparams->module_en_update |= RKISP1_CIF_ISP_MODULE_BLS;\n+\t\tparams->module_ens |= RKISP1_CIF_ISP_MODULE_BLS;\n+\t\tparams->module_cfg_update |= RKISP1_CIF_ISP_MODULE_BLS;\n+\t}\n }\n \n } /* namespace ipa::rkisp1::algorithms */\ndiff --git a/src/ipa/rkisp1/algorithms/blc.h b/src/ipa/rkisp1/algorithms/blc.h\nindex 69874d8f..ed2e8ed9 100644\n--- a/src/ipa/rkisp1/algorithms/blc.h\n+++ b/src/ipa/rkisp1/algorithms/blc.h\n@@ -23,7 +23,15 @@ public:\n \tBlackLevelCorrection() = default;\n \t~BlackLevelCorrection() = default;\n \n+\tint init(IPAContext &context, const YamlObject *params) override;\n \tvoid prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n+\n+private:\n+\tbool tuningParameters_;\n+\tint16_t blackLevelRed_;\n+\tint16_t blackLevelGreenR_;\n+\tint16_t blackLevelGreenB_;\n+\tint16_t blackLevelBlue_;\n };\n \n } /* namespace ipa::rkisp1::algorithms */\n","prefixes":["libcamera-devel","v2","5/5"]}