From patchwork Fri Nov 20 14:09:13 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Advait Dhamorikar X-Patchwork-Id: 29062 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 9E574C3355 for ; Fri, 20 Nov 2026 14:16:02 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C883D6A936; Fri, 20 Nov 2026 15:16:01 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=mechasystems.com header.i=@mechasystems.com header.b="aZr3hzr4"; dkim-atps=neutral Received: from mail-dl1-x122b.google.com (mail-dl1-x122b.google.com [IPv6:2607:f8b0:4864:20::122b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3B9046A936 for ; Fri, 20 Nov 2026 15:09:21 +0100 (CET) Received: by mail-dl1-x122b.google.com with SMTP id a92af1059eb24-15dd124bbe7so2010661c88.1 for ; Fri, 20 Nov 2026 06:09:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mechasystems.com; s=google; t=1795183759; x=1795788559; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=NgfBDQBeBdtjcrDbv5Ru7L/t8ENph9ONMcLDWrJ/L6k=; b=aZr3hzr4Zr3QR079KXL35Cs03a1gpG02QQAB5yhxTu9oJMwuVROdfkUjEc6P2I2yHK Pwdsvub4G4Rp4VIIT+sjhfK3pwisEPxC4ZA66HcxugLXgim85jm/B3KAHpLGehE1btBE 1RvXIKF5EZ8IWayJrF2SDbmm0fmPnGpsuMR0ZQU2x2s5G+pnu2gjatIXd402GEFvEaLr aU1syxz0BegXnTc1lc7XD6ugyZU2ZfhDGtu/IV+lo/0t5cvY4dw2Y2FOFaN2i3zQtdMJ U2frojkIc8LSNj3nSFcJTsB4yswFkEM0KYbQ+aSeTdxqH9/YeU5j1HZS8i6Hlg7YlsPz rXcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795183759; x=1795788559; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=NgfBDQBeBdtjcrDbv5Ru7L/t8ENph9ONMcLDWrJ/L6k=; b=dM0iNGaTKzWfJnyh68EHhpDLq0KugoOsrsyL3u5FfcpUtyaMIcJgl/9o/rto8y5eoc tXncmj1W8cMCvpSQrNLPedzZRM9feOPrtwVHxsC4mtJTHQIOpGQLZS/v6aMQ3+twMhK/ qSdzfrn7EBsMXKtn1sRqACo43rXQA7B929quleESntCRyHDYDwOz6P1uTBl80woUr57c EdesvCS42UvNESbK6tJn9nmPhbanBd9IYE8R9v5dxJJNeG5gPntA0cKXjxMjPFiclTm+ M25qEq1dMLw6T8pp0qL4YzyjBQ0fZUMP/2xmAzHz3Dm1UZYAIeYFTfsANwZi89CT11hk L+Wg== X-Gm-Message-State: APuU4Z8s+6sNFirAJggSbZUMXyTKusu3AqF5qUiq9+ouOkdtUXi2NPtD smOJZCaWLW5+5o7mTqiR/ubZKH/WwzOwry4MWpr14gY3X1iPRT5Sz+0n4fNF6kDEIbKIBKuXZq6 n6jaQIDc= X-Gm-Gg: AZFdTZcwGA3g1Rf/X2NcXbBweVneMSt7UtpcqjAtdx3UVD+NfW7jERI9nG3GCyEJUHP uZ+HehYfE2m/tQ8J9AtzdvB4WkKO1SxmuTPgLqjUG6WB1ABLBaCTJvTzuZNhGOvB8XJoMAuzVTO ol/BUn/+KY5pKuDzloKPcbDdE9F1tuamEnTjm7E0fEScH+ewj9jUAE9S1PaH8Tj8ABKa6ZZ3eEc Wj513wPc3a1OHDnhK5Gd50OdXEcLyZavH2wWfVwi/Nt9xyYRRNTd620Wo5AlV1+JpshqEoA9AmO CRi4q1Rd4UL9DCYyqtnJZ8K8Naw/yeDAA8Oy7drocrUHyVd6EqaSuj44qBJnAayH+m59VQ5v9Y1 6N+dZgbI/oY8JmSMzsa2VgD2g3j7ohH7XssO3sw4Q0zwyS4IE7CQAVkTaAbwU0p/V8h80QW9HYT FICZFkbXugAX5R7dpYUfMgPdHi+xZnYB10OqDNNzG2PRZhixNnH6xpK6qwMBZ60spU4WKe6DW7A LctD/Y4xfBCsg3vH0h8TEju+EMjBODDwaw5I/A5G/UDAHiWHUYw3wKuoryiT7yc9aXmtxzk/72C 1cjGHtnXRUqm0vbchMUTKXzHqxgPGLOO4nBq8W4= X-Received: by 2002:a05:7301:53c3:b0:380:f8fd:d19b with SMTP id 5a478bee46e88-3856fb693d7mr3357180eec.38.1795183758731; Fri, 20 Nov 2026 06:09:18 -0800 (PST) Received: from fedora.taild9c4b8.ts.net ([2a09:bac5:3b6c:1aa0::2a7:64]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-385665f21aesm11391036eec.4.2026.11.20.06.09.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2026 06:09:18 -0800 (PST) From: Advait Dhamorikar To: libcamera-devel@lists.libcamera.org Cc: Advait Dhamorikar Subject: [PATCH] pipeline: rkisp1: Forward controls passed to start() to the IPA Date: Fri, 20 Nov 2026 19:39:13 +0530 Message-ID: <20261120140913.35315-1-advaitd@mechasystems.com> X-Mailer: git-send-email 2.56.1 MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 20 Nov 2026 15:15:59 +0100 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 rkisp1 pipeline handler applies the controls passed to Camera::start() to the dewarper, but doesn't forward them to the IPA. Controls handled by the IPA are thus ignored when set at start time. For instance, the libcamerasrc GStreamer element sets FrameDurationLimits from the negotiated caps framerate as a start control, so requesting a framerate other than the default doesn't change the frame rate. On an i.MX8MP with an IMX219 sensor, requesting framerate=60/1 through libcamerasrc results in a 30 fps capture, while setting the same FrameDurationLimits on the first request with cam results in 60 fps. Store the start controls and merge them into the controls of the first request queued to the IPA. Controls explicitly set in that request take precedence. The application's Request is left unmodified. Signed-off-by: Advait Dhamorikar --- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 25 ++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 39fe0f09..741e4e96 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -119,6 +119,7 @@ public: std::unique_ptr ipa_; + ControlList startControls_; ControlInfoMap ipaControls_; /* @@ -1229,7 +1230,7 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera) return 0; } -int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlList *controls) +int PipelineHandlerRkISP1::start(Camera *camera, const ControlList *controls) { RkISP1CameraData *data = cameraData(camera); utils::ScopeExitActions actions; @@ -1250,6 +1251,9 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL actions += [&]() { data->ipa_->stop(); }; data->frame_ = 0; + data->startControls_.clear(); + if (controls) + data->startControls_ = *controls; if (!isRaw_) { ret = param_->streamOn(); @@ -1346,7 +1350,24 @@ int PipelineHandlerRkISP1::queueRequestDevice(Camera *camera, Request *request) if (!info) return -ENOENT; - data->ipa_->queueRequest(data->frame_, request->controls()); + if (!data->startControls_.empty()) { + /* + * Apply the controls passed to Camera::start() with the first + * request. Controls explicitly set in the request take + * precedence. The application's request is left unmodified. + */ + ControlList controls = request->controls(); + for (const auto &[id, value] : data->startControls_) { + if (!controls.contains(id)) + controls.set(id, value); + } + data->startControls_.clear(); + + data->ipa_->queueRequest(data->frame_, controls); + } else { + data->ipa_->queueRequest(data->frame_, request->controls()); + } + if (isRaw_) { if (info->mainPathBuffer) data->mainPath_->queueBuffer(info->mainPathBuffer);