{"id":18444,"url":"https://patchwork.libcamera.org/api/patches/18444/?format=json","web_url":"https://patchwork.libcamera.org/patch/18444/","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":"<20230324142908.64224-2-dse@thaumatec.com>","date":"2023-03-24T14:28:59","name":"[libcamera-devel,v5,01/10] rkisp1: Add camera lens to PH and expose it to the IPA","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3d0f0fd42984010afdd62b2b805c16d0a6250136","submitter":{"id":126,"url":"https://patchwork.libcamera.org/api/people/126/?format=json","name":"Daniel Semkowicz","email":"dse@thaumatec.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18444/mbox/","series":[{"id":3813,"url":"https://patchwork.libcamera.org/api/series/3813/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3813","date":"2023-03-24T14:28:58","name":"ipa: rkisp1: Add autofocus algorithm","version":5,"mbox":"https://patchwork.libcamera.org/series/3813/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18444/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18444/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 2AEFDC0F2A\n\tfor ;\n\tFri, 24 Mar 2023 14:29:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 542A9626D7;\n\tFri, 24 Mar 2023 15:29:27 +0100 (CET)","from mail-lf1-x134.google.com (mail-lf1-x134.google.com\n\t[IPv6:2a00:1450:4864:20::134])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A5051626D7\n\tfor ;\n\tFri, 24 Mar 2023 15:29:25 +0100 (CET)","by mail-lf1-x134.google.com with SMTP id g17so2474176lfv.4\n\tfor ;\n\tFri, 24 Mar 2023 07:29:25 -0700 (PDT)","from localhost.localdomain ([91.90.166.178])\n\tby smtp.gmail.com with ESMTPSA id\n\tj21-20020a2e8515000000b002a10b2ea089sm981714lji.16.2023.03.24.07.29.24\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 24 Mar 2023 07:29:24 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1679668167;\n\tbh=5zj1ZK6RZTdGDyrBsCSug+3xNfV1FsZrVJVaDPc75go=;\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:Cc:\n\tFrom;\n\tb=qXUQIjWG5AsZxEt51JntFVPWOZ3Ga9Ib07PdCiGnt0wvmytpixUDkeecnyS3hI+4g\n\tbyq3tW1z/K77etrmiZknYjKjCZoTr/ouzdfOAHKul8mlYcJjiL8xEdY9MPXBen0kHf\n\txv+UBY7I4poBptpF/k2QBdbFuWD1p3Cg6tXGHIk9esW1yYlT2SPwLTcPrDbkEelnk1\n\t1HQf1hyl9WXOxhFVYTjCmmJM0+IQngF3OafPTUrQGl0sCpSsVOxTLeFBmNNf45dvO8\n\tfInZJIN8sYOieCoV4IEHakJqazcRIqfVFszMFNbFTPxPnznkgA74iyFql5E0OJTkKf\n\tUzi97ix9eJxug==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=thaumatec-com.20210112.gappssmtp.com; s=20210112; t=1679668165;\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=+b1RxHmY2A94x2fOL2v5UZLA9FzXYBcNr7XlKQGwweA=;\n\tb=csCrVjvllNOFCyb+IzRdQVc1UVmGSgxsaVQC/IIbwfcxPMpg19EqHspw7fiC1NH2sE\n\tqOPOjBl1YWeEoaRCNeMWLew4yaEkkD04s3kxHQEFfLLfD6Wpn4pdVae52o++mz9fOeYN\n\tl8f5POfjbp07KENin/LsqmJYJ4x9C+A5tfBUBJc9tVQgWpd0nmEo5g4WvR9sZpsKwXlY\n\t6OLjsHA4DTgHRCA0VTCy1TlK2CxqAfQ1jhqIci3qLlkLnugmd4Ixdd9mx9Dec3frnvdN\n\taZTR4Cxp99j7V7Mf7mwhmxaGY6bfqeyWpKOFWafVkH7+7hb15lH6Hj/KM1DuBQaXJ01I\n\tJ4WQ=="],"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=\"csCrVjvl\"; \n\tdkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112; t=1679668165;\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=+b1RxHmY2A94x2fOL2v5UZLA9FzXYBcNr7XlKQGwweA=;\n\tb=twoNn957yRjm2pqnyYxa3OkqKC1DI62akojdvfEi7+OTRirR8HBcWnT+np5zOa5Sep\n\thq8tDPRISscCdv67eYeSLqOcakUDnhoYgqbyoACdVTs4ohBcPCzEsFWOachtgh06NY1E\n\tkItNmRulRYx73vw/fW9mM5U/keT/yglBEuekByYq0abkw8NJktNt1CnaINO0J6WzOJ/e\n\tLg0t0dSsxj4Cb+cRzEYPw5I+Ua5lydLMH6MSQbNjP60L8fRQmlYNid+W/ytEWjCCGGj3\n\t9I1/8/bPF1s7KeGtJQpYcKkr4eYCMWrqJtQAlY2IxtZadz1eg5l6KLGkM/7qWE9DtmTi\n\tXnCQ==","X-Gm-Message-State":"AAQBX9dcm61/5/js1VLGQlfZztvxrLoDT4qJ/7UBmRaTSQ8wSXaVuA1J\n\tRPO0PH9likWfOid1t1PJAc6fo7aVQky0JGfeltE=","X-Google-Smtp-Source":"AKy350ZO8VM12pPssOnBFcoQdCANLXO9TsZ8MLjMmnTuCFPyr2YBxW3tvKHQi2we5xxM8CI46miTyg==","X-Received":"by 2002:ac2:515b:0:b0:4e8:3b51:e7eb with SMTP id\n\tq27-20020ac2515b000000b004e83b51e7ebmr785866lfd.7.1679668164766; \n\tFri, 24 Mar 2023 07:29:24 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Mar 2023 15:28:59 +0100","Message-Id":"<20230324142908.64224-2-dse@thaumatec.com>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20230324142908.64224-1-dse@thaumatec.com>","References":"<20230324142908.64224-1-dse@thaumatec.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 01/10] rkisp1: Add camera lens to PH\n\tand expose 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 ","Cc":"jacopo.mondi@ideasonboard.com","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Check in pipeline handler if camera lens exists, and expose its controls\nto the IPA.\n\nSigned-off-by: Daniel Semkowicz \nReviewed-by: Jacopo Mondi \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..248cf5e0 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@@ -265,6 +267,9 @@ int IPARkISP1::configure(const IPAConfigInfo &ipaConfig,\n \t\t\treturn format.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n \t\t});\n \n+\tif (!ipaConfig.lensControls.empty())\n+\t\tlensControls_ = ipaConfig.lensControls;\n+\n \tfor (auto const &a : algorithms()) {\n \t\tAlgorithm *algo = static_cast(a.get());\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 8a30fe06..83fb6287 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -32,6 +32,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@@ -812,6 +813,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","v5","01/10"]}