{"id":14808,"url":"https://patchwork.libcamera.org/api/1.1/patches/14808/?format=json","web_url":"https://patchwork.libcamera.org/patch/14808/","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":"<20211126112903.3276056-5-hanlinchen@chromium.org>","date":"2021-11-26T11:29:03","name":"[libcamera-devel,v5,4/4] ipu3: ipa: Allow IPA to apply controls to the lens device","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"56209e877401e220c612772ada3f8a396f3e871e","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/14808/mbox/","series":[{"id":2762,"url":"https://patchwork.libcamera.org/api/1.1/series/2762/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2762","date":"2021-11-26T11:28:59","name":"Introduce Lens class and apply auto focus on ipu3","version":5,"mbox":"https://patchwork.libcamera.org/series/2762/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14808/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14808/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 A476DBF415\n\tfor ;\n\tFri, 26 Nov 2021 11:29:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6194860543;\n\tFri, 26 Nov 2021 12:29:25 +0100 (CET)","from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com\n\t[IPv6:2607:f8b0:4864:20::42d])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9AC42604FB\n\tfor ;\n\tFri, 26 Nov 2021 12:29:22 +0100 (CET)","by mail-pf1-x42d.google.com with SMTP id p13so1001283pfw.2\n\tfor ;\n\tFri, 26 Nov 2021 03:29:22 -0800 (PST)","from localhost ([2401:fa00:1:10:a0de:e637:c058:6824])\n\tby smtp.gmail.com with UTF8SMTPSA id\n\td10sm6817669pfl.139.2021.11.26.03.29.20\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tFri, 26 Nov 2021 03:29:20 -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=\"MWqFQJbL\"; 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=Wts5FaHlWgEzLQTSI6cOeLZs+nV4J2NqWI0WqjNYSw0=;\n\tb=MWqFQJbLwsoOP+KdWh6bYysOLa6F5ePqTT4XOLoaAkNznVZKbGSGt+gZPNL+tNWr48\n\txUCMbJ1XmaV3AbYtmxzPFQ7iMtPgN0LVNhDJpJx+DJobn4a3JcIaKKmNDFfUbpEiJVyp\n\tIQajH9SR41q35Gk9a9xyvvLbqnoAORR0qigYo=","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=Wts5FaHlWgEzLQTSI6cOeLZs+nV4J2NqWI0WqjNYSw0=;\n\tb=KHKYZpJMU7PNj6s9FnJnrDz5AK8tWoxKEYkmkwdGFPUx1ZDYyVerQbfm3JNqahB0BU\n\tADa64knAkwaaTftje6tO03N45M4mfL83tYkjtIEHP0eiRLKpSwwqxscGElvOUSqurfmh\n\tAYFrUoKMymZq0ZSe95++S99raWqWKRiQrMjsE+3Gr8pBDsgevh6GW5FvYG0nBJ9YaMKt\n\toi1DiDacNC0vvzMyLtBqLApeyCwG7J+78lEdtJQFR9FRCEMDJB6xAfunfr1zNzP4PHzi\n\tUAQF+o6qckOmQBz90NE8Hahige2ueOnsK5Aq9EHauUhbFONcmn1fbiJkcjlc5nfHETCI\n\tUzIA==","X-Gm-Message-State":"AOAM530x/kPydQL8U/Em5menEdeFmPQhWf3jbjUrYBXsqDyFoOncQkWV\n\tr/kgdxZKIwymhoKMAYKgwdQGC4qBg9DPhw==","X-Google-Smtp-Source":"ABdhPJz8NOas1neJLo5fLxU7Q644qjr8KwsnjnVBDjeiqP1qN2iZ1bDORAgGW0FRjgWt8nHG08AyXA==","X-Received":"by 2002:a63:3e88:: with SMTP id\n\tl130mr18513607pga.266.1637926160998; \n\tFri, 26 Nov 2021 03:29:20 -0800 (PST)","From":"Han-Lin Chen ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 26 Nov 2021 19:29:03 +0800","Message-Id":"<20211126112903.3276056-5-hanlinchen@chromium.org>","X-Mailer":"git-send-email 2.34.0.rc2.393.gf8c9666880-goog","In-Reply-To":"<20211126112903.3276056-1-hanlinchen@chromium.org>","References":"<20211126112903.3276056-1-hanlinchen@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Allow IPA to apply controls to the lens device.\n\nSigned-off-by: Han-Lin Chen \n---\n src/libcamera/pipeline/ipu3/cio2.cpp | 29 ++++++++++++++++++++++++++++\n src/libcamera/pipeline/ipu3/cio2.h | 3 +++\n src/libcamera/pipeline/ipu3/ipu3.cpp | 12 ++++++++++--\n 3 files changed, 42 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\nindex 59dda56b..59b2f586 100644\n--- a/src/libcamera/pipeline/ipu3/cio2.cpp\n+++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n@@ -16,6 +16,7 @@\n #include \n #include \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\"\n@@ -159,6 +160,34 @@ int CIO2Device::init(const MediaDevice *media, unsigned int index)\n \t\treturn -EINVAL;\n \t}\n \n+\t/*\n+\t * \\todo Read the lens model from the sensor itself or from a device\n+\t * database. For now use default values taken from ChromeOS database.\n+\t */\n+\tstatic std::unordered_map sensorLens = {\n+\t\t{ \"ov13858\", \"dw9714\" },\n+\t\t{ \"imx258\", \"dw9807\" },\n+\t\t{ \"imx355\", \"ak7375\" }\n+\t};\n+\n+\tauto it = sensorLens.find(sensor_->model());\n+\tif (it != sensorLens.end()) {\n+\t\tconst std::vector &entities = media->entities();\n+\t\tfor (auto ent : entities) {\n+\t\t\tif (ent->function() == MEDIA_ENT_F_LENS) {\n+\t\t\t\tlens_ = std::make_unique(ent);\n+\t\t\t\tret = lens_->init();\n+\t\t\t\tif (!ret && lens_->model() == it->second) {\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t\tlens_.reset();\n+\t\t\t}\n+\t\t\tif (!lens_)\n+\t\t\t\tLOG(IPU3, Warning) << \"Lens device \"\n+\t\t\t\t\t\t << it->second << \" not found\";\n+\t\t}\n+\t}\n+\n \t/*\n \t * \\todo Define when to open and close video device nodes, as they\n \t * might impact on power consumption.\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 sensor_;\n+\tstd::unique_ptr lens_;\n \tstd::unique_ptr csi2_;\n \tstd::unique_ptr 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 \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());\n+\n \t\tbreak;\n \t}\n \tcase ipa::ipu3::ActionParamFilled: {\n","prefixes":["libcamera-devel","v5","4/4"]}