{"id":14890,"url":"https://patchwork.libcamera.org/api/1.1/patches/14890/?format=json","web_url":"https://patchwork.libcamera.org/patch/14890/","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":"<20211130105157.203856-5-hanlinchen@chromium.org>","date":"2021-11-30T10:51:57","name":"[libcamera-devel,v6,4/4] ipu3: ipa: Allow IPA to apply controls to the lens device","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"0d14d66ab98d8315cd349a7a05a75d7b53e9da13","submitter":{"id":98,"url":"https://patchwork.libcamera.org/api/1.1/people/98/?format=json","name":"Hanlin Chen","email":"hanlinchen@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14890/mbox/","series":[{"id":2782,"url":"https://patchwork.libcamera.org/api/1.1/series/2782/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2782","date":"2021-11-30T10:51:53","name":"Introduce Lens class and apply auto focus on ipu3","version":6,"mbox":"https://patchwork.libcamera.org/series/2782/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14890/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14890/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 2B819BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Nov 2021 10:52:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DA022605B4;\n\tTue, 30 Nov 2021 11:52:15 +0100 (CET)","from mail-pl1-x630.google.com (mail-pl1-x630.google.com\n\t[IPv6:2607:f8b0:4864:20::630])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 27F5F605B4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 11:52:12 +0100 (CET)","by mail-pl1-x630.google.com with SMTP id v19so14590812plo.7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Nov 2021 02:52:12 -0800 (PST)","from localhost ([2401:fa00:1:10:1659:cd3d:a00c:fa38])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\tmn15sm2045591pjb.35.2021.11.30.02.52.09\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tTue, 30 Nov 2021 02:52:10 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Zn4uEUBq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=mIKd6VTNdAEOYNVDMVnDc05R76+FTwUSTeL7x6XXBVw=;\n\tb=Zn4uEUBqWXQ+LrH1lnSo7+3wZTJzMsYIv1SiMplinHHPRDvVe8vyFHs2O7yeQWQOpX\n\th2M/z6phvTmsFvV0Q1jW2BTpzonYz3OvqQ9bdj6I07y68jQCAwulCE16EhoG2l28Nt9Q\n\t8TLnQKFkR5E/gWZe9DuRYlGHk4XZ9UwY0scjM=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=mIKd6VTNdAEOYNVDMVnDc05R76+FTwUSTeL7x6XXBVw=;\n\tb=74w+RhgEcB0DRx8xHl42cRlxVDLeKtFTgzRnV0w5P69Tg9y4tEE/zlTWBW3J698z31\n\tLAM82HGvsbQiyS0umUzSI0k8rQPrvbFlCd81fC3an/X0fxb0VPZrd7TjaC7f/75vJZRI\n\tK25vxvpaYGalPh9+g1e7F7V838jquZokHGlqZBd3o0SGlTUQEHNJE2QF+mJRD5Hmgj/X\n\tGN5Ls7lNUqFnX2tuaiHeWodKWQnvImt/aD46PIzn8SNZCmNL4TsykMyWBZe70aiqlHPQ\n\tRoIv3/HyzGl0iJ7t9gWIhk+aBRqFSL2QBAwrEbbKxR3UoCOqk48ePH4osUt5qoUozsAe\n\tHBEA==","X-Gm-Message-State":"AOAM533ozuVaorhKfUbnKx/RvEOfS3RFuvIWjYRWYP+cnKWWmoizlhIV\n\ttdB4ddPbHrlhbsL88GRMsdqF1FPoCFsc0g==","X-Google-Smtp-Source":"ABdhPJy1m6MS2MTAlKoDmfK/bsPdt1VfDcqCRtlFBuGN4CGktcoPYhC3DIyFITTh7xrQJYFPLDE/XA==","X-Received":"by 2002:a17:902:e741:b0:141:f9a7:4995 with SMTP id\n\tp1-20020a170902e74100b00141f9a74995mr66943009plf.49.1638269530583; \n\tTue, 30 Nov 2021 02:52:10 -0800 (PST)","From":"Han-Lin Chen <hanlinchen@chromium.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 30 Nov 2021 18:51:57 +0800","Message-Id":"<20211130105157.203856-5-hanlinchen@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211130105157.203856-1-hanlinchen@chromium.org>","References":"<20211130105157.203856-1-hanlinchen@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v6 4/4] ipu3: ipa: Allow IPA to apply\n\tcontrols to the lens device","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Allow IPA to apply controls to the lens device.\n\nSigned-off-by: Han-Lin Chen <hanlinchen@chromium.org>\n---\n src/libcamera/pipeline/ipu3/cio2.cpp |  1 +\n src/libcamera/pipeline/ipu3/cio2.h   |  3 +++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++++++++--\n 3 files changed, 14 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 59dda56b..ff795310 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -16,6 +16,7 @@\n #include <libcamera/geometry.h>\n #include <libcamera/stream.h>\n \n+#include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/media_device.h\"\ndiff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h\nindex ba8f0052..635566c8 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.h\n+++ b/src/libcamera/pipeline/ipu3/cio2.h\n@@ -18,6 +18,7 @@\n \n namespace libcamera {\n \n+class CameraLens;\n class CameraSensor;\n class FrameBuffer;\n class MediaDevice;\n@@ -52,6 +53,7 @@ public:\n \tint stop();\n \n \tCameraSensor *sensor() { return sensor_.get(); }\n+\tCameraLens *lens() { return lens_.get(); }\n \tconst CameraSensor *sensor() const { return sensor_.get(); }\n \n \tFrameBuffer *queueBuffer(Request *request, FrameBuffer *rawBuffer);\n@@ -67,6 +69,7 @@ private:\n \tvoid cio2BufferReady(FrameBuffer *buffer);\n \n \tstd::unique_ptr<CameraSensor> sensor_;\n+\tstd::unique_ptr<CameraLens> lens_;\n \tstd::unique_ptr<V4L2Subdevice> csi2_;\n \tstd::unique_ptr<V4L2VideoDevice> output_;\n \ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex c65afdb2..6e04ec8f 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -24,6 +24,7 @@\n #include <libcamera/stream.h>\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@@ -1238,8 +1239,15 @@ void IPU3CameraData::queueFrameAction(unsigned int id,\n {\n \tswitch (action.op) {\n \tcase ipa::ipu3::ActionSetSensorControls: {\n-\t\tconst ControlList &controls = action.sensorControls;\n-\t\tdelayedCtrls_->push(controls);\n+\t\tconst ControlList &sensorControls = action.sensorControls;\n+\t\tdelayedCtrls_->push(sensorControls);\n+\n+\t\tconst ControlList lensControls = action.lensControls;\n+\t\tconst ControlValue &focusValue =\n+\t\t\tlensControls.get(V4L2_CID_FOCUS_ABSOLUTE);\n+\t\tif (!focusValue.isNone() && cio2_.lens())\n+\t\t\tcio2_.lens()->setFocusPostion(focusValue.get<int32_t>());\n+\n \t\tbreak;\n \t}\n \tcase ipa::ipu3::ActionParamFilled: {\n","prefixes":["libcamera-devel","v6","4/4"]}