Patch Detail
Show a patch.
GET /api/patches/16837/?format=api
{ "id": 16837, "url": "https://patchwork.libcamera.org/api/patches/16837/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16837/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220727085524.13290-1-naush@raspberrypi.com>", "date": "2022-07-27T08:55:16", "name": "[libcamera-devel,v3,0/8] Raspberry Pi IPA code refactor", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "f21b37fcbf443880a38ef496211f341e8e827743", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16837/mbox/", "series": [], "comments": "https://patchwork.libcamera.org/api/patches/16837/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16837/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 8333BC3275\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 27 Jul 2022 08:55:33 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4086363313;\n\tWed, 27 Jul 2022 10:55:33 +0200 (CEST)", "from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com\n\t[IPv6:2a00:1450:4864:20::42a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E331F603EC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Jul 2022 10:55:31 +0200 (CEST)", "by mail-wr1-x42a.google.com with SMTP id l22so1687677wrz.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 27 Jul 2022 01:55:31 -0700 (PDT)", "from naush-laptop.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tv3-20020a1cac03000000b003a0375c4f73sm1559408wme.44.2022.07.27.01.55.30\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 27 Jul 2022 01:55:30 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1658912133;\n\tbh=fRVRvXCBRZgxgg6aNX5dqxfpOxgIU7MciTfM4WFdysQ=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=wBsgq4oQ11xnoEmP3j9yR79fIQSvKjldFICnYiJgeuEOjaBhUXLe+Bk7i9eEy7WKU\n\t816pv9rpYbKXYyhB+PtNkPwL5qxrvi5LXQ1BX1g39IaXQLD0Q8hZUHWBcepDP6VcvM\n\tUlbD9gkhKfKttTN3slDYPYqydMANZizAwdgpD0J5Ows1UlaxzqSJu/DJHUWxhiUNpT\n\t9jtQWdV3nJyQF0tlS/ZOL8naHPiAUOI9L1IJP2giC5ioM9jfEB7cE/ypTvEzHGVChS\n\tqRmG0ZNKNtz6LYmRVCCCgXJlvjRL5KoUavIE9CI0zd33k4kkFro2ZqeLNWT0qDu6/w\n\tAHER9f5XL36Ww==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=IsdiNw/GEpI6r8HLkHjeiXeUBi3P5G3mq1nScwdgAMc=;\n\tb=gH/Sdpccaijcj5NYfF2covMI9uVN41ntdHY3kHnOKfdkebSsfBTlIr64e3kIyuaHkX\n\ttHaXRs0q5vSFM66uhHdyOTGHUJ+TzjpwTthc53KQG9nqCqh5bowdvkm4BmoeV2gw7Pca\n\tx78UPeRO29LifMS+tT5BFIXuBecizkMN+h7XieaNLNk1fYOe0jdlmvklsgpAdmWxg4TQ\n\t7/qVICrHLX5FFghq8tFG8bFIT9t2EePhg/fAuTtXKIYZuCFGBp8gZF2CxFI7RTmTvf+M\n\t1Ejngt1P0qGYQWspThJLfb70+EmB3DfREgbMgZUe8Eec2sjZC2a7f0wwNQDtck1GvQYL\n\tLCsg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"gH/Sdpcc\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=IsdiNw/GEpI6r8HLkHjeiXeUBi3P5G3mq1nScwdgAMc=;\n\tb=C8DOinl1UVfkfSisIbq0kExRJVKgA3busIlozkQo3PNBugxRhSfASnGg8uKO8VO8nG\n\t3DXkDvCinTVeZPA9yzCgpDejwAcCO0be8NTwBYpIdySa9sxPa2QWlSt7iaRuNq7TUCkA\n\t8H0FZifB738xjBxUiFF/PWkg61Za69Lumc9deb5YRmQ2y9e/PtdAutq1Xm6bVI+g+447\n\t6+fZlAhqCliQeHNf5pAOXZIU/UmuY9eCAH60DRhRXeyGtMVuIspB/KXpzdgellWWFJcF\n\tf4PWcAFfaTXiUQU/baNSB9KeaCMNoCXKKnrFttfjU3YedtkLWMIGO+o2qoFE53ZDzC10\n\tCHrA==", "X-Gm-Message-State": "AJIora9eVDik20S2Ba1vI9NRAePgre4CPX0hdBGVRW34x5KlDl1o9j5J\n\tS+bjGYq2ZJyGv80lkwO5S68i+PgNc5IO3w==", "X-Google-Smtp-Source": "AGRyM1uJ+zP0nMtPX34VQ5diNFAYxD+Fh0rfh1o2ukfkecmfFdkPs9SWM+e6C2F9Gf28GSYhuMWL+g==", "X-Received": "by 2002:a5d:64cc:0:b0:21d:a4bd:fdbe with SMTP id\n\tf12-20020a5d64cc000000b0021da4bdfdbemr13152140wri.580.1658912131177; \n\tWed, 27 Jul 2022 01:55:31 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 27 Jul 2022 09:55:16 +0100", "Message-Id": "<20220727085524.13290-1-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 0/8] Raspberry Pi IPA code refactor", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Hi Laurent,\n\nProviding and squashing fixup commits is not entirely trivial with this series\nsince you will get merge conflicts as each commit touches/renames the same\nbunch of files. So I though I'd save you some time and squash/fixup and provide\nthis version 3.\n\nThe actual delta from the previous revision (v2) is tiny, and addresses all the\npoints raised:\n\n\nBarring anything else that might be picked up, this should be ready for merging\nwith you R-B tag added to 1/8 if you are happy.\n\nRegards,\nNaush\n\nNaushir Patuck (8):\n ipa: raspberrypi: Code refactoring to match style guidelines\n ipa: raspberrypi: Change to C style code comments\n ipa: raspberrypi: Remove extern \"C\" declarations\n ipa: raspberrypi: Rename header files from *.hpp to *.h\n raspberrypi: Update Copyright statement in all Raspberry Pi source\n files\n ipa: raspberryip: Remove all exception throw statements\n ipa: raspberrypi: Remove #define constants\n ipa: raspberrypi: agc: Fix log message prefixes\n\n .reuse/dep5 | 2 +-\n include/libcamera/color_space.h | 2 +-\n include/libcamera/internal/bayer_format.h | 2 +-\n include/libcamera/internal/delayed_controls.h | 2 +-\n include/libcamera/internal/v4l2_pixelformat.h | 2 +-\n include/libcamera/transform.h | 2 +-\n include/linux/bcm2835-isp.h | 2 +-\n src/cam/stream_options.cpp | 2 +-\n src/cam/stream_options.h | 2 +-\n src/ipa/libipa/histogram.cpp | 2 +-\n src/ipa/libipa/histogram.h | 2 +-\n src/ipa/raspberrypi/cam_helper.cpp | 94 +-\n src/ipa/raspberrypi/cam_helper.h | 127 ++\n src/ipa/raspberrypi/cam_helper.hpp | 123 --\n src/ipa/raspberrypi/cam_helper_imx219.cpp | 40 +-\n src/ipa/raspberrypi/cam_helper_imx290.cpp | 36 +-\n src/ipa/raspberrypi/cam_helper_imx296.cpp | 28 +-\n src/ipa/raspberrypi/cam_helper_imx477.cpp | 78 +-\n src/ipa/raspberrypi/cam_helper_imx519.cpp | 76 +-\n src/ipa/raspberrypi/cam_helper_ov5647.cpp | 48 +-\n src/ipa/raspberrypi/cam_helper_ov9281.cpp | 32 +-\n .../raspberrypi/controller/agc_algorithm.h | 31 +\n .../raspberrypi/controller/agc_algorithm.hpp | 32 -\n src/ipa/raspberrypi/controller/agc_status.h | 48 +-\n src/ipa/raspberrypi/controller/algorithm.cpp | 26 +-\n src/ipa/raspberrypi/controller/algorithm.h | 64 +\n src/ipa/raspberrypi/controller/algorithm.hpp | 60 -\n src/ipa/raspberrypi/controller/alsc_status.h | 26 +-\n .../raspberrypi/controller/awb_algorithm.h | 23 +\n .../raspberrypi/controller/awb_algorithm.hpp | 23 -\n src/ipa/raspberrypi/controller/awb_status.h | 24 +-\n .../controller/black_level_status.h | 18 +-\n src/ipa/raspberrypi/controller/camera_mode.h | 56 +-\n .../raspberrypi/controller/ccm_algorithm.h | 21 +\n .../raspberrypi/controller/ccm_algorithm.hpp | 21 -\n src/ipa/raspberrypi/controller/ccm_status.h | 12 +-\n .../controller/contrast_algorithm.h | 22 +\n .../controller/contrast_algorithm.hpp | 22 -\n .../raspberrypi/controller/contrast_status.h | 20 +-\n src/ipa/raspberrypi/controller/controller.cpp | 86 +-\n src/ipa/raspberrypi/controller/controller.h | 58 +\n src/ipa/raspberrypi/controller/controller.hpp | 54 -\n ...oise_algorithm.hpp => denoise_algorithm.h} | 12 +-\n .../raspberrypi/controller/denoise_status.h | 16 +-\n .../raspberrypi/controller/device_status.cpp | 20 +-\n .../raspberrypi/controller/device_status.h | 18 +-\n src/ipa/raspberrypi/controller/dpc_status.h | 14 +-\n src/ipa/raspberrypi/controller/focus_status.h | 20 +-\n src/ipa/raspberrypi/controller/geq_status.h | 12 +-\n src/ipa/raspberrypi/controller/histogram.cpp | 46 +-\n src/ipa/raspberrypi/controller/histogram.h | 48 +\n src/ipa/raspberrypi/controller/histogram.hpp | 44 -\n src/ipa/raspberrypi/controller/lux_status.h | 28 +-\n .../controller/{metadata.hpp => metadata.h} | 40 +-\n src/ipa/raspberrypi/controller/noise_status.h | 16 +-\n src/ipa/raspberrypi/controller/pwl.cpp | 174 +--\n src/ipa/raspberrypi/controller/pwl.h | 126 ++\n src/ipa/raspberrypi/controller/pwl.hpp | 112 --\n src/ipa/raspberrypi/controller/rpi/agc.cpp | 1047 +++++++++--------\n src/ipa/raspberrypi/controller/rpi/agc.h | 141 +++\n src/ipa/raspberrypi/controller/rpi/agc.hpp | 139 ---\n src/ipa/raspberrypi/controller/rpi/alsc.cpp | 860 +++++++-------\n src/ipa/raspberrypi/controller/rpi/alsc.h | 110 ++\n src/ipa/raspberrypi/controller/rpi/alsc.hpp | 106 --\n src/ipa/raspberrypi/controller/rpi/awb.cpp | 770 ++++++------\n src/ipa/raspberrypi/controller/rpi/awb.h | 191 +++\n src/ipa/raspberrypi/controller/rpi/awb.hpp | 179 ---\n .../controller/rpi/black_level.cpp | 46 +-\n .../raspberrypi/controller/rpi/black_level.h | 30 +\n .../controller/rpi/black_level.hpp | 30 -\n src/ipa/raspberrypi/controller/rpi/ccm.cpp | 117 +-\n .../controller/rpi/{ccm.hpp => ccm.h} | 24 +-\n .../raspberrypi/controller/rpi/contrast.cpp | 206 ++--\n src/ipa/raspberrypi/controller/rpi/contrast.h | 52 +\n .../raspberrypi/controller/rpi/contrast.hpp | 50 -\n src/ipa/raspberrypi/controller/rpi/dpc.cpp | 34 +-\n src/ipa/raspberrypi/controller/rpi/dpc.h | 32 +\n src/ipa/raspberrypi/controller/rpi/dpc.hpp | 32 -\n src/ipa/raspberrypi/controller/rpi/focus.cpp | 18 +-\n .../controller/rpi/{focus.hpp => focus.h} | 12 +-\n src/ipa/raspberrypi/controller/rpi/geq.cpp | 64 +-\n src/ipa/raspberrypi/controller/rpi/geq.h | 34 +\n src/ipa/raspberrypi/controller/rpi/geq.hpp | 34 -\n src/ipa/raspberrypi/controller/rpi/lux.cpp | 90 +-\n src/ipa/raspberrypi/controller/rpi/lux.h | 45 +\n src/ipa/raspberrypi/controller/rpi/lux.hpp | 43 -\n src/ipa/raspberrypi/controller/rpi/noise.cpp | 64 +-\n src/ipa/raspberrypi/controller/rpi/noise.h | 32 +\n src/ipa/raspberrypi/controller/rpi/noise.hpp | 32 -\n src/ipa/raspberrypi/controller/rpi/sdn.cpp | 50 +-\n src/ipa/raspberrypi/controller/rpi/sdn.h | 32 +\n src/ipa/raspberrypi/controller/rpi/sdn.hpp | 32 -\n .../raspberrypi/controller/rpi/sharpen.cpp | 72 +-\n src/ipa/raspberrypi/controller/rpi/sharpen.h | 34 +\n .../raspberrypi/controller/rpi/sharpen.hpp | 34 -\n .../controller/sharpen_algorithm.h | 21 +\n .../controller/sharpen_algorithm.hpp | 21 -\n .../raspberrypi/controller/sharpen_status.h | 22 +-\n .../{md_parser.hpp => md_parser.h} | 50 +-\n src/ipa/raspberrypi/md_parser_smia.cpp | 112 +-\n src/ipa/raspberrypi/raspberrypi.cpp | 294 ++---\n src/libcamera/bayer_format.cpp | 2 +-\n src/libcamera/color_space.cpp | 2 +-\n src/libcamera/delayed_controls.cpp | 2 +-\n .../pipeline/raspberrypi/dma_heaps.cpp | 2 +-\n .../pipeline/raspberrypi/dma_heaps.h | 2 +-\n .../pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n .../pipeline/raspberrypi/rpi_stream.cpp | 2 +-\n .../pipeline/raspberrypi/rpi_stream.h | 2 +-\n src/libcamera/transform.cpp | 2 +-\n src/libcamera/v4l2_pixelformat.cpp | 2 +-\n src/qcam/dng_writer.cpp | 2 +-\n src/qcam/dng_writer.h | 2 +-\n utils/raspberrypi/ctt/ctt.py | 2 +-\n utils/raspberrypi/ctt/ctt_alsc.py | 2 +-\n utils/raspberrypi/ctt/ctt_awb.py | 2 +-\n utils/raspberrypi/ctt/ctt_ccm.py | 2 +-\n utils/raspberrypi/ctt/ctt_geq.py | 2 +-\n utils/raspberrypi/ctt/ctt_image_load.py | 2 +-\n utils/raspberrypi/ctt/ctt_lux.py | 2 +-\n utils/raspberrypi/ctt/ctt_macbeth_locator.py | 2 +-\n utils/raspberrypi/ctt/ctt_noise.py | 2 +-\n .../raspberrypi/ctt/ctt_pretty_print_json.py | 2 +-\n utils/raspberrypi/ctt/ctt_ransac.py | 2 +-\n utils/raspberrypi/ctt/ctt_tools.py | 2 +-\n 125 files changed, 3872 insertions(+), 3811 deletions(-)\n create mode 100644 src/ipa/raspberrypi/cam_helper.h\n delete mode 100644 src/ipa/raspberrypi/cam_helper.hpp\n create mode 100644 src/ipa/raspberrypi/controller/agc_algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/agc_algorithm.hpp\n create mode 100644 src/ipa/raspberrypi/controller/algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/algorithm.hpp\n create mode 100644 src/ipa/raspberrypi/controller/awb_algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/awb_algorithm.hpp\n create mode 100644 src/ipa/raspberrypi/controller/ccm_algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/ccm_algorithm.hpp\n create mode 100644 src/ipa/raspberrypi/controller/contrast_algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/contrast_algorithm.hpp\n create mode 100644 src/ipa/raspberrypi/controller/controller.h\n delete mode 100644 src/ipa/raspberrypi/controller/controller.hpp\n rename src/ipa/raspberrypi/controller/{denoise_algorithm.hpp => denoise_algorithm.h} (53%)\n create mode 100644 src/ipa/raspberrypi/controller/histogram.h\n delete mode 100644 src/ipa/raspberrypi/controller/histogram.hpp\n rename src/ipa/raspberrypi/controller/{metadata.hpp => metadata.h} (61%)\n create mode 100644 src/ipa/raspberrypi/controller/pwl.h\n delete mode 100644 src/ipa/raspberrypi/controller/pwl.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/agc.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/agc.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/alsc.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/alsc.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/awb.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/awb.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/black_level.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/black_level.hpp\n rename src/ipa/raspberrypi/controller/rpi/{ccm.hpp => ccm.h} (68%)\n create mode 100644 src/ipa/raspberrypi/controller/rpi/contrast.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/contrast.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/dpc.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/dpc.hpp\n rename src/ipa/raspberrypi/controller/rpi/{focus.hpp => focus.h} (59%)\n create mode 100644 src/ipa/raspberrypi/controller/rpi/geq.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/geq.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/lux.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/lux.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/noise.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/noise.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/sdn.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/sdn.hpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/sharpen.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/sharpen.hpp\n create mode 100644 src/ipa/raspberrypi/controller/sharpen_algorithm.h\n delete mode 100644 src/ipa/raspberrypi/controller/sharpen_algorithm.hpp\n rename src/ipa/raspberrypi/{md_parser.hpp => md_parser.h} (75%)", "diff": "diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp\nindex ad75d55f0976..f5898fc48eb6 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp\n@@ -406,7 +406,7 @@ double Awb::computeDelta2Sum(double gainR, double gainB)\n double deltaR = gainR * z.R - 1 - config_.whitepointR;\n double deltaB = gainB * z.B - 1 - config_.whitepointB;\n double delta2 = deltaR * deltaR + deltaB * deltaB;\n- /*LOG(RPiAwb, Debug) << \"delta_r \" << delta_r << \" delta_b \" << delta_b << \" delta2 \" << delta2; */\n+ /* LOG(RPiAwb, Debug) << \"delta_r \" << delta_r << \" delta_b \" << delta_b << \" delta2 \" << delta2; */\n delta2 = std::min(delta2, config_.deltaLimit);\n delta2Sum += delta2;\n }\ndiff --git a/src/ipa/raspberrypi/controller/rpi/awb.h b/src/ipa/raspberrypi/controller/rpi/awb.h\nindex 9e075624c429..058f0d4cb091 100644\n--- a/src/ipa/raspberrypi/controller/rpi/awb.h\n+++ b/src/ipa/raspberrypi/controller/rpi/awb.h\n@@ -41,10 +41,8 @@ struct AwbConfig {\n double speed; /* IIR filter speed applied to algorithm results */\n bool fast; /* \"fast\" mode uses a 16x16 rather than 32x32 grid */\n Pwl ctR; /* function maps CT to r (= R/G) */\n- Pwl ctB; /*\n- Pwl ctB; * function maps CT to b (= B/G)\n- * table of illuminant priors at different lux levels\n- */\n+ Pwl ctB; /* function maps CT to b (= B/G) */\n+ /* table of illuminant priors at different lux levels */\n std::vector<AwbPrior> priors;\n /* AWB \"modes\" (determines the search range) */\n std::map<std::string, AwbMode> modes;\ndiff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp\nindex 0799d7b9195a..def19ccb42a2 100644\n--- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp\n+++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp\n@@ -35,9 +35,9 @@ void BlackLevel::read(boost::property_tree::ptree const ¶ms)\n {\n uint16_t blackLevel = params.get<uint16_t>(\n \"black_level\", 4096); /* 64 in 10 bits scaled to 16 bits */\n- blackLevelR_ = params.get<uint16_t>(\"blackLevelR\", blackLevel);\n- blackLevelG_ = params.get<uint16_t>(\"blackLevelG\", blackLevel);\n- blackLevelB_ = params.get<uint16_t>(\"blackLevelB\", blackLevel);\n+ blackLevelR_ = params.get<uint16_t>(\"black_level_r\", blackLevel);\n+ blackLevelG_ = params.get<uint16_t>(\"black_level_g\", blackLevel);\n+ blackLevelB_ = params.get<uint16_t>(\"black_level_b\", blackLevel);\n LOG(RPiBlackLevel, Debug)\n << \" Read black levels red \" << blackLevelR_\n << \" green \" << blackLevelG_\n", "prefixes": [ "libcamera-devel", "v3", "0/8" ] }