From patchwork Mon Nov 24 16:43:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25160 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6855AC32E0 for ; Mon, 24 Nov 2025 16:44:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 24FA460AA3; Mon, 24 Nov 2025 17:44:07 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="CWJJyPRf"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 09FC2609D8 for ; Mon, 24 Nov 2025 17:44:03 +0100 (CET) Received: from [192.168.0.172] (mob-5-90-137-64.net.vodafone.it [5.90.137.64]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 79E3A89A; Mon, 24 Nov 2025 17:41:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764002514; bh=/jgi03kwOB2Diz1vMtFCxvsoo6nJ3veEckzUP+RsrR0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CWJJyPRfl31aL2hmx+tepFymzAKjmx4PYq4/ghp6hAMVav2nlCynOVws1H8qq4B1Z vzAaUHIzBcSngQPGlISqopPlIg10soig5UDrYQ7DvTTn0Com7y/wB6qy41VeWSY6sZ 4Nw8SA9ROpowfg6WDZyy2X1F9e6eWIZJBQzJz638= From: Jacopo Mondi Date: Mon, 24 Nov 2025 17:43:44 +0100 Subject: [PATCH 1/2] apps: cam: Do not override Request::controls() MIME-Version: 1.0 Message-Id: <20251124-cam-control-override-v1-1-dfc3a2f3feee@ideasonboard.com> References: <20251124-cam-control-override-v1-0-dfc3a2f3feee@ideasonboard.com> In-Reply-To: <20251124-cam-control-override-v1-0-dfc3a2f3feee@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1338; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=/jgi03kwOB2Diz1vMtFCxvsoo6nJ3veEckzUP+RsrR0=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpJItRAHPCKlwuxle5BLWndo+k5LywG1VSlwDdG 9YFstf3wbSJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaSSLUQAKCRByNAaPFqFW PIU9D/sEzg+bvC3pp8ZfwmTDhKSFKruzsLin/DVE90B84U+Rqwy68RG2GAsdaqTII/DRGd6GIWX oWrvwD8QRhfZZ6hlDmvsFuWHX/eV+8eK3orz40UHaHN1S79lDbS+3vuDIwMJLJq5nq+MEOX/8u0 6OuiiuoXpU4UbB54JrVH6sAYp3fQvgMTVrU011I1qmfRt+pq1EcaxvREHfoyx60pfl7Hu3Ow9Mn HzEQ0VhW+HZeUr8zqtvNHIntodHwV9EFXKio6dfWJPphMXZWvcFitnfxJxJeS/5P/TzxpQXVPBS WM9SENeU7Fh+nRQYa4HR7ztvZzA0VqtUbgOq+mfm/cnbp80oy4Povt3OcU8odYbuHd7RVS6xjva PtZTK8y6+AKhgfEUgSElFWmncTe1a9BpPSwN5m/6EsCE4wpwHK7CJ0+qE+blY9T1QkSzC/ZN9Hc q38a9O0OLxMhyHzTNVr2YANpoZXqsGGgBgyoQSG8a9uckc2QsGoDzvuzLiSHmVcxHPbKdftONdF SI5WvY3ukJYHkQEtaZYw/R3pqCmbURxrEwbSYacv/hbq5YKrYYyb+FLWNuWq0wKFg0dKMzeGMT5 P4TXPJezW8HUJQjM1gwBbwatGAWDy2cBMq1+B1+9pWRhdHDy/4bZ7GSV6DL63wpfltwJwA3nh8a pymIoDkNpQYELZQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The ControlList associated with a Request are created with the libcamera::controls::controls id map. The cam application, when parsing controls from a script assigns to the Request's control list a newly created one, which is initialized without a valid idmap or info map. This causes IPA that run in isolated mode to fail, as the IPC serialization/deserialization code requires all ControlList to have a valid idmap or info map associated. Instead of overwriting the Request::controls() list, merge it with the one created by cam when parsing the capture script. Closes: https://gitlab.freedesktop.org/camera/libcamera/-/issues/295 Signed-off-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- src/apps/cam/camera_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 1596a25a3abed9c2d93e6657b92e35fdfd3d1a26..0a24b7fafc5333f88053cb52a500cdafd7bb603f 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -447,7 +447,7 @@ int CameraSession::queueRequest(Request *request) return 0; if (script_) - request->controls() = script_->frameControls(queueCount_); + request->controls().merge(script_->frameControls(queueCount_)); queueCount_++; From patchwork Mon Nov 24 16:43:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 25161 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 4C992C32E0 for ; Mon, 24 Nov 2025 16:44:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6EFAA60AA0; Mon, 24 Nov 2025 17:44:08 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="KJWryPhV"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4EF0B6096B for ; Mon, 24 Nov 2025 17:44:03 +0100 (CET) Received: from [192.168.0.172] (mob-5-90-137-64.net.vodafone.it [5.90.137.64]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F183A741; Mon, 24 Nov 2025 17:41:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1764002515; bh=8eacksoLZfbdsblQSHnU5IxlIkspfQtVL1lxhb/8/s8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KJWryPhVsbonqLFW2ZwC8ec15i/iJ3x1nuKL9NSJa7oYfKRoWyzVlH6VWsRBuHZ6W g/Ya1xO37ni9tmuI1iqod769tqPpTOMRPVqmoXb1GyCYh7ZPcI+FAOORI3ASupYkAw 9nRHjFw/oykw9/olMVyWsc1vvSLjj6X6KfKQWhYU= From: Jacopo Mondi Date: Mon, 24 Nov 2025 17:43:45 +0100 Subject: [PATCH RFC 2/2] libcamera: request: Create control list with Camera info map MIME-Version: 1.0 Message-Id: <20251124-cam-control-override-v1-2-dfc3a2f3feee@ideasonboard.com> References: <20251124-cam-control-override-v1-0-dfc3a2f3feee@ideasonboard.com> In-Reply-To: <20251124-cam-control-override-v1-0-dfc3a2f3feee@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Cc: Jacopo Mondi X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1499; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=8eacksoLZfbdsblQSHnU5IxlIkspfQtVL1lxhb/8/s8=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpJItRUKDJdtSgp+tfg5gIntrUOVmSTk8MbyScy Ldstmj5CkSJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCaSSLUQAKCRByNAaPFqFW PMJKEACFSBkXZBZKAINd3Oy11PfStF/jswKUhqm/UHeaIBunohS65azeghvmddUxj7nttZffE6o fjJKn6tPJdLsp2x5bC2YZsqvT6QbmakoOvY1NawgOI/ankJuhlHxRfXAfvKV8Ic4QraJ3b0RxS9 c9Ycy6ZAa+utEiX9oOc9tVvR8pwfg1tpWCnm8TceEjpgsRi/3ZUZFLqgEqwa/jOAjGFxiX4y46d rW8wkX8GluRDjHcT7hSz3Ts/TXvcSEsurKTX6y/ZsgALK8ZNRRMZwKSekX3GFJfxDtTerpuJHsL penoUcpZTI9bUF/PNQ4D3USjlNQ82uufHxwW8TjbeeOHetXIRDM+FCmrLfrf3fdJabu0P1R1ot6 /HtAT0nyDxUy5PaFBJ9sFU1zeCxZgAhhLUJfBj2kbIKbhaGm27WQmh/MQLiB7HNLCo88rScePts vlLul1thVUlamr4LhAdZWlT7B8H1OnHWmIHx2liSgHrLLr28aAVVI+XSszPD5MIQfZnj/TqTh5e 6zlQWT4Tbq2Eq75SuOBDxRRdksirzSzBR16K8vx7kJ5PsEId9tI9vgvmAz+igiwnVOsqa8uZ/jZ KEmSyWLPpwcRtZtdzqNvjYPpqKlAXTC0mTm2vErFzFd4bnPJaVWI4Wi0nhAQfJHJhB/hwxTAG1U chnd1s2eye6nTNw== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The control lists associated with a Request is created with the global libcamera::controls::controls id map. This is fine as the idmap/info map used to contruct a ControlList are not used for any control validation purposes by the libcamera code. However creating a ControlList with the camera ControlInfoMap has two advantages: 1) The idmap can be extracted from the info map, but not the other way around 2) The control list is constructed with a valid map of info to the controls it can actually supports, instead of the global map of libcamera controls Initialize the ControlList part of a Request with the Camera control info map, as the association between a Request and a Camera is permanent and valid for the whole lifetime of a Request. Signed-off-by: Jacopo Mondi --- src/libcamera/request.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 60565f5984971c7ab34e119a15b8141799f71071..2544a059f6984d930ec909c74e0b621c9fe82726 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -356,7 +356,7 @@ Request::Request(Camera *camera, uint64_t cookie) : Extensible(std::make_unique(camera)), cookie_(cookie), status_(RequestPending) { - controls_ = new ControlList(controls::controls, + controls_ = new ControlList(camera->controls(), camera->_d()->validator()); /**