[{"id":30058,"web_url":"https://patchwork.libcamera.org/comment/30058/","msgid":"<171926488899.625657.11778053229081848011@ping.linuxembedded.co.uk>","date":"2024-06-24T21:34:48","subject":"Re: [PATCH 03/10] ipa: rpi: Define local functions in anonymous\n\tnamespace","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-06-24 20:29:34)\n> Multiple local functions are defined in the global namespace without the\n> static keyword. This compiles fine for now, but will cause a missing\n> declaration warning when we enable them. To prepare for that, move the\n> function declaration to an anonymous namespace.\n> \n> While at it, for consistency, include an existing static function in the\n> namespace and drop the static keyword.\n> \n\nI'm fine with all of that, but of course this needs a tag from RPi.\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/ipa/rpi/controller/rpi/ccm.cpp | 6 +++++-\n> src/ipa/rpi/controller/rpi/contrast.cpp | 4 ++++\n> 2 files changed, 9 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\n> index e673964c1856..aefa580c9a4b 100644\n> --- a/src/ipa/rpi/controller/rpi/ccm.cpp\n> +++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n> @@ -113,8 +113,10 @@ void Ccm::initialise()\n> {\n> }\n> \n> +namespace {\n> +\n> template\n> -static bool getLocked(Metadata *metadata, std::string const &tag, T &value)\n> +bool getLocked(Metadata *metadata, std::string const &tag, T &value)\n> {\n> T *ptr = metadata->getLocked(tag);\n> if (ptr == nullptr)\n> @@ -149,6 +151,8 @@ Matrix applySaturation(Matrix const &ccm, double saturation)\n> return Y2RGB * S * RGB2Y * ccm;\n> }\n> \n> +} /* namespace */\n> +\n> void Ccm::prepare(Metadata *imageMetadata)\n> {\n> bool awbOk = false, luxOk = false;\n> diff --git a/src/ipa/rpi/controller/rpi/contrast.cpp b/src/ipa/rpi/controller/rpi/contrast.cpp\n> index 9b37943ae9c9..fe866a544293 100644\n> --- a/src/ipa/rpi/controller/rpi/contrast.cpp\n> +++ b/src/ipa/rpi/controller/rpi/contrast.cpp\n> @@ -94,6 +94,8 @@ void Contrast::prepare(Metadata *imageMetadata)\n> imageMetadata->set(\"contrast.status\", status_);\n> }\n> \n> +namespace {\n> +\n> ipa::Pwl computeStretchCurve(Histogram const &histogram,\n> ContrastConfig const &config)\n> {\n> @@ -153,6 +155,8 @@ ipa::Pwl applyManualContrast(ipa::Pwl const &gammaCurve, double brightness,\n> return newGammaCurve;\n> }\n> \n> +} /* namespace */\n> +\n> void Contrast::process(StatisticsPtr &stats,\n> [[maybe_unused]] Metadata *imageMetadata)\n> {\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"","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 8593FBDB1D\n\tfor ;\n\tMon, 24 Jun 2024 21:34:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AA876654A9;\n\tMon, 24 Jun 2024 23:34:53 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C362F654A1\n\tfor ;\n\tMon, 24 Jun 2024 23:34:51 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8D5391650;\n\tMon, 24 Jun 2024 23:34:29 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"irnVG2rZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719264869;\n\tbh=3p6Tkx5/n5CBbnkvGJbEG/GF1z6WLM6h0rRutlw7Jpg=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=irnVG2rZlchqosr5l+Rf/zxbUZ3GA0c5Dbqn4/M18ZtmOjMn/OCEl+a7iyQ9UqlUR\n\t6dCOb9DrNwdXtOeKLhRVsYyLCL0im55e9iKOroVBrKCEmBvDkAR+WRSxZENftTybpc\n\thv4868emvECCNzLlOa0qhCOrgwmgHEwWKpOoEOTM=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240624192941.22943-4-laurent.pinchart@ideasonboard.com>","References":"<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>\n\t<20240624192941.22943-4-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH 03/10] ipa: rpi: Define local functions in anonymous\n\tnamespace","From":"Kieran Bingham ","Cc":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 24 Jun 2024 22:34:48 +0100","Message-ID":"<171926488899.625657.11778053229081848011@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":30090,"web_url":"https://patchwork.libcamera.org/comment/30090/","msgid":"","date":"2024-06-26T08:53:08","subject":"Re: [PATCH 03/10] ipa: rpi: Define local functions in anonymous\n\tnamespace","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi Laurent,\n\nOn Mon, 24 Jun 2024 at 20:30, Laurent Pinchart\n wrote:\n>\n> Multiple local functions are defined in the global namespace without the\n> static keyword. This compiles fine for now, but will cause a missing\n> declaration warning when we enable them. To prepare for that, move the\n> function declaration to an anonymous namespace.\n>\n> While at it, for consistency, include an existing static function in the\n> namespace and drop the static keyword.\n>\n> Signed-off-by: Laurent Pinchart \n\nLooks good to me:\nReviewed-by: Naushir Patuck \n\n> ---\n> src/ipa/rpi/controller/rpi/ccm.cpp | 6 +++++-\n> src/ipa/rpi/controller/rpi/contrast.cpp | 4 ++++\n> 2 files changed, 9 insertions(+), 1 deletion(-)\n>\n> diff --git a/src/ipa/rpi/controller/rpi/ccm.cpp b/src/ipa/rpi/controller/rpi/ccm.cpp\n> index e673964c1856..aefa580c9a4b 100644\n> --- a/src/ipa/rpi/controller/rpi/ccm.cpp\n> +++ b/src/ipa/rpi/controller/rpi/ccm.cpp\n> @@ -113,8 +113,10 @@ void Ccm::initialise()\n> {\n> }\n>\n> +namespace {\n> +\n> template\n> -static bool getLocked(Metadata *metadata, std::string const &tag, T &value)\n> +bool getLocked(Metadata *metadata, std::string const &tag, T &value)\n> {\n> T *ptr = metadata->getLocked(tag);\n> if (ptr == nullptr)\n> @@ -149,6 +151,8 @@ Matrix applySaturation(Matrix const &ccm, double saturation)\n> return Y2RGB * S * RGB2Y * ccm;\n> }\n>\n> +} /* namespace */\n> +\n> void Ccm::prepare(Metadata *imageMetadata)\n> {\n> bool awbOk = false, luxOk = false;\n> diff --git a/src/ipa/rpi/controller/rpi/contrast.cpp b/src/ipa/rpi/controller/rpi/contrast.cpp\n> index 9b37943ae9c9..fe866a544293 100644\n> --- a/src/ipa/rpi/controller/rpi/contrast.cpp\n> +++ b/src/ipa/rpi/controller/rpi/contrast.cpp\n> @@ -94,6 +94,8 @@ void Contrast::prepare(Metadata *imageMetadata)\n> imageMetadata->set(\"contrast.status\", status_);\n> }\n>\n> +namespace {\n> +\n> ipa::Pwl computeStretchCurve(Histogram const &histogram,\n> ContrastConfig const &config)\n> {\n> @@ -153,6 +155,8 @@ ipa::Pwl applyManualContrast(ipa::Pwl const &gammaCurve, double brightness,\n> return newGammaCurve;\n> }\n>\n> +} /* namespace */\n> +\n> void Contrast::process(StatisticsPtr &stats,\n> [[maybe_unused]] Metadata *imageMetadata)\n> {\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","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 62C36BD87C\n\tfor ;\n\tWed, 26 Jun 2024 08:53:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A27F5654A9;\n\tWed, 26 Jun 2024 10:53:47 +0200 (CEST)","from mail-yw1-x1134.google.com (mail-yw1-x1134.google.com\n\t[IPv6:2607:f8b0:4864:20::1134])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 45FF1619E5\n\tfor ;\n\tWed, 26 Jun 2024 10:53:45 +0200 (CEST)","by mail-yw1-x1134.google.com with SMTP id\n\t00721157ae682-63bdb089ffdso51525197b3.3\n\tfor ;\n\tWed, 26 Jun 2024 01:53:45 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"QFD97/lm\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1719392024; x=1719996824;\n\tdarn=lists.libcamera.org; \n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:from:to:cc:subject:date:message-id:reply-to;\n\tbh=c2fI4Trr8Fzlq93xn5hcvYxrDXNXCjPBM3IyhSUTHKg=;\n\tb=QFD97/lmMX+mQRVpIg0D0XZjKdSeP2J5TWH/C49gZWlQ256kz5Pou0/LiL16fm8iTF\n\tQ0QixWk99xckt8AJWEvHplZTuX0fd5PzPGkrY29ifgYzK8639XH4wLWzJRqSizjVxnI/\n\t879Be/uq0mxRsdx7SulkghFKF9BUUSYfn3Bkiuc6LN9V4Ut5GR3Ie9nYFxeSWd4ILEpM\n\tv2z3bPpRF0HJUBiBUfkUtZivARYtqOpgXCes7K2zfhTkRrI04CXm8JDjFCa6/EzoPHyP\n\tH0FGpzXAMRs/6ny4m/bMaZKNp6YyzYv8eE1+TJGNGzDP1AwC1709Y6KA19FtkWmHC7vH\n\t+xVA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1719392024; x=1719996824;\n\th=cc:to:subject:message-id:date:from:in-reply-to:references\n\t:mime-version:x-gm-message-state:from:to:cc:subject:date:message-id\n\t:reply-to;\n\tbh=c2fI4Trr8Fzlq93xn5hcvYxrDXNXCjPBM3IyhSUTHKg=;\n\tb=H5DQFV0aZYbqSrGRJZi/IckwttP7KnXsQc6sAA/YzA0H2+vImlUa4NmYpMb2Or1cr1\n\thzDDb9zHAEmundjZYcnB59uyTM+5cGZSd5PNIFazMab0ksdfFISUORALu1jrKwEnHe1i\n\tpdKWk3ALy2ymhLEW7ZhPf6lgvMOrKlZ6exJCUgLyWGXOKZHiOXHjiSFhb0dRaauTmCqT\n\tJFW0vWcHq9silq263wJf4GaUC863+UJYyIHeUT2/UNBtK+D3R3T2hHugtesS9NuURm3C\n\tuc4jusCw8jwBfUrf94+P2Mh/USVZxPzfV3cxKXxBLqQvez3g/RxeH+HINjVUuTOlXbBK\n\tnILA==","X-Gm-Message-State":"AOJu0YyVEYxfIYkd32QgX+H6kLpBeJCerUk1S+znS7p/ju8mOuwIXC+e\n\t9FLCgXkexj5Kg/LVAIshAiDj7v06MumW6EEVm4c3Tjce/dp9diue+276kZ+lFbOAT34Vlb/po9K\n\tKBik1Ds+IharvykufEALAlpdpkDFsWN7Yv01iww==","X-Google-Smtp-Source":"AGHT+IGT9lmleqQ9CYRTLMadc/1kOeWSs8mLfpn1jyDc2ibKfM6S2JIoOd1kveiPWZnxs5+0hPppnpt3Pxk0dN0x0uw=","X-Received":"by 2002:a05:690c:60c5:b0:63b:ca6d:7bb8 with SMTP id\n\t00721157ae682-6433eaf198cmr113802957b3.11.1719392023925;\n\tWed, 26 Jun 2024 01:53:43 -0700 (PDT)","MIME-Version":"1.0","References":"<20240624192941.22943-1-laurent.pinchart@ideasonboard.com>\n\t<20240624192941.22943-4-laurent.pinchart@ideasonboard.com>","In-Reply-To":"<20240624192941.22943-4-laurent.pinchart@ideasonboard.com>","From":"Naushir Patuck ","Date":"Wed, 26 Jun 2024 09:53:08 +0100","Message-ID":"","Subject":"Re: [PATCH 03/10] ipa: rpi: Define local functions in anonymous\n\tnamespace","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org, =?utf-8?b?QmFybmFiw6FzIFDFkWN6?=\n\t=?utf-8?q?e?= ","Content-Type":"text/plain; charset=\"UTF-8\"","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]