[{"id":37906,"web_url":"https://patchwork.libcamera.org/comment/37906/","msgid":"","date":"2026-01-23T12:22:04","subject":"Re: [PATCH 2/2] ipa: ipu3: Retain Camera::controls() after\n\tipa->configure()","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2026. 01. 22. 18:48 keltezéssel, Jacopo Mondi írta:\n> Similar to what commit acfd60276763 (\"ipa: rkisp1: Fix algorithm controls\n> vanish after configure\") did for the RkISP1 IPA, replace the usage of\n> unordered_map::merge() at updateControls() time with\n> unordered_map::insert().\n> \n> As unordered_map::merge moves items from the source map, it deletes\n> controls registered at algorithms initialization time in the\n> ipaContext.ctrlMap. As at configure() time updateControls() is called\n> again and the list of Camera controls is refreshed, the controls\n> registered at algorithms initialization time are lost.\n> \n> Fixes: 87353f2bba28 (\"ipa: ipu3: Derive ipu3::algorithms::Agc from AgcMeanLuminance\")\n> Signed-off-by: Jacopo Mondi \n> ---\n\nLooks ok to me.\n\nReviewed-by: Barnabás Pőcze \n\n\n> src/ipa/ipu3/ipu3.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index b926f579a9a3..03d873f2c74f 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -285,7 +285,7 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,\n> \t\t\t\t\t\t\t frameDurations[1],\n> \t\t\t\t\t\t\t Span{ { frameDurations[2], frameDurations[2] } });\n> \n> -\tcontrols.merge(context_.ctrlMap);\n> +\tcontrols.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n> \t*ipaControls = ControlInfoMap(std::move(controls), controls::controls);\n> }\n> \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 BD996C3220\n\tfor ;\n\tFri, 23 Jan 2026 12:22:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7349F615B2;\n\tFri, 23 Jan 2026 13:22:08 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CD20561FBB\n\tfor ;\n\tFri, 23 Jan 2026 13:22:06 +0100 (CET)","from [192.168.33.29] (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 706C314C7;\n\tFri, 23 Jan 2026 13:21:33 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"U5Yed2XZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769170893;\n\tbh=tkzLIvugUG0THDq65tuv+Ng6NPtlZIwLSkWTzVbRBpc=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=U5Yed2XZWdfBfg0k1LLdlnuZlcgKIeUqEdRWnya6VhbR+EIPy7u1sezPE7FsXEtp2\n\tzcM1NM7SZmRCngzvLmvQsI8vowxxoG8DOoE10nd7CDMHzVp+1s8L8zxZP5DUvUoORN\n\td861hKiOfGA5u7/WKXQsE0fFK78oZz6gV8+hIaHA=","Message-ID":"","Date":"Fri, 23 Jan 2026 13:22:04 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 2/2] ipa: ipu3: Retain Camera::controls() after\n\tipa->configure()","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20260122-ipa-controls-v1-0-b8c4c345f7ae@ideasonboard.com>\n\t<20260122-ipa-controls-v1-2-b8c4c345f7ae@ideasonboard.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20260122-ipa-controls-v1-2-b8c4c345f7ae@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","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":37921,"web_url":"https://patchwork.libcamera.org/comment/37921/","msgid":"<176918200838.1693075.2604906850769153684@ping.linuxembedded.co.uk>","date":"2026-01-23T15:26:48","subject":"Re: [PATCH 2/2] ipa: ipu3: Retain Camera::controls() after\n\tipa->configure()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jacopo Mondi (2026-01-22 17:48:29)\n> Similar to what commit acfd60276763 (\"ipa: rkisp1: Fix algorithm controls\n> vanish after configure\") did for the RkISP1 IPA, replace the usage of\n> unordered_map::merge() at updateControls() time with\n> unordered_map::insert().\n> \n> As unordered_map::merge moves items from the source map, it deletes\n> controls registered at algorithms initialization time in the\n> ipaContext.ctrlMap. As at configure() time updateControls() is called\n> again and the list of Camera controls is refreshed, the controls\n> registered at algorithms initialization time are lost.\n> \n> Fixes: 87353f2bba28 (\"ipa: ipu3: Derive ipu3::algorithms::Agc from AgcMeanLuminance\")\n> Signed-off-by: Jacopo Mondi \n\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/ipu3/ipu3.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index b926f579a9a3..03d873f2c74f 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -285,7 +285,7 @@ void IPAIPU3::updateControls(const IPACameraSensorInfo &sensorInfo,\n> frameDurations[1],\n> Span{ { frameDurations[2], frameDurations[2] } });\n> \n> - controls.merge(context_.ctrlMap);\n> + controls.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n> *ipaControls = ControlInfoMap(std::move(controls), controls::controls);\n> }\n> \n> \n> -- \n> 2.52.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 D745CC3220\n\tfor ;\n\tFri, 23 Jan 2026 15:26:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8FCBE61FC6;\n\tFri, 23 Jan 2026 16:26:52 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C702F615B2\n\tfor ;\n\tFri, 23 Jan 2026 16:26:51 +0100 (CET)","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 74DB09CE;\n\tFri, 23 Jan 2026 16:26:18 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"MRVJ7Qlq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769181978;\n\tbh=yCqBG80O9D2Zdc5LnFoEVMPInz3dPY0wHCQAB0RstfA=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=MRVJ7QlqESqbuO3k3XyQ2z3gWlCbqdENW1sq8xrHP2cZd0l0uPRT//Stkq7Fnv5TH\n\tbFgHPaFxoODEXdIlfZiIBB7qIulVe8HDx1KLxltd40MHxAjYhss4+YJLIQqo8+hmMK\n\t7rmRVb6eqPorSRoN7xPlk4zQklx64aiQLJWK4K8E=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20260122-ipa-controls-v1-2-b8c4c345f7ae@ideasonboard.com>","References":"<20260122-ipa-controls-v1-0-b8c4c345f7ae@ideasonboard.com>\n\t<20260122-ipa-controls-v1-2-b8c4c345f7ae@ideasonboard.com>","Subject":"Re: [PATCH 2/2] ipa: ipu3: Retain Camera::controls() after\n\tipa->configure()","From":"Kieran Bingham ","Cc":"Jacopo Mondi ","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 23 Jan 2026 15:26:48 +0000","Message-ID":"<176918200838.1693075.2604906850769153684@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}}]