Patch Detail
Show a patch.
GET /api/1.1/patches/20286/?format=api
{ "id": 20286, "url": "https://patchwork.libcamera.org/api/1.1/patches/20286/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20286/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20240613083533.855791-3-stefan.klug@ideasonboard.com>", "date": "2024-06-13T08:33:19", "name": "[2/3] ipa: rkisp1: cproc: Merge identical functions", "commit_ref": "c2fad17ad083defede63d41b8b698f388f016fff", "pull_url": null, "state": "accepted", "archived": false, "hash": "5ba04766816c3d9de64226ce296b2800727ad728", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/1.1/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20286/mbox/", "series": [ { "id": 4387, "url": "https://patchwork.libcamera.org/api/1.1/series/4387/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4387", "date": "2024-06-13T08:33:17", "name": "ipa: rkisp1: cproc: Small fixes", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4387/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20286/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20286/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 A9D87C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 13 Jun 2024 08:36:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4534F65491;\n\tThu, 13 Jun 2024 10:36:42 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ADEFB6548B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 13 Jun 2024 10:36:40 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:3fed:9d83:54f9:6b93])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CBDF7BEB;\n\tThu, 13 Jun 2024 10:36:26 +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=\"WW5ubFTa\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1718267786;\n\tbh=eqfNOwYbtBMJh2BtlKNYOagP2VNXb1FXXBVyLCo7Q+s=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WW5ubFTa7oAkKkW5tiKQLJSK9XjRZ/PMcQhy3PPA/NS3p/8K/t0VOWvix7fzw5b/H\n\t7SLEQX+Sk8ZsuFqBZNTACjFKP7xp0bnypKUuhb83v7gNoLPD2sVC8wrvev3jOd3T9R\n\tNJcXJcNCYTNGC240B7uzaQ6sr8jB3CyIofcndNZ8=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH 2/3] ipa: rkisp1: cproc: Merge identical functions", "Date": "Thu, 13 Jun 2024 10:33:19 +0200", "Message-ID": "<20240613083533.855791-3-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240613083533.855791-1-stefan.klug@ideasonboard.com>", "References": "<20240613083533.855791-1-stefan.klug@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "convertContrast() and convertSaturation() are equal. Merge them into\none.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/cproc.cpp | 15 +++++----------\n 1 file changed, 5 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp\nindex 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<int>(std::lround(v * 128), -128, 127);\n }\n \n-int convertContrast(const float v)\n-{\n-\treturn std::clamp<int>(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<int>(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;\n", "prefixes": [ "2/3" ] }