Patch Detail
Show a patch.
GET /api/1.1/patches/20171/?format=api
{ "id": 20171, "url": "https://patchwork.libcamera.org/api/1.1/patches/20171/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20171/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240531123840.713364-3-mzamazal@redhat.com>", "date": "2024-05-31T12:38:37", "name": "[v6,2/5] libcamera: software_isp: Honor black level in AWB", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "9d9d14be5ca5a77447bdf9a23039985dd427d0d4", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20171/mbox/", "series": [ { "id": 4347, "url": "https://patchwork.libcamera.org/api/1.1/series/4347/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4347", "date": "2024-05-31T12:38:35", "name": "Software ISP levels cleanup", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4347/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20171/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20171/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 8C8C9BDE6B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 31 May 2024 12:39:04 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 34DBC634BC;\n\tFri, 31 May 2024 14:39:04 +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 B4A59634AF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 31 May 2024 14:39:01 +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-206-URmQWt2HPBeAVp_lux9RWA-1; Fri, 31 May 2024 08:38:59 -0400", "from smtp.corp.redhat.com\n\t(int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8])\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 E970C185A780;\n\tFri, 31 May 2024 12:38:58 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.166])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8F5BAC15BB1;\n\tFri, 31 May 2024 12:38:57 +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=\"bQcxwxWO\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1717159140;\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=tmp8x2JElBY+1aZMMPEis5CdFwhlbaspITWXBXWrkXk=;\n\tb=bQcxwxWOpibSk9ho2xvyAniPhRXMcV6XottGva6D+ms4FYfAKHipPLcndd4lN19O+h7wKb\n\tP/Gqo43UepeMrdn9CrLsgoRvBDmBhqMH8ctSZaxqt6IDRFnPplmNu02famDeIen4xCq24u\n\tj7YgEifk6fEZyQ47qH9GaUpnnlCCC/Q=", "X-MC-Unique": "URmQWt2HPBeAVp_lux9RWA-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tAndrei Konovalov <andrey.konovalov.ynk@gmail.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v6 2/5] libcamera: software_isp: Honor black level in AWB", "Date": "Fri, 31 May 2024 14:38:37 +0200", "Message-ID": "<20240531123840.713364-3-mzamazal@redhat.com>", "In-Reply-To": "<20240531123840.713364-1-mzamazal@redhat.com>", "References": "<20240531123840.713364-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.8", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <mzamazal@redhat.com>\nReviewed-by: Andrei Konovalov <andrey.konovalov.ynk@gmail.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/simple/soft_simple.cpp | 35 +++++++++++++++++++++-------------\n 1 file changed, 22 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex a5bb2bbf..f383f994 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -5,6 +5,8 @@\n * Simple Software Image Processing Algorithm module\n */\n \n+#include <numeric>\n+#include <stdint.h>\n #include <sys/mman.h>\n \n #include <linux/v4l2-controls.h>\n@@ -240,28 +242,35 @@ 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 * Black level must be subtracted to get the correct AWB ratios,\n+\t * they would be off if they were computed from the whole brightness\n+\t * range rather than from the sensor range.\n+\t */\n+\tconst uint64_t nPixels = std::accumulate(\n+\t\thistogram.begin(), histogram.end(), 0);\n+\tconst uint64_t offset = blackLevel * nPixels;\n+\tconst uint64_t sumR = stats_->sumR_ - offset / 4;\n+\tconst uint64_t sumG = stats_->sumG_ - offset / 2;\n+\tconst uint64_t sumB = stats_->sumB_ - offset / 4;\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-\n-\tif (stats_->sumB_ <= stats_->sumG_ / 4)\n-\t\tparams_->gainB = 1024;\n-\telse\n-\t\tparams_->gainB = 256 * stats_->sumG_ / stats_->sumB_;\n+\tparams_->gainR = sumR <= sumG / 4 ? 1024 : 256 * sumG / sumR;\n+\tparams_->gainB = sumB <= sumG / 4 ? 1024 : 256 * sumG / sumB;\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": [ "v6", "2/5" ] }