Patch Detail
Show a patch.
GET /api/patches/10468/?format=api
{ "id": 10468, "url": "https://patchwork.libcamera.org/api/patches/10468/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10468/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20201123073804.3125-10-david.plowman@raspberrypi.com>", "date": "2020-11-23T07:38:03", "name": "[libcamera-devel,v2,09/10] libcamera: src: ipa: raspberrypi: agc: Improve gain update calculation for partly saturated images", "commit_ref": "7de5506c30b36575de7bbead7fda243ec1019005", "pull_url": null, "state": "accepted", "archived": false, "hash": "c841bda91c7e4fca0c2877cf948a1fadcb5c0499", "submitter": { "id": 42, "url": "https://patchwork.libcamera.org/api/people/42/?format=api", "name": "David Plowman", "email": "david.plowman@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10468/mbox/", "series": [ { "id": 1475, "url": "https://patchwork.libcamera.org/api/series/1475/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1475", "date": "2020-11-23T07:37:54", "name": "Raspberry Pi AGC", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1475/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10468/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10468/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 B3A31BE08A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 23 Nov 2020 07:38:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F84463350;\n\tMon, 23 Nov 2020 08:38:41 +0100 (CET)", "from mail-wm1-x330.google.com (mail-wm1-x330.google.com\n\t[IPv6:2a00:1450:4864:20::330])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E49FA63325\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Nov 2020 08:38:38 +0100 (CET)", "by mail-wm1-x330.google.com with SMTP id 1so16283273wme.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 22 Nov 2020 23:38:38 -0800 (PST)", "from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\th15sm17841822wrw.15.2020.11.22.23.38.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSun, 22 Nov 2020 23:38:37 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"An+uLqiS\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=l1N2pr2q7Z9XN1viacAoQlqJnMssJB536U10h0wxdDc=;\n\tb=An+uLqiSKQdfdI4+8GOqCNCmhOyLbgyEca5cI2bYXtL81O2+t9BROT/sjehgRc/Xs3\n\tdyLwwjq3sMLb2ygxbnZLByIrf1j5DVkcVw1Jcu+4MoF5GYfa1zRtA75EaD59SHz8kioc\n\tcgoyDIrx5WXr8ybaeo+9KGegL3a0tmf0/twiMLvB8bed41ok6319qiR+tvGlgLQiCVbe\n\tA6ZlgRo4S3PucC96Tnoi0pqnxrmktNVpdUwEN8+C9g5xtUgASpbj4MNjQ0aY/7PPBnS2\n\tifuy7h0QPlyr8DkZ6QSz/qiGXekaJvG3wd973+kQdIqZvQXPXf1EMPeFutdam4LHCU0q\n\tPH+g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\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=l1N2pr2q7Z9XN1viacAoQlqJnMssJB536U10h0wxdDc=;\n\tb=YbcrQt1VBvxd18rqFe2BqS8UJyulh4ocpHhiLM1vpniJl9XHyKDoVRSxpse/Ymh18j\n\tGqu4k3yIseL8Sp+pYiFQkBEU1BMNlxgPUKg+VsSedFSK/5tjqgjuyWnUKwAdA6RCSXQ5\n\tfTLzH/d8jVzT1IHWgzJmtK40DePyogGUM8CFkUDmUAxDdKMvWOZ8RoUMoy+QA61HQt/F\n\tGVFESYpcEgCYxD1Mw2BzBeOixYxusbrk3VSIPPOuK3xrbWXJklEt8QvgLFxKPTNIFB6N\n\tcUJBiKcRyDb7sk/ZuRvhPusFgHTf3cQPXWJoj9ViLe/H+qmbKaMViq/etg+3G4IiV8OG\n\tY3vQ==", "X-Gm-Message-State": "AOAM531qKTqRjD8z6n66OYFg4canIhJKCxqd4qz92ms/1jH5rcL7uzaN\n\tAsOCirR+6m4F93C6jswTYYqSffsCEPgN97ZC", "X-Google-Smtp-Source": "ABdhPJx33csanBlg9ffLf0RgrNGI103mdr3LYwjBrjAhocfMD5DMPeiRUz71xxE80lDl57306OiYtQ==", "X-Received": "by 2002:a1c:3c4:: with SMTP id 187mr8148864wmd.143.1606117118355;\n\tSun, 22 Nov 2020 23:38:38 -0800 (PST)", "From": "David Plowman <david.plowman@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 23 Nov 2020 07:38:03 +0000", "Message-Id": "<20201123073804.3125-10-david.plowman@raspberrypi.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20201123073804.3125-1-david.plowman@raspberrypi.com>", "References": "<20201123073804.3125-1-david.plowman@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 09/10] libcamera: src: ipa:\n\traspberrypi: agc: Improve gain update calculation for partly\n\tsaturated images", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "When parts of an image saturate then the image brightness no longer\nincreases linearly with increased exposure/gain. Having calculated a\nlinear gain value it's better then to try it, allowing for saturating\nregions, and if necessary increase the gain some more. We repeat this\nseveral times.\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Naushir Patuck <naush@raspberrypi.com>\n---\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 34 +++++++++++++++-------\n 1 file changed, 24 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp\nindex d7d37055..37806055 100644\n--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp\n@@ -419,17 +419,21 @@ void Agc::fetchAwbStatus(Metadata *image_metadata)\n }\n \n static double compute_initial_Y(bcm2835_isp_stats *stats, AwbStatus const &awb,\n-\t\t\t\tdouble weights[])\n+\t\t\t\tdouble weights[], double gain)\n {\n \tbcm2835_isp_stats_region *regions = stats->agc_stats;\n \t// Note how the calculation below means that equal weights give you\n \t// \"average\" metering (i.e. all pixels equally important).\n \tdouble R_sum = 0, G_sum = 0, B_sum = 0, pixel_sum = 0;\n \tfor (int i = 0; i < AGC_STATS_SIZE; i++) {\n-\t\tR_sum += regions[i].r_sum * weights[i];\n-\t\tG_sum += regions[i].g_sum * weights[i];\n-\t\tB_sum += regions[i].b_sum * weights[i];\n-\t\tpixel_sum += regions[i].counted * weights[i];\n+\t\tdouble counted = regions[i].counted;\n+\t\tdouble r_sum = std::min(regions[i].r_sum * gain, ((1 << PIPELINE_BITS) - 1) * counted);\n+\t\tdouble g_sum = std::min(regions[i].g_sum * gain, ((1 << PIPELINE_BITS) - 1) * counted);\n+\t\tdouble b_sum = std::min(regions[i].b_sum * gain, ((1 << PIPELINE_BITS) - 1) * counted);\n+\t\tR_sum += r_sum * weights[i];\n+\t\tG_sum += g_sum * weights[i];\n+\t\tB_sum += b_sum * weights[i];\n+\t\tpixel_sum += counted * weights[i];\n \t}\n \tif (pixel_sum == 0.0) {\n \t\tLOG(RPiAgc, Warning) << \"compute_initial_Y: pixel_sum is zero\";\n@@ -473,11 +477,21 @@ void Agc::computeGain(bcm2835_isp_stats *statistics, Metadata *image_metadata,\n \ttarget_Y =\n \t\tconfig_.Y_target.Eval(config_.Y_target.Domain().Clip(lux.lux));\n \ttarget_Y = std::min(EV_GAIN_Y_TARGET_LIMIT, target_Y * ev_gain);\n-\tdouble initial_Y = compute_initial_Y(statistics, awb_,\n-\t\t\t\t\t metering_mode_->weights);\n-\tgain = std::min(10.0, target_Y / (initial_Y + .001));\n-\tLOG(RPiAgc, Debug) << \"Initially Y \" << initial_Y << \" target \" << target_Y\n-\t\t\t << \" gives gain \" << gain;\n+\n+\t// Do this calculation a few times as brightness increase can be\n+\t// non-linear when there are saturated regions.\n+\tgain = 1.0;\n+\tfor (int i = 0; i < 8; i++) {\n+\t\tdouble initial_Y = compute_initial_Y(statistics, awb_,\n+\t\t\t\t\t\t metering_mode_->weights, gain);\n+\t\tdouble extra_gain = std::min(10.0, target_Y / (initial_Y + .001));\n+\t\tgain *= extra_gain;\n+\t\tLOG(RPiAgc, Debug) << \"Initial Y \" << initial_Y << \" target \" << target_Y\n+\t\t\t\t << \" gives gain \" << gain;\n+\t\tif (extra_gain < 1.01) // close enough\n+\t\t\tbreak;\n+\t}\n+\n \tfor (auto &c : *constraint_mode_) {\n \t\tdouble new_target_Y;\n \t\tdouble new_gain =\n", "prefixes": [ "libcamera-devel", "v2", "09/10" ] }