From patchwork Tue Apr 23 10:30:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Milan Zamazal X-Patchwork-Id: 19915 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 0C4DFBE08B for ; Tue, 23 Apr 2024 10:31:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2BDE961B3D; Tue, 23 Apr 2024 12:31:08 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="aem/XlVK"; 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 B9A9F61AC9 for ; Tue, 23 Apr 2024 12:31:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713868265; 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=NMzN6eGr8qwIERZiQOHwWjUGO6K0h5wD9H12xJWsFLs=; b=aem/XlVKbrBeia58TEQ7AChpuTpmrvfU5W0Xpf/1dqDWrR615Kgq4X2Dgem0pw8lq/QBPl LVyhn3SsoL9bhj0AQGu9DZrOiK+Ww8L7Mch64dZrijI44F0U8ROOXMpKgIdD//tE0JZBS3 epysB563WFN00Dx59PKCH5W5k8IzyE4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-OII6mtXHOcaUBiEB49rOjw-1; Tue, 23 Apr 2024 06:31:03 -0400 X-MC-Unique: OII6mtXHOcaUBiEB49rOjw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61F3880253A; Tue, 23 Apr 2024 10:31:03 +0000 (UTC) Received: from nuthatch.redhat.com (unknown [10.45.225.63]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25F831C060D0; Tue, 23 Apr 2024 10:31:01 +0000 (UTC) From: Milan Zamazal To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Naushir Patuck , Kieran Bingham Subject: [PATCH v2 00/13] Add global configuration file Date: Tue, 23 Apr 2024 12:30:15 +0200 Message-ID: <20240423103034.364150-1-mzamazal@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 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" This patch series introduces global configuration file for libcamera, to provide runtime configuration means other than environment variables. Instead of, or in addition to, the growing list of configuration environment variables, the whole configuration can be specified in a single configuration file. This is both simpler and more flexible. This is not a replacement for specific configuration files already present in libcamera. The patches implement what is needed to introduce the configuration file providing configuration options corresponding to the current environment variables. They demonstrate how to deal with the key points that must be considered. See commit messages for more details. The configuration file is a YAML file. It is looked up in user’s home directory or, if not present, in system-wide libcamera directories. Environment variables, if set, still take precedence. This patch series is not exhaustive, there can be future enhancements, most notably configuration file validation to avoid confusions caused by typos etc. The initial RFC didn't get any objections, so posting a regular ready to review patch series now. Changes in v2: - Rebased on master. - Various cleanups, documentation improvements and minor fixes. - Configuration option for LIBCAMERA_RPI_TUNING_FILE added (Naush). - Two more patches for software ISP configuration added. Milan Zamazal (13): config: Introduce global runtime configuration config: Move global configuration to base config: Look up logging levels in the configuration file config: Add configuration retrieval helpers config: Look up log file in configuration file config: Look up log color configuration in configuration file config: Look up rpi paths in configuration file config: Look up IPA configurables in configuration file config: Look up RkISP1 tuning file in configuration file config: Allow enabling software ISP in runtime config: Add global configuration file documentation libcamera: software_isp: Make input buffer copying configurable libcamera: software_isp: Make measurement configurable Documentation/index.rst | 2 +- Documentation/meson.build | 2 +- ...ariables.rst => runtime_configuration.rst} | 104 ++++++++- .../libcamera/internal/global_configuration.h | 64 +++++ include/libcamera/internal/meson.build | 1 + src/libcamera/base/global_configuration.cpp | 219 ++++++++++++++++++ src/libcamera/base/log.cpp | 24 +- src/libcamera/base/meson.build | 15 ++ src/libcamera/{ => base}/yaml_parser.cpp | 0 src/libcamera/camera_manager.cpp | 9 + src/libcamera/ipa_manager.cpp | 23 +- src/libcamera/ipa_proxy.cpp | 8 +- src/libcamera/meson.build | 14 -- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 9 +- .../pipeline/rpi/common/pipeline_base.cpp | 16 +- src/libcamera/pipeline/simple/simple.cpp | 12 + src/libcamera/process.cpp | 11 +- src/libcamera/software_isp/TODO | 36 --- src/libcamera/software_isp/debayer_cpu.cpp | 30 ++- src/libcamera/software_isp/debayer_cpu.h | 7 +- 20 files changed, 508 insertions(+), 98 deletions(-) rename Documentation/{environment_variables.rst => runtime_configuration.rst} (63%) create mode 100644 include/libcamera/internal/global_configuration.h create mode 100644 src/libcamera/base/global_configuration.cpp rename src/libcamera/{ => base}/yaml_parser.cpp (100%)