{"id":18705,"url":"https://patchwork.libcamera.org/api/patches/18705/?format=json","web_url":"https://patchwork.libcamera.org/patch/18705/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20230605091406.31757-3-naush@raspberrypi.com>","date":"2023-06-05T09:14:05","name":"[libcamera-devel,v3,2/3] pipeline: ipa: rpi: Return lens controls from ipa->configure()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2642a0eeeed886632547db3cf9091c4198f7f98d","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18705/mbox/","series":[{"id":3907,"url":"https://patchwork.libcamera.org/api/series/3907/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3907","date":"2023-06-05T09:14:03","name":"Default lens behaviour","version":3,"mbox":"https://patchwork.libcamera.org/series/3907/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18705/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18705/checks/","tags":{},"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 3F0B5C31E9\n\tfor ;\n\tMon, 5 Jun 2023 09:14:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 26B5362891;\n\tMon, 5 Jun 2023 11:14:51 +0200 (CEST)","from mail-lf1-x136.google.com (mail-lf1-x136.google.com\n\t[IPv6:2a00:1450:4864:20::136])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7DBB362880\n\tfor ;\n\tMon, 5 Jun 2023 11:14:48 +0200 (CEST)","by mail-lf1-x136.google.com with SMTP id\n\t2adb3069b0e04-4f3ba703b67so5541731e87.1\n\tfor ;\n\tMon, 05 Jun 2023 02:14:48 -0700 (PDT)","from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tz16-20020a7bc7d0000000b003f605814850sm13776369wmk.37.2023.06.05.02.14.46\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 05 Jun 2023 02:14:46 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1685956491;\n\tbh=Po+0B6OoR7x5A87nVYWv4E8Qv65qNKo51f4QNhZTqPk=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=wYjTlo4afxp9zJvhcJbMGbESQBlLJ/ZQBd3rADEuZZesMuDhzZsam/8D6SkmNOZQH\n\taDvt7TkBtN2MEYKG+9/8geAezx207K+nJe9m9QJcEBTl/g0sCOJK6tzozQUEEge1yM\n\tzEd+zzf3XVu0lcdBIltu2kBiyuApKehKNwp3aoiN6WyI7f2ebPTaUeRifLJmle0yeY\n\t6kVcyA0z8Jk2uWyxL9e+jziURKK2awdlACGgmfG20xE0V+9//lhZKZ2XA3JGv0QFnK\n\teDLHvolTvBsbxg/dkjKRV6xHZ2r1cUCpxaEdhN1drbxtxD/RD36tneZBWfCk0d+Y0I\n\tW/pmFBzf+Nh4g==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1685956487; x=1688548487;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=5zZra2t06WVGkK/lCB01lQuXNNeuoe7W189Tj55Iz0A=;\n\tb=qRU0nQ5G0pnolaiQTWPuDji/D27zediNQl+xa8s6tyWo6AVPv4LNM7GPFw5/rMAqAp\n\t4qs4tlSTReI4ij/5S+JZhMy2v7AR+RhMvQvy2FhxW6IbypVJPptAo+ZeXUhQOo9qLBcq\n\tTq2IxAJNNvjPiU2L4wnKGNHLiVJIS2ZAoCzFD5sTSEtCl9kXWvXEhPfhcYzHjpqCn/gn\n\tLSqVwdWdNo0OQNPkMvABgyLdlzPsIHmS5Mpi6HLzGhn2x93BxP7f9sAcs/0A4BL6xclz\n\t4ZRrcoRUgJrbDCQ+bo874BkQEudnuQCaZyEQ31fBuLFGXRjDQxuDLMJMvlmYF6VVsSiH\n\tZ2Tw=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"qRU0nQ5G\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1685956487; x=1688548487;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=5zZra2t06WVGkK/lCB01lQuXNNeuoe7W189Tj55Iz0A=;\n\tb=SpwOgXh78GTKtb5eHL4kd9zaa/sLlZ7BpmaIB5v5IcLbVppRClN+94bnvq15QnZWHc\n\tWA04hxCFyEeRkkVD+xkzwM/gtPOPkrRz2/asbD4hvawf74tPEE2Bkmg5eFcpmUKlHoek\n\tg95WZiXs5SKX83+zr9EgamLrDTC3j9MHa+66FW6nUbTutInQnMW+az4uAmybzVCjpQZM\n\txm0Qtf0/QNkPtjQJTkxVsQk9/+0TMit+niErziDolsxonO5XIRKabXz8UzSnWe7aTVGE\n\t0GPYw+dfssMHr9WAGvSZxgX84pCVMx1ory/uePFgGZuDqXaFLVwnsJ7VjITGH2awjxJg\n\tYMRw==","X-Gm-Message-State":"AC+VfDy2OCXJk1MJoYdgvVgp5u7Ywy47XnE3SnNfyUBS33gD5P6NVteT\n\te8yvsvpNYvDrXBdk4d2XU21YdMI1tlOoUGFXoULpyw==","X-Google-Smtp-Source":"ACHHUZ4ntxF5SQT7TEbaocioUQaeycmwK5vBnzuDhs1lt54p/Zb+6TBK/0wY+C1qPewvr92+GLU+GQ==","X-Received":"by 2002:a05:6512:6e:b0:4f6:259d:3d42 with SMTP id\n\ti14-20020a056512006e00b004f6259d3d42mr1363718lfo.3.1685956487340; \n\tMon, 05 Jun 2023 02:14:47 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Jun 2023 10:14:05 +0100","Message-Id":"<20230605091406.31757-3-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20230605091406.31757-1-naush@raspberrypi.com>","References":"<20230605091406.31757-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 2/3] pipeline: ipa: rpi: Return lens\n\tcontrols from ipa->configure()","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In addition to sensor controls, return lens controls from\nIpaBase::configure() back to the pipeline handler. If there are lens\ncontrols present in the ControlList, action them in the pipeline handler\nas part of the configure routine.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/ipa/raspberrypi.mojom | 3 ++-\n src/ipa/rpi/common/ipa_base.cpp | 2 +-\n src/libcamera/pipeline/rpi/common/pipeline_base.cpp | 6 ++++--\n 3 files changed, 7 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex ba786e647ca1..4f20792e4679 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -46,7 +46,8 @@ struct ConfigParams {\n struct ConfigResult {\n \tfloat modeSensitivity;\n \tlibcamera.ControlInfoMap controlInfo;\n-\tlibcamera.ControlList controls;\n+\tlibcamera.ControlList sensorControls;\n+\tlibcamera.ControlList lensControls;\n };\n \n struct StartResult {\ndiff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp\nindex db7a0eb3a1ca..599ad146a863 100644\n--- a/src/ipa/rpi/common/ipa_base.cpp\n+++ b/src/ipa/rpi/common/ipa_base.cpp\n@@ -201,7 +201,7 @@ int32_t IpaBase::configure(const IPACameraSensorInfo &sensorInfo, const ConfigPa\n \t\tapplyAGC(&agcStatus, ctrls);\n \t}\n \n-\tresult->controls = std::move(ctrls);\n+\tresult->sensorControls = std::move(ctrls);\n \n \t/*\n \t * Apply the correct limits to the exposure, gain and frame duration controls\ndiff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 3bb5ec531e4f..2ab0b971149a 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -1192,8 +1192,10 @@ int CameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::Config\n \t\treturn -EPIPE;\n \t}\n \n-\tif (!result->controls.empty())\n-\t\tsetSensorControls(result->controls);\n+\tif (!result->sensorControls.empty())\n+\t\tsetSensorControls(result->sensorControls);\n+\tif (!result->lensControls.empty())\n+\t\tsetLensControls(result->lensControls);\n \n \treturn 0;\n }\n","prefixes":["libcamera-devel","v3","2/3"]}