From patchwork Thu Jul 14 15:24:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 16627 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 D65E9BD1F1 for ; Thu, 14 Jul 2022 15:24:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1E82F63312; Thu, 14 Jul 2022 17:24:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657812255; bh=LzjigSgKM/nH8zkpqaUpb333T9d3osxTyBpqt9SCBn0=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=rbGCjusZeVmf/VLTRuLQfBb7I4XXHjY9kZcH6AVVapn1h7AEznJFl6pw62S5kVzON ABW9ECgSYGt1Sw43TK6oC5Uw6op85l0XbSl/jKmYFjSb149sp+ijbGsASC9k+MtazL O3qcEfDwHV/wqcoUp1KZ7eOjhYZf8rOeYZCTBQfYcsEjdabNruYmnUqh9wCzjGkC// Kef8+Tq5CHELQN+ja9AEMXwb+Ix1SP8NqEj/JGWcgxD/2Z0HhFeCaN3E955abhoiDG f+qdc4vhSIrte7A0PYqICvLxuGAKRrCxznipgx4PKtLHyY9qs1rwV7sz7Y5oQumOZT He0BxchLvQ4mg== Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 947926330D for ; Thu, 14 Jul 2022 17:24:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="O5rggR0H"; dkim-atps=neutral Received: by mail-wr1-x433.google.com with SMTP id bk26so3003320wrb.11 for ; Thu, 14 Jul 2022 08:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aG83On1LrkKMYlcrAHg4DCVpm9Ur5fu1SIYQq5r1+is=; b=O5rggR0HoSqeZHao0gY5C/9a7QbPG8kqXW+tcJtkbuGzcFK3FxTzCOY44aW5KywNsS ux/QOJLuvXSgJzkxRs3DoRdUdL79cRLseS/TRkXszNgRgLmXEwJzwsm7WkTeX8YSJaCh wyNZup7TO19mifmWzfDa7dWFA1sgFuQRD+OG4jt0/QaeRQhntDqMTXMgyyHcYhWMLpoe GIAP5yLccuzB/pwKL83rK1P9AACBQiWztQSagqo6FGwybffcC67VlelidC11qm/WIcyh sj+xY8yUepQrGBJcc/Z0x5As346Vb6l42NfdpbHVVJ1U5rzeIZMGzZMYLj22Df7EGYDQ i9DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aG83On1LrkKMYlcrAHg4DCVpm9Ur5fu1SIYQq5r1+is=; b=6XSbeZErmXZoMw2gavxvGQD63CWuyrJKnCC1onwcCOeLuFgjWQvVv+DAl/xOfya5WS RACrFT+8wHGtFpiT/0xkSm771t6hZ+wuy7MJPFSCNKYYnzaBjq+JjP/LIFuWX03RrfFL ZZgpoRuqv4NbwJ2ysx7wnl8Ily3ZF+0zuMEKuHY6uSx38DHyhVcf2bDUCJuGv074jUR9 gsM4YKc2Y/dID1eEP758/HxdazKMs+PdutT3Hky8vOR+CMpUstbGWHTsWGOvL54aeOiC QpHZakLLMk1bX5qEGc8QUEZlCG3TyB6CL8TCCOBh8MhPlEgAoajB5U1sodSqHi3mLI9y 9OeQ== X-Gm-Message-State: AJIora8MyMjEnjZLiI/LTpE7HX+P5omTEbZPQRQTwfhsb+t4WU5MFPxo e0tdlklAjiTX9r++mXtt4/pdVZoDk1aljg== X-Google-Smtp-Source: AGRyM1vtQe7jbxxiI0hLoGejyNtxbuNPAzFwJoTOumiB50LwWDfYnVcXYl59Ysv9Rqsu8iUjhX4zGg== X-Received: by 2002:adf:edc1:0:b0:21d:7157:f4aa with SMTP id v1-20020adfedc1000000b0021d7157f4aamr8921011wro.454.1657812252876; Thu, 14 Jul 2022 08:24:12 -0700 (PDT) Received: from naush-laptop.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id h14-20020a1ccc0e000000b003a2e7c13a3asm2322476wmb.42.2022.07.14.08.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 08:24:11 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 14 Jul 2022 16:24:01 +0100 Message-Id: <20220714152409.9780-1-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 0/8] Replace boost JSON parser with libyaml in Raspberry Pi IPA 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: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Hi, Apologies for the quick turn-around on this series, but I made some changes to the conversion script in 5/8 to make the tuning files more readabale. Subsequently, all the tuning files in 8/8 have also changed formatting slightly. Thanks, Naush Laurent Pinchart (4): test: yaml-parser: Test dictionary items ordering libcamera: yaml_parser: Preserve order of items in dictionary ipa: raspberrypi: Replace tabs with spaces in tuning data files ipa: raspberrypi: Use YamlParser to replace dependency on boost Naushir Patuck (4): ipa: raspberrypi: Introduce version 2.0 format for the camera tuning file utils: raspberrypi: Add tuning file conversion script utils: raspberrypi: ctt: Output version 2.0 format tuning files ipa: raspberrypi: Convert existing cameara tuning files to version 2.0 README.rst | 6 - include/libcamera/internal/yaml_parser.h | 37 +- src/ipa/raspberrypi/controller/algorithm.cpp | 2 +- src/ipa/raspberrypi/controller/algorithm.hpp | 6 +- src/ipa/raspberrypi/controller/controller.cpp | 59 +- src/ipa/raspberrypi/controller/controller.hpp | 4 +- src/ipa/raspberrypi/controller/pwl.cpp | 12 +- src/ipa/raspberrypi/controller/pwl.hpp | 5 +- src/ipa/raspberrypi/controller/rpi/agc.cpp | 94 +- src/ipa/raspberrypi/controller/rpi/agc.hpp | 10 +- src/ipa/raspberrypi/controller/rpi/alsc.cpp | 94 +- src/ipa/raspberrypi/controller/rpi/alsc.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/awb.cpp | 89 +- src/ipa/raspberrypi/controller/rpi/awb.hpp | 8 +- .../controller/rpi/black_level.cpp | 12 +- .../controller/rpi/black_level.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/ccm.cpp | 28 +- src/ipa/raspberrypi/controller/rpi/ccm.hpp | 4 +- .../raspberrypi/controller/rpi/contrast.cpp | 18 +- .../raspberrypi/controller/rpi/contrast.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/dpc.cpp | 4 +- src/ipa/raspberrypi/controller/rpi/dpc.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/geq.cpp | 10 +- src/ipa/raspberrypi/controller/rpi/geq.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/lux.cpp | 12 +- src/ipa/raspberrypi/controller/rpi/lux.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/noise.cpp | 6 +- src/ipa/raspberrypi/controller/rpi/noise.hpp | 2 +- src/ipa/raspberrypi/controller/rpi/sdn.cpp | 6 +- src/ipa/raspberrypi/controller/rpi/sdn.hpp | 2 +- .../raspberrypi/controller/rpi/sharpen.cpp | 8 +- .../raspberrypi/controller/rpi/sharpen.hpp | 2 +- src/ipa/raspberrypi/data/imx219.json | 758 ++++++++-------- src/ipa/raspberrypi/data/imx219_noir.json | 638 +++++++------- src/ipa/raspberrypi/data/imx290.json | 288 +++---- src/ipa/raspberrypi/data/imx296.json | 323 ++++--- src/ipa/raspberrypi/data/imx378.json | 615 ++++++------- src/ipa/raspberrypi/data/imx477.json | 815 +++++++++--------- src/ipa/raspberrypi/data/imx477_noir.json | 686 ++++++++------- src/ipa/raspberrypi/data/imx519.json | 615 ++++++------- src/ipa/raspberrypi/data/ov5647.json | 756 ++++++++-------- src/ipa/raspberrypi/data/ov5647_noir.json | 636 +++++++------- src/ipa/raspberrypi/data/ov9281.json | 157 ++-- src/ipa/raspberrypi/data/se327m12.json | 621 ++++++------- src/ipa/raspberrypi/data/uncalibrated.json | 142 ++- src/ipa/raspberrypi/meson.build | 1 - src/ipa/raspberrypi/raspberrypi.cpp | 1 + src/libcamera/yaml_parser.cpp | 35 +- test/yaml-parser.cpp | 17 +- utils/raspberrypi/ctt/convert_tuning.py | 117 +++ utils/raspberrypi/ctt/ctt.py | 13 +- 51 files changed, 4014 insertions(+), 3772 deletions(-) create mode 100755 utils/raspberrypi/ctt/convert_tuning.py