{"id":18140,"url":"https://patchwork.libcamera.org/api/1.1/patches/18140/?format=json","web_url":"https://patchwork.libcamera.org/patch/18140/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20230119084112.20564-2-dse@thaumatec.com>","date":"2023-01-19T08:41:05","name":"[libcamera-devel,v3,1/8] rkisp1: Add camera lens to PH and expose it to the IPA","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"eccd09cb85780b8a8c7ce2465fe969630f7a8bb0","submitter":{"id":126,"url":"https://patchwork.libcamera.org/api/1.1/people/126/?format=json","name":"Daniel Semkowicz","email":"dse@thaumatec.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18140/mbox/","series":[{"id":3714,"url":"https://patchwork.libcamera.org/api/1.1/series/3714/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3714","date":"2023-01-19T08:41:04","name":"ipa: rkisp1: Add autofocus algorithm","version":3,"mbox":"https://patchwork.libcamera.org/series/3714/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18140/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18140/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 183BCC3240\n\tfor ;\n\tThu, 19 Jan 2023 08:42:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C268E625E3;\n\tThu, 19 Jan 2023 09:42:09 +0100 (CET)","from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n\t[IPv6:2a00:1450:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0667F61EFC\n\tfor ;\n\tThu, 19 Jan 2023 09:42:08 +0100 (CET)","by mail-wm1-x333.google.com with SMTP id\n\tfl11-20020a05600c0b8b00b003daf72fc844so3065354wmb.0\n\tfor ;\n\tThu, 19 Jan 2023 00:42:08 -0800 (PST)","from localhost.localdomain (ip092042140082.rev.nessus.at.\n\t[92.42.140.82]) by smtp.gmail.com with ESMTPSA id\n\tj10-20020a05600c074a00b003db0ee277b2sm3935754wmn.5.2023.01.19.00.42.06\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 19 Jan 2023 00:42:07 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1674117729;\n\tbh=wiJDd7y1fycJxQBDca5N59hZkPVi42l9UKQoTsqJ2Hg=;\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=fHU/KwxI1OmStEXXi6XaSZEx7y7sA4HmHwGB3NolQR+mAfYEKwnUhQGMZ5sOct01p\n\tqKSQ4HEwkDkXpqZQTXOOvbOqH4zThjYUId5sIUvQfnc/HIAvX5DEoD5Ht2A5AQvP7I\n\tdxHwXHruhmn4Vvrz1ZEDtER0kQy6mwZ+Ho8P7kbhI3VTNnLdM8Rt/DZmtNjUnRfS+q\n\tbB95UZ8RANWuwVKn22MSzLB4d5GkwkWXwLxZBw3hbEs7QuQ861NNXuwh9PyUPyv+6K\n\tI77rwm0Szpo50LA0SvATXeH5dxjdPPnvXami9OIfAB/MIjNMlXjSkUWarL1wv/RD9C\n\tn4rVXW5/5b9tw==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=thaumatec-com.20210112.gappssmtp.com; s=20210112;\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=e7gmClNwwbQ5j37r/NYsnEON5vAdMEldk/3IHa6ctl4=;\n\tb=katmaffj+oTS0pfQf7rYfNgFP7mcc7Dkla3H1fa1KZ87Bs4vpQInfQnh5gupLh2eWJ\n\tTPCmiYWmHtcSww4WpQ7d1Ip19W7ykwbR/4QsESpxuvTCcoLBmE872HiFgU0QvRILdzdk\n\ttdHJKCn0xQdVauntuwyciFcs15dZj30qOP5W0YFKV/+h+otAjcW7EsLYIKIKht/aFa3J\n\t4JVkFIY2N0rpQ5gbkrVV0dDBpa2nR7KP+nMVObvB+eSq3XULCMD/D6x2tZO0CU3Xp4Ff\n\t5mtTLoZJEN8NN61IqKcu65aABLvXIvl8cCF+2TK4kc1fV5Yw/VBUaJHYCKu5SW3+AaC7\n\tteuw=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected)\n\theader.d=thaumatec-com.20210112.gappssmtp.com\n\theader.i=@thaumatec-com.20210112.gappssmtp.com header.b=\"katmaffj\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\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=e7gmClNwwbQ5j37r/NYsnEON5vAdMEldk/3IHa6ctl4=;\n\tb=kw1AJb1OfPmsDA4Ba5m4SAS/s1iVB7LAEUzluyH0Fi8vADnJ/COHki6TBOicmTkftr\n\tF0mr+0x9GEPmXxFjeW2ZZDbe2E48q2ehSQcaJb/NRPPsz3q3PMMtyhPPV15Jlm62nhDG\n\t8lIo5WuVcV67j4PUyoUHqCo3vA5ZM33hgpi80bIozZaouDWhdQQqVVRyRBmbedrM/llO\n\t65Fw92+wLgV23aZmljXE/lFBNhhqp4ad1Yh7eDTmgF8sP2K98GNyEDAVFF2ZaVqwsDNo\n\tirUvocR+arP6dPzMTcZdklKVE0XAJBNl22cj8y7872WOGJ7Re55EYa2Vs4Y6bMdHVKEr\n\tGNfQ==","X-Gm-Message-State":"AFqh2kqDlWW0+4JuL1CMBDho7np8TxrNCqvsqkDmCp3pfgiJA2aOyEk6\n\tx98aYggM6EKcqYe0F/YiRaHST3o1iqGVE7riTzs=","X-Google-Smtp-Source":"AMrXdXtgfMtfQ1RJ0yYQTVE/8MTFole2zvm8W393kIIDzo0+x/plubGdX1XncLDMlcPZ4gyOtvemIg==","X-Received":"by 2002:a05:600c:601c:b0:3d3:4f56:62e1 with SMTP id\n\taz28-20020a05600c601c00b003d34f5662e1mr9390438wmb.27.1674117727760; \n\tThu, 19 Jan 2023 00:42:07 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 19 Jan 2023 09:41:05 +0100","Message-Id":"<20230119084112.20564-2-dse@thaumatec.com>","X-Mailer":"git-send-email 2.39.0","In-Reply-To":"<20230119084112.20564-1-dse@thaumatec.com>","References":"<20230119084112.20564-1-dse@thaumatec.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/8] rkisp1: Add camera lens to PH and\n\texpose it to the IPA","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":"Daniel Semkowicz via libcamera-devel\n\t","Reply-To":"Daniel Semkowicz ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Check in pipeline handler if camera lens exists, add expose its controls\nto the IPA.\n\nSigned-off-by: Daniel Semkowicz \n---\n include/libcamera/ipa/rkisp1.mojom | 1 +\n src/ipa/rkisp1/rkisp1.cpp | 5 +++++\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +++++\n 3 files changed, 11 insertions(+)","diff":"diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\nindex 1009e970..bf6e9141 100644\n--- a/include/libcamera/ipa/rkisp1.mojom\n+++ b/include/libcamera/ipa/rkisp1.mojom\n@@ -11,6 +11,7 @@ import \"include/libcamera/ipa/core.mojom\";\n struct IPAConfigInfo {\n \tlibcamera.IPACameraSensorInfo sensorInfo;\n \tlibcamera.ControlInfoMap sensorControls;\n+\tlibcamera.ControlInfoMap lensControls;\n };\n \n interface IPARkISP1Interface {\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 6544c925..9e861fc0 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -7,6 +7,7 @@\n \n #include \n #include \n+#include \n #include \n #include \n #include \n@@ -80,6 +81,7 @@ private:\n \tstd::map mappedBuffers_;\n \n \tControlInfoMap sensorControls_;\n+\tstd::optional lensControls_;\n \n \t/* revision-specific data */\n \trkisp1_cif_isp_version hwRevision_;\n@@ -215,6 +217,9 @@ int IPARkISP1::configure(const IPAConfigInfo &ipaConfig,\n {\n \tsensorControls_ = ipaConfig.sensorControls;\n \n+\tif (!ipaConfig.lensControls.empty())\n+\t\tlensControls_ = ipaConfig.lensControls;\n+\n \tconst auto itExp = sensorControls_.find(V4L2_CID_EXPOSURE);\n \tint32_t minExposure = itExp->second.min().get();\n \tint32_t maxExposure = itExp->second.max().get();\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 5bdb4d25..0559d261 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -31,6 +31,7 @@\n #include \n \n #include \"libcamera/internal/camera.h\"\n+#include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/delayed_controls.h\"\n #include \"libcamera/internal/device_enumerator.h\"\n@@ -807,6 +808,10 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \n \tipaConfig.sensorControls = data->sensor_->controls();\n \n+\tCameraLens *lens = data->sensor_->focusLens();\n+\tif (lens)\n+\t\tipaConfig.lensControls = lens->controls();\n+\n \tret = data->ipa_->configure(ipaConfig, streamConfig, &data->controlInfo_);\n \tif (ret) {\n \t\tLOG(RkISP1, Error) << \"failed configuring IPA (\" << ret << \")\";\n","prefixes":["libcamera-devel","v3","1/8"]}