{"id":9451,"url":"https://patchwork.libcamera.org/api/1.1/patches/9451/?format=json","web_url":"https://patchwork.libcamera.org/patch/9451/","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":"<20200902104410.7569-9-david.plowman@raspberrypi.com>","date":"2020-09-02T10:44:10","name":"[libcamera-devel,v6,8/8] libcamera: ipa: raspberrypi: ALSC: Handle user transform","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"925b363fef36d092def50ce22ca02dce4058de08","submitter":{"id":42,"url":"https://patchwork.libcamera.org/api/1.1/people/42/?format=json","name":"David Plowman","email":"david.plowman@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9451/mbox/","series":[{"id":1256,"url":"https://patchwork.libcamera.org/api/1.1/series/1256/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1256","date":"2020-09-02T10:44:02","name":"2D transforms","version":6,"mbox":"https://patchwork.libcamera.org/series/1256/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9451/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9451/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 197C0BF019\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed,  2 Sep 2020 10:44:24 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D656C629D3;\n\tWed,  2 Sep 2020 12:44:23 +0200 (CEST)","from mail-wr1-x444.google.com (mail-wr1-x444.google.com\n\t[IPv6:2a00:1450:4864:20::444])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C5F9B629AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed,  2 Sep 2020 12:44:22 +0200 (CEST)","by mail-wr1-x444.google.com with SMTP id a17so4700181wrn.6\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 02 Sep 2020 03:44:22 -0700 (PDT)","from pi4-davidp.lan (plowpeople3.plus.com. [80.229.223.72])\n\tby smtp.gmail.com with ESMTPSA id\n\tm3sm5583062wmb.26.2020.09.02.03.44.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 02 Sep 2020 03:44:21 -0700 (PDT)"],"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=\"ZwvaOowv\"; 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=yqzzfDnOwH0Awzrjn/UOHYIemK1WmVNHkZJX33QDD+s=;\n\tb=ZwvaOowveWeD+SW6jS8jSoKJMigRiGrFJbRl5+53y8GVEBRjqCwazzM+yGhN+ao9l3\n\tT+PFgOBLl5VpOLCIgd6hZfQApFoWCouqdQIeedP72r/4vwNwZfgMSMvqu3tO/LAHrg11\n\tGLhJxiannlpUaNqgE3msAAUkDT1Kyk8Ncw29E7MJAAseFTzx1DpCqk4c3enDvbrd7LiN\n\tK93xx0HEp2cx9tzoFptnyeIkdoWefd3DwJ/HKaM7RRR0jAYcsEg4i07KSK40a75fAgNC\n\tu3EB4ojezGSO8s2myQM3+U61HCMp+caoSyZlgYm2RNhOISZ8yjfSELrpEpu5limXnfwf\n\tlmQg==","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=yqzzfDnOwH0Awzrjn/UOHYIemK1WmVNHkZJX33QDD+s=;\n\tb=AnYbihtSOaXrE6NEDEgkrkFqO1Xg3+Y8vtdAnkhfwhFmHHwDIRmyX4BQGyVws22WAj\n\tAhcElsInN45RPpOPXvzMtOvbrxdxTgoAf8zTsg3xzf8sBrPt/fDkfNJATzWc1A5bEoKG\n\t6/irsq6reU4KhfZrkbjcZWNHpfWf2Bc4AC1raqtZ9354wcTwWWZeoZKbpkaHoZBFjnTQ\n\tPKDkN76qqmehhStrhF0FtWoi7S583FCG2JHbtAlKzCypvOgCyjnQZNF4XVpa9KpF2nmn\n\tiSuEIsaEZLlh8BZRfWW7/K+yKGRiRm5hX7TIg1v8MMfd1j7SANe/WRRrBON27zHpq6F8\n\t5SbA==","X-Gm-Message-State":"AOAM530IaTkpfjMucfXfE0jknFJottRgZ/3FIMtPSmihwo4GFxDZAODA\n\t0O1HHQScqES/mno7GnQJmR6H8tgmjAfpVg==","X-Google-Smtp-Source":"ABdhPJyS7lxt3LkKx6YKNLxxyydHJAPRPF+BTbO67IL1ApYB+ytEBN304gLik05wTL9oFyt45mMyLA==","X-Received":"by 2002:a5d:5106:: with SMTP id s6mr7036332wrt.166.1599043462076;\n\tWed, 02 Sep 2020 03:44:22 -0700 (PDT)","From":"David Plowman <david.plowman@raspberrypi.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Wed,  2 Sep 2020 11:44:10 +0100","Message-Id":"<20200902104410.7569-9-david.plowman@raspberrypi.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200902104410.7569-1-david.plowman@raspberrypi.com>","References":"<20200902104410.7569-1-david.plowman@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 8/8] libcamera: ipa: raspberrypi: ALSC:\n\tHandle user transform","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":"Update ALSC (Auto Lens Shading Correction) to handle correctly the\nuser transform now passed in the camera mode.\n\nThe user transform is applied directly in the sensor so the image\nstatistics already incorporate it, and the adaptive algorithm is\nentirely agnostic towards it, so all we have to do is flip the\ncalibrated tables to match. (These tables will have been calibrated\nwithout the user transform.)\n\nSigned-off-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 13 ++++++++++++-\n 1 file changed, 12 insertions(+), 1 deletion(-)","diff":"diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\nindex 0d0e0b0..f610de2 100644\n--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp\n@@ -184,7 +184,10 @@ void Alsc::waitForAysncThread()\n \n static bool compare_modes(CameraMode const &cm0, CameraMode const &cm1)\n {\n-\t// Return true if the modes crop from the sensor significantly differently.\n+\t// Return true if the modes crop from the sensor significantly differently,\n+\t// or if the user transform has changed.\n+\tif (cm0.transform != cm1.transform)\n+\t\treturn true;\n \tint left_diff = abs(cm0.crop_x - cm1.crop_x);\n \tint top_diff = abs(cm0.crop_y - cm1.crop_y);\n \tint right_diff = fabs(cm0.crop_x + cm0.scale_x * cm0.width -\n@@ -428,6 +431,10 @@ void resample_cal_table(double const cal_table_in[XY],\n \t\txf[i] = x - x_lo[i];\n \t\tx_hi[i] = std::min(x_lo[i] + 1, X - 1);\n \t\tx_lo[i] = std::max(x_lo[i], 0);\n+\t\tif (!!(camera_mode.transform & libcamera::Transform::HFlip)) {\n+\t\t\tx_lo[i] = X - 1 - x_lo[i];\n+\t\t\tx_hi[i] = X - 1 - x_hi[i];\n+\t\t}\n \t}\n \t// Now march over the output table generating the new values.\n \tdouble scale_y = camera_mode.sensor_height /\n@@ -440,6 +447,10 @@ void resample_cal_table(double const cal_table_in[XY],\n \t\tdouble yf = y - y_lo;\n \t\tint y_hi = std::min(y_lo + 1, Y - 1);\n \t\ty_lo = std::max(y_lo, 0);\n+\t\tif (!!(camera_mode.transform & libcamera::Transform::VFlip)) {\n+\t\t\ty_lo = Y - 1 - y_lo;\n+\t\t\ty_hi = Y - 1 - y_hi;\n+\t\t}\n \t\tdouble const *row_above = cal_table_in + X * y_lo;\n \t\tdouble const *row_below = cal_table_in + X * y_hi;\n \t\tfor (int i = 0; i < X; i++) {\n","prefixes":["libcamera-devel","v6","8/8"]}