{"id":19931,"url":"https://patchwork.libcamera.org/api/1.1/patches/19931/?format=json","web_url":"https://patchwork.libcamera.org/patch/19931/","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":"<20240423182000.1527425-3-mzamazal@redhat.com>","date":"2024-04-23T18:19:57","name":"[2/5] libcamera: software_isp: Honor black level in AWB","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9cdd8083e5778457e40f58b3aa061226102fb516","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19931/mbox/","series":[{"id":4268,"url":"https://patchwork.libcamera.org/api/1.1/series/4268/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4268","date":"2024-04-23T18:19:55","name":"Software ISP levels cleanup","version":1,"mbox":"https://patchwork.libcamera.org/series/4268/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19931/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19931/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 E8441BE08B\n\tfor ;\n\tTue, 23 Apr 2024 18:20:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 87468633F5;\n\tTue, 23 Apr 2024 20:20:24 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6473D61B17\n\tfor ;\n\tTue, 23 Apr 2024 20:20:23 +0200 (CEST)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-531-lKzI_-VkPsaC_UF_pP7ChQ-1; Tue, 23 Apr 2024 14:20:21 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id D87AD1049CA4\n\tfor ;\n\tTue, 23 Apr 2024 18:20:19 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.63])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0CA0449102;\n\tTue, 23 Apr 2024 18:20:18 +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=\"AYMMg8W4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1713896422;\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=v9K/zX61MGjH9nw2VP8CZIwhNLdceCV48IGeJqmdDIk=;\n\tb=AYMMg8W4a+PiLlVVpiH/mn5jm7OZh/rxnhHBZgLAD6g8XG1t07aEVhSvcWMm8NBA6I/SyL\n\tmAQBhmvqf8s+uZQBFM9HSaAdsrnGlhDqyad+EjpDqK/Jhvp+uEKbMzmVtFBKcCHCW1JYjr\n\tgsBIJR+qUu0lj8g5PifIBh2PJf1uK74=","X-MC-Unique":"lKzI_-VkPsaC_UF_pP7ChQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[PATCH 2/5] libcamera: software_isp: Honor black level in AWB","Date":"Tue, 23 Apr 2024 20:19:57 +0200","Message-ID":"<20240423182000.1527425-3-mzamazal@redhat.com>","In-Reply-To":"<20240423182000.1527425-1-mzamazal@redhat.com>","References":"<20240423182000.1527425-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.1","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":"The white balance computation didn't consider black level. This is\nwrong because then the computed ratios are off when they are computed\nfrom the whole brightness range rather than the sensor range.\n\nThis patch adjusts white balance computation for the black level. There\nis no need to change white balance application in debayering as this is\nalready applied after black level correction.\n\nExposure computation already subtracts black level, no changes are\nneeded there.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/simple/soft_simple.cpp | 43 ++++++++++++++++++++++++----------\n 1 file changed, 31 insertions(+), 12 deletions(-)","diff":"diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex b9fb58b5..30956a19 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -5,6 +5,8 @@\n * soft_simple.cpp - Simple Software Image Processing Algorithm module\n */\n \n+#include \n+#include \n #include \n \n #include \n@@ -240,28 +242,45 @@ void IPASoftSimple::stop()\n \n void IPASoftSimple::processStats(const ControlList &sensorControls)\n {\n+\tSwIspStats::Histogram histogram = stats_->yHistogram;\n+\tif (ignoreUpdates_ > 0)\n+\t\tblackLevel_.update(histogram);\n+\tconst uint8_t blackLevel = blackLevel_.get();\n+\tparams_->blackLevel = blackLevel;\n+\n \t/*\n \t * Calculate red and blue gains for AWB.\n \t * Clamp max gain at 4.0, this also avoids 0 division.\n \t */\n-\tif (stats_->sumR_ <= stats_->sumG_ / 4)\n-\t\tparams_->gainR = 1024;\n-\telse\n-\t\tparams_->gainR = 256 * stats_->sumG_ / stats_->sumR_;\n+\t{\n+\t\tconst uint64_t nPixels = std::accumulate(\n+\t\t\thistogram.begin(), histogram.end(), 0);\n+\t\tauto subtractBlackLevel = [blackLevel, nPixels](\n+\t\t\t\t\t\t uint64_t sum, uint64_t div)\n+\t\t\t-> uint64_t {\n+\t\t\tuint64_t reducedSum = sum - blackLevel * nPixels / div;\n+\t\t\tuint64_t spreadSum = reducedSum * 256 / (256 - blackLevel);\n+\t\t\treturn spreadSum;\n+\t\t};\n+\t\tconst uint64_t sumR = subtractBlackLevel(stats_->sumR_, 4);\n+\t\tconst uint64_t sumG = subtractBlackLevel(stats_->sumG_, 2);\n+\t\tconst uint64_t sumB = subtractBlackLevel(stats_->sumB_, 4);\n+\n+\t\tif (sumR <= sumG / 4)\n+\t\t\tparams_->gainR = 1024;\n+\t\telse\n+\t\t\tparams_->gainR = 256 * sumG / sumR;\n \n-\tif (stats_->sumB_ <= stats_->sumG_ / 4)\n-\t\tparams_->gainB = 1024;\n-\telse\n-\t\tparams_->gainB = 256 * stats_->sumG_ / stats_->sumB_;\n+\t\tif (sumB <= sumG / 4)\n+\t\t\tparams_->gainB = 1024;\n+\t\telse\n+\t\t\tparams_->gainB = 256 * sumG / sumB;\n+\t}\n \n \t/* Green gain and gamma values are fixed */\n \tparams_->gainG = 256;\n \tparams_->gamma = 0.5;\n \n-\tif (ignoreUpdates_ > 0)\n-\t\tblackLevel_.update(stats_->yHistogram);\n-\tparams_->blackLevel = blackLevel_.get();\n-\n \tsetIspParams.emit();\n \n \t/* \\todo Switch to the libipa/algorithm.h API someday. */\n","prefixes":["2/5"]}