Patch Detail
Show a patch.
GET /api/1.1/patches/20085/?format=api
{ "id": 20085, "url": "https://patchwork.libcamera.org/api/1.1/patches/20085/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20085/", "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": "<20240522145438.436688-4-stefan.klug@ideasonboard.com>", "date": "2024-05-22T14:54:37", "name": "[v2,3/4] ipa: rkisp1: Fix algorithm controls vanish after configure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "66be035ed7a64f7965d32d13a8b2361507ecc4c9", "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/20085/mbox/", "series": [ { "id": 4321, "url": "https://patchwork.libcamera.org/api/1.1/series/4321/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4321", "date": "2024-05-22T14:54:34", "name": "libcamera: Add gamma control for rkisp1", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4321/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20085/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20085/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 82E60BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 22 May 2024 14:55:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3C7E663490;\n\tWed, 22 May 2024 16:55:06 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BD8B463498\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 22 May 2024 16:55:03 +0200 (CEST)", "from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:9beb:c30d:4413:8c99])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0950EABE;\n\tWed, 22 May 2024 16:54:51 +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=\"S9IdCRbs\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1716389691;\n\tbh=3T7KcnyzGHIwDuHiBmpx9YpR357ZPuNdJ+BWyCNw9hw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=S9IdCRbsDDpl4xdvGlu3AWxF7Iu8Jd3FMLsdzF9tK81+zpIoXc0B07crUOYrrUJGL\n\ty5yEsJLKhAoQrp8GhRN2cuIignKQ4B2g1koKgEkp4tV9PtofxAuZ3SLLDkEq/Zu8gC\n\t8lp3YUTotm4U7ezbomy1zBzh3ehadpRC9Pfk9QQU=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v2 3/4] ipa: rkisp1: Fix algorithm controls vanish after\n\tconfigure", "Date": "Wed, 22 May 2024 16:54:37 +0200", "Message-Id": "<20240522145438.436688-4-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.40.1", "In-Reply-To": "<20240522145438.436688-1-stefan.klug@ideasonboard.com>", "References": "<20240522145438.436688-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": "std::map::merge(source) has the side effect of actually moving items from\nsource to target. In this case the controls where removed from the source maps\non the first call to updateControls() and on the second call to\nupdateControls() they where missing in the source maps and therefore also\nremoved from the camera. Fix this by using insert() instead of merge(). This is\nmost likely cheaper than copy-contructing the source map.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/ipa/rkisp1/rkisp1.cpp | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)", "diff": "diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 6687c91e..17474408 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -427,7 +427,7 @@ void IPARkISP1::updateControls(const IPACameraSensorInfo &sensorInfo,\n \t\t\t\t\t\t\t frameDurations[1],\n \t\t\t\t\t\t\t frameDurations[2]);\n \n-\tctrlMap.merge(context_.ctrlMap);\n+\tctrlMap.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n \t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n }\n \n", "prefixes": [ "v2", "3/4" ] }