From patchwork Thu Aug 15 08:16:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 20913 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 19E56C323E for ; Thu, 15 Aug 2024 08:16:49 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2425C633BD; Thu, 15 Aug 2024 10:16:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="bSkn/ViU"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C743463393 for ; Thu, 15 Aug 2024 10:16:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723709805; 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=kYJCAoR6xul2n0bOv25KpHOyyVt5Fc5n9lCoVP1Qruc=; b=bSkn/ViUum02b5Z8rNV1h5ZB78xGNuMJ+TRuuWqET8LBl+Tfmm1MBSQxiso3HU5wCi33Dw De691WvpUkLUlGNwqbsM67toRAbuNtJNsA/N6HftLGP9ev6LoOViYlNS4ozI90cxzMJ6qd RkQyThLCrBiOgv242Bmx+mao06S2s5M= Received: from mx-prod-mc-04.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-548-No7XGHetNruJzfQAa_L4wA-1; Thu, 15 Aug 2024 04:16:41 -0400 X-MC-Unique: No7XGHetNruJzfQAa_L4wA-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F3131955BF2; Thu, 15 Aug 2024 08:16:40 +0000 (UTC) Received: from nuthatch.redhat.com (unknown [10.45.225.128]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2C3DB19560A3; Thu, 15 Aug 2024 08:16:37 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Umang Jain , Laurent Pinchart , Daniel Scally Subject: [PATCH v4 00/18] Software ISP refactoring Date: Thu, 15 Aug 2024 10:16:04 +0200 Message-ID: <20240815081622.174210-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 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" The purpose of this patch series is to bring software ISP code structuring closer to the hardware pipelines. Most notably, the API around algorithm.h is used now. This should make software ISP easier to understand, extend, maintain, and code-share with the other pipelines. What is omitted in the patch series: - Any bigger or unrelated functional changes. The purpose of this series is code restructuring, which is enough already. - Stats and params buffers are still used in the original way. Making their handling closer to the hardware pipelines will be a subject of followup patches. This series is a preparation step for that. - Any IPA code sharing with hardware pipelines. If there is an opportunity for this, it can be addressed in followup patches. Available in git at https://gitlab.freedesktop.org/camera/libcamera-softisp/-/commits/pdm-algorithm Pending (see v3 review discussions): - Should `frame' argument name be kept for consistency with other pipelines for now or already renamed to something like `sequenceNumber'? - Should black level be stored as a 0..1 number or a pixel value number? Changes in v4: - Removed the mistakenly included patches by Umang. - IPASoftInterface::prepare() is async now. - IPAConfigInfo definition moved to an earlier patch to avoid unnecessary confusion. - colors.cpp/h split to gamma and awb. - Using the right black level variable in Agc::process. - Documentation of the newly introduced SwStatsCpu::finishFrame arguments added. - Formatting changes as requested. - A forgotten obsolete source code comment removed. - Improvements to some commit messages. Changes in v3: - SoftwareIsp::queueRequest changed to async. - IPAActiveState docstring reworded. - Minor formatting fixes. Changes in v2: - Several cosmetic changes and patch arrangement problems pointed out by Umang applied. - Added ipa_context.cpp, as a documentation file for ipa_context.h. - Added a clarification source comment why SoftwareIsp::queueBuffers needs to get the frame number as a separate argument. - core_ipa_interface.h no longer included in module.h. - The context used by "14/19 Move black level to an algorithm module" was changed and the black level changes tracking was put closer to the pre-refactoring version, which makes more sense. Milan Zamazal (18): libcamera: software_isp: Remove superfluous includes libcamera: software_isp: Move BlackLevel to libcamera::ipa::soft libcamera: software_isp: Define skeletons for IPA refactoring libcamera: software_isp: Let IPASoftSimple inherit Module libcamera: software_isp: Make stats frame and buffer aware libcamera: software_isp: Remove final dots in debayer.cpp docstrings libcamera: software_isp: Track and pass frame ids libcamera: software_isp: Create algorithms libcamera: software_isp: Call Algorithm::configure libcamera: software_isp: Call Algorithm::queueRequest libcamera: software_isp: Call Algorithm::prepare libcamera: software_isp: Call Algorithm::process libcamera: software_isp: Move black level to an algorithm module libcamera: software_isp: Move color handling to an algorithm module libcamera: software_isp: Use floating point for color parameters libcamera: software_isp: Use DelayedControls libcamera: software_isp: Move exposure+gain to an algorithm module libcamera: software_isp: Update black level only on exposure changes .../internal/software_isp/software_isp.h | 15 +- include/libcamera/ipa/soft.mojom | 12 +- src/ipa/simple/algorithms/agc.cpp | 139 +++++++++ src/ipa/simple/algorithms/agc.h | 36 +++ src/ipa/simple/algorithms/algorithm.h | 22 ++ src/ipa/simple/algorithms/awb.cpp | 96 ++++++ src/ipa/simple/algorithms/awb.h | 43 +++ src/ipa/simple/algorithms/blc.cpp | 78 +++++ src/ipa/simple/algorithms/blc.h | 41 +++ src/ipa/simple/algorithms/gamma.cpp | 64 ++++ src/ipa/simple/algorithms/gamma.h | 42 +++ src/ipa/simple/algorithms/meson.build | 8 + src/ipa/simple/black_level.cpp | 88 ------ src/ipa/simple/black_level.h | 29 -- src/ipa/simple/data/uncalibrated.yaml | 5 + src/ipa/simple/ipa_context.cpp | 102 +++++++ src/ipa/simple/ipa_context.h | 66 ++++ src/ipa/simple/meson.build | 9 +- src/ipa/simple/module.h | 31 ++ src/ipa/simple/soft_simple.cpp | 283 ++++++------------ src/libcamera/pipeline/simple/simple.cpp | 45 ++- src/libcamera/software_isp/TODO | 39 --- src/libcamera/software_isp/debayer.cpp | 51 ++-- src/libcamera/software_isp/debayer.h | 2 +- src/libcamera/software_isp/debayer_cpu.cpp | 9 +- src/libcamera/software_isp/debayer_cpu.h | 2 +- src/libcamera/software_isp/software_isp.cpp | 43 ++- src/libcamera/software_isp/swstats_cpu.cpp | 6 +- src/libcamera/software_isp/swstats_cpu.h | 4 +- 29 files changed, 987 insertions(+), 423 deletions(-) create mode 100644 src/ipa/simple/algorithms/agc.cpp create mode 100644 src/ipa/simple/algorithms/agc.h create mode 100644 src/ipa/simple/algorithms/algorithm.h create mode 100644 src/ipa/simple/algorithms/awb.cpp create mode 100644 src/ipa/simple/algorithms/awb.h create mode 100644 src/ipa/simple/algorithms/blc.cpp create mode 100644 src/ipa/simple/algorithms/blc.h create mode 100644 src/ipa/simple/algorithms/gamma.cpp create mode 100644 src/ipa/simple/algorithms/gamma.h create mode 100644 src/ipa/simple/algorithms/meson.build delete mode 100644 src/ipa/simple/black_level.cpp delete mode 100644 src/ipa/simple/black_level.h create mode 100644 src/ipa/simple/ipa_context.cpp create mode 100644 src/ipa/simple/ipa_context.h create mode 100644 src/ipa/simple/module.h