From patchwork Thu Aug 4 13:21:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 16964 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 B03CFC3272 for ; Thu, 4 Aug 2022 13:21:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F3B6E63329; Thu, 4 Aug 2022 15:21:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1659619282; bh=SGLuiIw8x20d4RHM6imwIDB+QmNobmPAA4D5Jr1upOA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=HFDRzppIiePrwYSVW0W8n7AgyoJTO12kd8aHTY8V3xl+pzz9DJkpZBJRSNBPQryny rZpfXz7SeFJaycPXtjgazQTE6H1E29lGw6o0XeihwfEOzD97gGn9FgVBLN0jPkJ2b8 sf+qUvRvbxNYxLgROrPkzuApu7k7plRYRog6+N4xls7QBqsaG/PlxkrRRIPjggvANB aH3/+lln+Wq15daHyKjW7UnFavEm1ewvwzXK3AWnv9U/a4gdbs9Oq7eKUoNjtSaKp5 samKTWZlwj3106Z3/I+OWE23YXpra/P5aPb/XYmV3J/m67v0UmnaGa753ywtz39+O8 Me7IJ0DjOtNDQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0E7746330D for ; Thu, 4 Aug 2022 15:21:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rAYyLm8g"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6DB1C481; Thu, 4 Aug 2022 15:21:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1659619279; bh=SGLuiIw8x20d4RHM6imwIDB+QmNobmPAA4D5Jr1upOA=; h=From:To:Cc:Subject:Date:From; b=rAYyLm8gYA7UcTqms69QLOLaAApx8qQekCaVF0FMg2/MusfgX7ET04ZLg07lYoi3t 4KexqTCSOy1xrJM/UIyfZeuAwu070vK9Dls1NkBd/C9eac2AeRfKKXOsBpXT62DUui MtHCwBlwc15sR6CV97gtY1dNMFYudJmxsR4rqveQ= To: libcamera-devel@lists.libcamera.org Date: Thu, 4 Aug 2022 16:21:10 +0300 Message-Id: <20220804132112.17604-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 0/2] Use YAML 1.1 for the time being 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: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Hello, This small patch series switches all the YAML files in libcamera to use YAML 1.1, in order to support the libyaml version shipped in the latest Debian stable. YAML 1.2 support was added to libyaml on v0.2.3, and Debian stable currently ships v0.2.2 (Debian testing has updated to v0.2.5, which is the version libcamera uses in the libyaml wrap fallback). This causes issues parsing YAML files in the RkISP1 module. To fix that, we could have mandated libyaml v0.2.3 or newer, but given that we don't depend on any YAML 1.2 feature, downgrading our YAML files to version 1.1 should be more user-friendly. The main drawback I can see is that YAML 1.1 parses the unquoted string literals Yes, No, On and Off as booleans, while YAML 1.2 parses them as strings. None of the YAML files in libcamera use those values, but we'll have to be careful not to use them in the future if we want to later switch back to YAML 1.2 when distributions will have caught up. Patch 1/2 fixes the issue in the RkISP1 IPA module tuning data files, while patch 2/2 modifies the internal YAML files used for code generation. The latter isn't strictly needed as explained in the commit message of the second patch, but I've included it for consistency. I'm fine dropping the second patch if preferred. Florian, could you check if this fixes your YAML parsing issues ? Laurent Pinchart (2): ipa: rkisp1: Use YAML 1.1 for tuning data files libcamera: Switch internal YAML files to YAML 1.1 src/ipa/rkisp1/data/imx219.yaml | 2 +- src/ipa/rkisp1/data/ov5640.yaml | 2 +- src/ipa/rkisp1/data/uncalibrated.yaml | 2 +- src/libcamera/control_ids.yaml | 2 +- src/libcamera/formats.yaml | 2 +- src/libcamera/property_ids.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) base-commit: 961a6cf7cac9b788cc285a58ae1b8a480f00b633