From patchwork Mon Jul 20 09:59:44 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 27378 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 53644BF415 for ; Mon, 20 Jul 2026 10:00:06 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A736A67E28; Mon, 20 Jul 2026 12:00:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="OrbG7zSi"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D00366612C for ; Mon, 20 Jul 2026 12:00:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784541601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CkZ7o+Xrv/ymaoEdJgBPIsJAYDsObKv+3hWTE5GPwIA=; b=OrbG7zSiN6BldE+gfnzQy3LUItCw+6WHuHIMMtQKi2IU4UxF+UbhKuFUGcgwPRAKXflG9u jOhHlhwLVVoBLZ8kwrsHAWsz7y9yksxZ8VD309ot/k2NQL/PLC51OhPl7zDpowW2Le881K cmUBnL4I1ifWCUtxTyVhXeNKoA+2/yo= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-133-t42BDrZuMOaVYZyJSXKmAw-1; Mon, 20 Jul 2026 05:59:58 -0400 X-MC-Unique: t42BDrZuMOaVYZyJSXKmAw-1 X-Mimecast-MFC-AGG-ID: t42BDrZuMOaVYZyJSXKmAw_1784541597 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 54CAA195604C; Mon, 20 Jul 2026 09:59:57 +0000 (UTC) Received: from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.33.73]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E98F430002D6; Mon, 20 Jul 2026 09:59:54 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Bryan O'Donoghue , Hans de Goede , Laurent Pinchart Subject: [RFC PATCH v9 0/6] LSC for SoftISP simple pipeline Date: Mon, 20 Jul 2026 11:59:44 +0200 Message-ID: <20260720095951.49979-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6DIiD_ELGkrJJo-8l72NzbxiJCwUx40kJBd3dcW_lLg_1784541597 X-Mimecast-Originator: redhat.com X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Lens shading correction for software GPU ISP. Based on the initial work by Hans’s students, taken over and significantly modified and eventually reworked to use LSC from libipa (the ongoing work by Jacopo and others). The LSC is not implemented for CPU ISP within this series; it may be added later if needed. It’s RFC because: - It’s not yet completely tested although it seems to be working in my environment. - It’s based on the libipa patches not yet merged. - Further changes will be needed once GPU ISP multipass is merged. Example YAML for grid based LSC, no-op values, place it after Awb: - Lsc: sets: - ct: 6500 r: [ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 ] g: [ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 ] b: [ 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64 ] Example YAML for polynomial based LSC, no-op values, place it after Awb: - Lsc: type: "polynomial" sets: - ct: 6500 r: cx: 0.0 cy: 0.0 k0: 0.0 k1: 0.0 k2: 0.0 k3: 0.0 k4: 0.0 g: cx: 0.0 cy: 0.0 k0: 0.0 k1: 0.0 k2: 0.0 k3: 0.0 k4: 0.0 b: cx: 0.0 cy: 0.0 k0: 0.0 k1: 0.0 k2: 0.0 k3: 0.0 k4: 0.0 Changes in v9: - Rebased on the latest master. Changes in v8: - LscValueType removed. - A named constant introduced for minimum temperature change. - A clarification comment added to the LUT value computation. - lsc-enabled shader flag and the related variables removed. - Wording corrections suggested by Bryan. Changes in v7: - Updated for libipa patches v5 (temperature access). Changes in v6: - Rebased on Jacopo’s libipa patches (v3). - Not updating LSC tables on small or no temperature changes. - Using libipa LSC algorithms; the implementation in ‘simple’ IPA algorithm reduced to the minimum needed. - Grid tables are defined using integers rather than floats, because libipa LSC supports only quantised values and not floats. - New boolean uniform to enable or disable LSC dynamically, rather than only in shaders compile time; to be able to honour the LSC control. - Specific handling of polynomial LSC removed. Polynomial LSC is already handled by libipa, by making a grid-based LSC from it. While a direct polynomial computation may be a bit faster with a minimum number of the polynomial coefficients, the simplicity wins. If we liked to have direct polynomial LSC computation, it should be implemented with help of libipa. Changes in v5: - ‘grids’ tuning file item renamed to ‘sets’ for consistency with rkisp1. - Underscores appended to Lsc::lsc* names. - Other minor stylistic changes. - Proof-of-concept polynomial LSC implemented. Changes in v4: - glFilterParam -> param - Indentation changes in the shaders. - A commit message part about temperature reworded. - Updated for YamlObject -> ValueNode. - New constant kLscValuesPerCell to distinguish between the constants for the params array size (values) and for the stride (bytes). - The lookup array switched to floats and the texture to half-floats. Changes in v3: - LSC scripts patch dropped due to missing licences. - DO_LSC -> APPLY_LSC - textureUniformLsc_ is assigned unconditionally now. - New constant DebayerParams::kLscBytesPerCell. - LSC values in the tuning file are floats now and converted to bytes internally. - Source code comments added to clarify the usage of the byte LUTs. Changes in v2: - Remaining issues from the reviews (hopefully) addressed. - Especially there is only a single texture now and LSC is fully conditional. - Major cleanup, hacks removed or replaced, typo fixes, cosmetic changes, making linters happy, etc. - See https://lists.libcamera.org/pipermail/libcamera-devel/2026-January/056883.html for an example how to add the grid data. Milan Zamazal (1): libcamera: software_isp: Pass LSC availability to debayering Xander Pronk (5): libcamera: software_isp: egl: Add filter parameter to createTexture2D() libcamera: software_isp: Add LSC data to DebayerParams ipa: simple: Add LSC algorithm libcamera: shaders: Add LSC support libcamera: software_isp: debayer_egl: Add LSC support include/libcamera/internal/egl.h | 6 +- .../internal/software_isp/debayer_params.h | 9 ++ .../internal/software_isp/software_isp.h | 1 + include/libcamera/ipa/soft.mojom | 4 +- src/ipa/simple/algorithms/lsc.cpp | 100 ++++++++++++++++++ src/ipa/simple/algorithms/lsc.h | 50 +++++++++ src/ipa/simple/algorithms/meson.build | 1 + src/ipa/simple/ipa_context.h | 6 ++ src/ipa/simple/soft_simple.cpp | 7 +- src/libcamera/egl.cpp | 19 ++-- src/libcamera/shaders/bayer_1x_packed.frag | 8 ++ src/libcamera/shaders/bayer_unpacked.frag | 8 ++ src/libcamera/software_isp/debayer.cpp | 29 +++++ src/libcamera/software_isp/debayer.h | 3 +- src/libcamera/software_isp/debayer_cpu.cpp | 3 +- src/libcamera/software_isp/debayer_cpu.h | 3 +- src/libcamera/software_isp/debayer_egl.cpp | 37 ++++++- src/libcamera/software_isp/debayer_egl.h | 10 +- src/libcamera/software_isp/software_isp.cpp | 5 +- 19 files changed, 290 insertions(+), 19 deletions(-) create mode 100644 src/ipa/simple/algorithms/lsc.cpp create mode 100644 src/ipa/simple/algorithms/lsc.h