[{"id":29900,"web_url":"https://patchwork.libcamera.org/comment/29900/","msgid":"<171826884944.1669873.10589918963708642770@ping.linuxembedded.co.uk>","date":"2024-06-13T08:54:09","subject":"Re: [PATCH 2/3] ipa: rkisp1: cproc: Merge identical functions","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2024-06-13 09:33:19)\n> convertContrast() and convertSaturation() are equal. Merge them into\n> one.\n> \n> Signed-off-by: Stefan Klug \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/rkisp1/algorithms/cproc.cpp | 15 +++++----------\n> 1 file changed, 5 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> index 955298093fda..9f400a52dd96 100644\n> --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> @@ -44,12 +44,7 @@ int convertBrightness(const float v)\n> return std::clamp(std::lround(v * 128), -128, 127);\n> }\n> \n> -int convertContrast(const float v)\n> -{\n> - return std::clamp(std::lround(v * 128), 0, 255);\n> -}\n> -\n> -int convertSaturation(const float v)\n> +int convertContrastOrSaturation(const float v)\n> {\n> return std::clamp(std::lround(v * 128), 0, 255);\n> }\n> @@ -80,8 +75,8 @@ int ColorProcessing::configure([[maybe_unused]] IPAContext &context,\n> auto &cproc = context.activeState.cproc;\n> \n> cproc.brightness = convertBrightness(kDefaultBrightness);\n> - cproc.contrast = convertContrast(kDefaultContrast);\n> - cproc.saturation = convertSaturation(kDefaultSaturation);\n> + cproc.contrast = convertContrastOrSaturation(kDefaultContrast);\n> + cproc.saturation = convertContrastOrSaturation(kDefaultSaturation);\n> \n> return 0;\n> }\n> @@ -113,7 +108,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> \n> const auto &contrast = controls.get(controls::Contrast);\n> if (contrast) {\n> - int value = convertContrast(*contrast);\n> + int value = convertContrastOrSaturation(*contrast);\n> if (cproc.contrast != value) {\n> cproc.contrast = value;\n> update = true;\n> @@ -124,7 +119,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> \n> const auto saturation = controls.get(controls::Saturation);\n> if (saturation) {\n> - int value = convertSaturation(*saturation);\n> + int value = convertContrastOrSaturation(*saturation);\n> if (cproc.saturation != value) {\n> cproc.saturation = value;\n> update = true;\n> -- \n> 2.43.0\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 22373BD87C\n\tfor ;\n\tThu, 13 Jun 2024 08:54:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D607E6548E;\n\tThu, 13 Jun 2024 10:54:13 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0A4765458\n\tfor ;\n\tThu, 13 Jun 2024 10:54:11 +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 0BDBDBEB;\n\tThu, 13 Jun 2024 10:53:58 +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=\"B3DBrn8a\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718268838;\n\tbh=qg/ZMHpnrnY34i9TPycFOnoNwn4E7CQXbzf90KKxSGg=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=B3DBrn8aaXSDUzNBdF1xsOF68ULj0neYHGWEocXBcHmO8LEnl4ezmmXAGK8HloIZj\n\tpWo20TPgRRFumL9ZV46zPNdjpGwb6J02t1Y/LOYvxpCKPdtnBKJSi0ccdpHUQo9cwd\n\tXnoq2JhrM57qlvRUMAiSaRHw/WsqhIe+g5HThaPc=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240613083533.855791-3-stefan.klug@ideasonboard.com>","References":"<20240613083533.855791-1-stefan.klug@ideasonboard.com>\n\t<20240613083533.855791-3-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH 2/3] ipa: rkisp1: cproc: Merge identical functions","From":"Kieran Bingham ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 13 Jun 2024 09:54:09 +0100","Message-ID":"<171826884944.1669873.10589918963708642770@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":29907,"web_url":"https://patchwork.libcamera.org/comment/29907/","msgid":"<20240613110005.GC6019@pendragon.ideasonboard.com>","date":"2024-06-13T11:00:05","subject":"Re: [PATCH 2/3] ipa: rkisp1: cproc: Merge identical functions","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Stefan,\n\nThank you for the patch.\n\nOn Thu, Jun 13, 2024 at 10:33:19AM +0200, Stefan Klug wrote:\n> convertContrast() and convertSaturation() are equal. Merge them into\n> one.\n> \n> Signed-off-by: Stefan Klug \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/rkisp1/algorithms/cproc.cpp | 15 +++++----------\n> 1 file changed, 5 insertions(+), 10 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\n> index 955298093fda..9f400a52dd96 100644\n> --- a/src/ipa/rkisp1/algorithms/cproc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/cproc.cpp\n> @@ -44,12 +44,7 @@ int convertBrightness(const float v)\n> \treturn std::clamp(std::lround(v * 128), -128, 127);\n> }\n> \n> -int convertContrast(const float v)\n> -{\n> -\treturn std::clamp(std::lround(v * 128), 0, 255);\n> -}\n> -\n> -int convertSaturation(const float v)\n> +int convertContrastOrSaturation(const float v)\n> {\n> \treturn std::clamp(std::lround(v * 128), 0, 255);\n> }\n> @@ -80,8 +75,8 @@ int ColorProcessing::configure([[maybe_unused]] IPAContext &context,\n> \tauto &cproc = context.activeState.cproc;\n> \n> \tcproc.brightness = convertBrightness(kDefaultBrightness);\n> -\tcproc.contrast = convertContrast(kDefaultContrast);\n> -\tcproc.saturation = convertSaturation(kDefaultSaturation);\n> +\tcproc.contrast = convertContrastOrSaturation(kDefaultContrast);\n> +\tcproc.saturation = convertContrastOrSaturation(kDefaultSaturation);\n> \n> \treturn 0;\n> }\n> @@ -113,7 +108,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> \n> \tconst auto &contrast = controls.get(controls::Contrast);\n> \tif (contrast) {\n> -\t\tint value = convertContrast(*contrast);\n> +\t\tint value = convertContrastOrSaturation(*contrast);\n> \t\tif (cproc.contrast != value) {\n> \t\t\tcproc.contrast = value;\n> \t\t\tupdate = true;\n> @@ -124,7 +119,7 @@ void ColorProcessing::queueRequest(IPAContext &context,\n> \n> \tconst auto saturation = controls.get(controls::Saturation);\n> \tif (saturation) {\n> -\t\tint value = convertSaturation(*saturation);\n> +\t\tint value = convertContrastOrSaturation(*saturation);\n> \t\tif (cproc.saturation != value) {\n> \t\t\tcproc.saturation = value;\n> \t\t\tupdate = true;","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 617F7C3237\n\tfor ;\n\tThu, 13 Jun 2024 11:00:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 183C765492;\n\tThu, 13 Jun 2024 13:00:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AAC576548B\n\tfor ;\n\tThu, 13 Jun 2024 13:00:26 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9E9834CC;\n\tThu, 13 Jun 2024 13:00:12 +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=\"TkWYe5G3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718276412;\n\tbh=/WIwYXuyM3Lu8YRzxTxqzql9T1cceg90KQ/kR1fgnyg=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=TkWYe5G3SvM6bQt7w2bDWvBUHuM9ArEEpPMqZfyJJ1AmXTXayaV426aYzHUPItD6A\n\tXEzcHQF7Zt7ZumBJ9sQSpwh2x+18sYYFScjCOWPapW39WVsYbCj2+IGFtm4Gl2ejS3\n\tiSYs8P2PbY6ffr9kWQJ+TzRSek+XKO4y/R1kY05c=","Date":"Thu, 13 Jun 2024 14:00:05 +0300","From":"Laurent Pinchart ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 2/3] ipa: rkisp1: cproc: Merge identical functions","Message-ID":"<20240613110005.GC6019@pendragon.ideasonboard.com>","References":"<20240613083533.855791-1-stefan.klug@ideasonboard.com>\n\t<20240613083533.855791-3-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240613083533.855791-3-stefan.klug@ideasonboard.com>","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\" "}}]