{"id":21679,"url":"https://patchwork.libcamera.org/api/patches/21679/?format=json","web_url":"https://patchwork.libcamera.org/patch/21679/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20241018141241.948698-3-mzamazal@redhat.com>","date":"2024-10-18T14:12:37","name":"[v6,2/2] libcamera: software_isp: Black level from tuning file","commit_ref":"7cbd05dc01eb031d82e7e2db3008eb0146908abb","pull_url":null,"state":"accepted","archived":false,"hash":"7085dd33f45620d2451edb65b22784ad9c88a95f","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21679/mbox/","series":[{"id":4718,"url":"https://patchwork.libcamera.org/api/series/4718/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4718","date":"2024-10-18T14:12:35","name":"Get black level from the camera helper","version":6,"mbox":"https://patchwork.libcamera.org/series/4718/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21679/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21679/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 7E0BCC32AF\n\tfor ;\n\tFri, 18 Oct 2024 14:13:01 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1F32965392;\n\tFri, 18 Oct 2024 16:13:01 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EE9406538A\n\tfor ;\n\tFri, 18 Oct 2024 16:12:58 +0200 (CEST)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-146-rTSRtwuhNX2zf2WlCv2NQQ-1;\n\tFri, 18 Oct 2024 10:12:54 -0400","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.12])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 924FB1955D42; Fri, 18 Oct 2024 14:12:53 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.61])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 8CCB419560A2; Fri, 18 Oct 2024 14:12:51 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"KCdcbq0A\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1729260778;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=EEZ+B/UVPYXndgHgbDQcXLxw5iqIACdXZ6S+NUjzvkI=;\n\tb=KCdcbq0ATPD0EHtEpIZMVgkZziZzVeQNxP7zPJ10YVffYBSn0wpOvSps8cAFVh3I2TS46F\n\teN8kq1ERDfj4zLLQxIAPDoOJoIz1B0SRTaY7U7kKzuwO8QJUVBTm4CMp9YEf+MbEXIfzhZ\n\tci9cgdwh9V7oKoMAPhMQIHqJOCetSGM=","X-MC-Unique":"rTSRtwuhNX2zf2WlCv2NQQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tDaniel Scally ,\n\tKieran Bingham ,\n\tRobert Mader ","Subject":"[PATCH v6 2/2] libcamera: software_isp: Black level from tuning file","Date":"Fri, 18 Oct 2024 16:12:37 +0200","Message-ID":"<20241018141241.948698-3-mzamazal@redhat.com>","In-Reply-To":"<20241018141241.948698-1-mzamazal@redhat.com>","References":"<20241018141241.948698-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This patch allows obtaining a black level from a tuning file in addition\nto the camera sensor helper. If both of them define a black level, the\none from the tuning file takes precedence.\n\nThe use cases are:\n\n- A user wants to use a different black level, for whatever reason.\n\n- There is a sensor without known gains but with a known black level.\n Because a camera sensor helper cannot be defined without specifying\n gains, the only way to specify the black level is using the tuning\n file. Software ISP uses its fallback gain handling in such a case.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Kieran Bingham \n---\n src/ipa/simple/algorithms/blc.cpp | 13 +++++++++++++\n src/ipa/simple/algorithms/blc.h | 1 +\n src/ipa/simple/soft_simple.cpp | 3 ++-\n 3 files changed, 16 insertions(+), 1 deletion(-)","diff":"diff --git a/src/ipa/simple/algorithms/blc.cpp b/src/ipa/simple/algorithms/blc.cpp\nindex a7af2e12c..b4e32fe1c 100644\n--- a/src/ipa/simple/algorithms/blc.cpp\n+++ b/src/ipa/simple/algorithms/blc.cpp\n@@ -21,6 +21,19 @@ BlackLevel::BlackLevel()\n {\n }\n \n+int BlackLevel::init(IPAContext &context, const YamlObject &tuningData)\n+{\n+\tauto blackLevel = tuningData[\"blackLevel\"].get();\n+\tif (blackLevel.has_value()) {\n+\t\t/*\n+\t\t * Convert 16 bit values from the tuning file to 8 bit black\n+\t\t * level for the SoftISP.\n+\t\t */\n+\t\tcontext.configuration.black.level = blackLevel.value() >> 8;\n+\t}\n+\treturn 0;\n+}\n+\n int BlackLevel::configure(IPAContext &context,\n \t\t\t [[maybe_unused]] const IPAConfigInfo &configInfo)\n {\ndiff --git a/src/ipa/simple/algorithms/blc.h b/src/ipa/simple/algorithms/blc.h\nindex 828ad8b18..2cf2a8774 100644\n--- a/src/ipa/simple/algorithms/blc.h\n+++ b/src/ipa/simple/algorithms/blc.h\n@@ -19,6 +19,7 @@ public:\n \tBlackLevel();\n \t~BlackLevel() = default;\n \n+\tint init(IPAContext &context, const YamlObject &tuningData) override;\n \tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n \tvoid process(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext,\ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex e96e65bd1..03525b2f2 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -201,7 +201,8 @@ int IPASoftSimple::configure(const IPAConfigInfo &configInfo)\n \t\t\t(context_.configuration.agc.againMax -\n \t\t\t context_.configuration.agc.againMin) /\n \t\t\t100.0;\n-\t\tif (camHelper_->blackLevel().has_value()) {\n+\t\tif (!context_.configuration.black.level.has_value() &&\n+\t\t camHelper_->blackLevel().has_value()) {\n \t\t\t/*\n \t\t\t * The black level from camHelper_ is a 16 bit value, software ISP\n \t\t\t * works with 8 bit pixel values, both regardless of the actual\n","prefixes":["v6","2/2"]}