Patch Detail
Show a patch.
GET /api/patches/17050/?format=api
{ "id": 17050, "url": "https://patchwork.libcamera.org/api/patches/17050/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17050/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220809144704.61682-4-dse@thaumatec.com>", "date": "2022-08-09T14:47:04", "name": "[libcamera-devel,v2,3/3] rkisp1: Add camera lens position control from IPA", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "ad5867230aa316e3b8770f4d7d7b83928a8672c1", "submitter": { "id": 126, "url": "https://patchwork.libcamera.org/api/people/126/?format=api", "name": "Daniel Semkowicz", "email": "dse@thaumatec.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17050/mbox/", "series": [ { "id": 3398, "url": "https://patchwork.libcamera.org/api/series/3398/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3398", "date": "2022-08-09T14:47:01", "name": "libcamera: rkisp1: Add lens control", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3398/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17050/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17050/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 D643AC3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 9 Aug 2022 14:47:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 989B963332;\n\tTue, 9 Aug 2022 16:47:15 +0200 (CEST)", "from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com\n\t[IPv6:2a00:1450:4864:20::52f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ED08363326\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 9 Aug 2022 16:47:11 +0200 (CEST)", "by mail-ed1-x52f.google.com with SMTP id x21so15430864edd.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 09 Aug 2022 07:47:11 -0700 (PDT)", "from localhost.localdomain (ip092042140082.rev.nessus.at.\n\t[92.42.140.82]) by smtp.gmail.com with ESMTPSA id\n\tcn15-20020a0564020caf00b0043ba0cf5dbasm6058486edb.2.2022.08.09.07.47.10\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 09 Aug 2022 07:47:11 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660056435;\n\tbh=qU5aw/Jw76GpL2WQXt84DR+OO6C6wzVTR7vjAtoNTGs=;\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=nCSh7kmGArn7Q61mXDx6Z+RfgASWKw2WB4CkOGrF65AOpceua997Dl2EqMFp3lU5s\n\tH2KacojmkTU3usG/ksjd01DJYxos6GkNMrsjZrRv96qiZdC5/oEuRtbB6CfXCs2u/3\n\tHU6RiAf8LGWz96i2uL/5rLTlOwfJg3t7ii90Q3UKPreAgHFXDUb1aquId6qWS/fyFV\n\t+kr17fLTQGb1p4Kpb1vTa9jg2k7hULnjtZ95U5EJPvMc2gK8P9V3/lD7UFBYSnTfD7\n\tTiOBtFvPj1ar+ewe2pxAna0OsVLBZp9fEn+j5wx7YbcIWHzsBCl3QG5CXkJfr2jLgq\n\tXhRaQt7t6op2w==", "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;\n\tbh=lIX7iN6BFHYMg1C5EJH+xkJnpsY8ZgYE6Zav8pi9O7s=;\n\tb=kkv0aXVBk4CjNkw+b/nkZTi/8dzLJ1HaLrq5nU44/TCduZTrCG0am/me/IxyhQL5vq\n\t96ji8yY0PTkvU6ZbsXyhdgHf7w8BW5OpcP9ia7l3Q0BIOQZ2kmcHwgv++j8cuRMv4Yk6\n\t5gioKuurb91wytEO2PDNKGkbtacxuuaVTfaoU3fCmbqhlU9LG/DQFDC/2KoVhAnWlbKJ\n\t8UUkJcA99bU1/LIWR0kQutjIDJRurKj+rhcxHCFSuhX1eyddplJoVT0Wx/VTJknKrJxx\n\tm8UE9IsDGhmDHdbBNd/PdO5XOBGLFEbFF0/hxdsUjuQ+IXHTg2UJM+mfKKlg7iG81vNN\n\tyGzQ==" ], "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=\"kkv0aXVB\"; \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\tbh=lIX7iN6BFHYMg1C5EJH+xkJnpsY8ZgYE6Zav8pi9O7s=;\n\tb=p+l0KHh5jUjQq+KAJZFs/pbN1Y5OSv882AYcMpvxdvioQ7Ysg7NsBEgqxueD8Hbr5f\n\t856E12b31nnB9K+DhpYEt3JKN8buL/q05SieWjkZWarAd6eGsYJaJ1eEVRApDDmAWlEp\n\tFq1Y9RVWZWfLELjWf9OcZF+sWdSuf2ohj/4ksdAU1BCkm8tMoYp2wFYcLg5TdJ8AK+aq\n\tQTneDGJQlQHcBKrDd92US6gj5ETgGXMf57mUCyVYGIi1JyUVM48k+nG7IaDbpdZ6VZio\n\tZrZz3G0HBHZrtbLN/3nvOMvKabaLfzPSDqyOowJRTMIMUy/hf5eWiWOsylm7RlUQw0hh\n\tPX/w==", "X-Gm-Message-State": "ACgBeo3K/5iJr/cZfANsg6d2bW8qDp7xvv8+mEZ5BkFr/PkrNQnj30HH\n\tmDnKCnmhAgJUyLsd5RNMafUnLVDfTTcxJw==", "X-Google-Smtp-Source": "AA6agR4NoivrNZIOzSNTJ0okc8VwKFrcjXbXMMZjkUbeo62AQ3//dVFZKu36Qtk/ahf2sBHHnM4NDQ==", "X-Received": "by 2002:a05:6402:40c2:b0:440:4ecd:f75f with SMTP id\n\tz2-20020a05640240c200b004404ecdf75fmr14722348edb.405.1660056431581; \n\tTue, 09 Aug 2022 07:47:11 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 9 Aug 2022 16:47:04 +0200", "Message-Id": "<20220809144704.61682-4-dse@thaumatec.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20220809144704.61682-1-dse@thaumatec.com>", "References": "<20220809144704.61682-1-dse@thaumatec.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/3] rkisp1: Add camera lens position\n\tcontrol from IPA", "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>", "From": "Daniel Semkowicz via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Daniel Semkowicz <dse@thaumatec.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Allow control of lens position from the IPA, by setting corresponding\naf fields in the IPAFrameContext structure. Controls are then passed to\nthe pipeline handler, which sets the lens position in CameraLens.\n\nSigned-off-by: Daniel Semkowicz <dse@thaumatec.com>\n---\n include/libcamera/ipa/rkisp1.mojom | 1 +\n src/ipa/rkisp1/ipa_context.h | 5 +++++\n src/ipa/rkisp1/rkisp1.cpp | 12 ++++++++++++\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 16 ++++++++++++++++\n 4 files changed, 34 insertions(+)", "diff": "diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\nindex eaf3955e..caa1121a 100644\n--- a/include/libcamera/ipa/rkisp1.mojom\n+++ b/include/libcamera/ipa/rkisp1.mojom\n@@ -32,5 +32,6 @@ interface IPARkISP1Interface {\n interface IPARkISP1EventInterface {\n \tparamsBufferReady(uint32 frame);\n \tsetSensorControls(uint32 frame, libcamera.ControlList sensorControls);\n+\tsetLensControls(libcamera.ControlList sensorControls);\n \tmetadataReady(uint32 frame, libcamera.ControlList metadata);\n };\ndiff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\nindex 2bdb6a81..d6d46b57 100644\n--- a/src/ipa/rkisp1/ipa_context.h\n+++ b/src/ipa/rkisp1/ipa_context.h\n@@ -42,6 +42,11 @@ struct IPASessionConfiguration {\n };\n \n struct IPAFrameContext {\n+\tstruct {\n+\t\tuint32_t lensPosition;\n+\t\tbool applyLensCtrls;\n+\t} af;\n+\n \tstruct {\n \t\tuint32_t exposure;\n \t\tdouble gain;\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 9e4c48a2..39e1ab2f 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -253,6 +253,10 @@ int IPARkISP1::configure([[maybe_unused]] const IPACameraSensorInfo &info,\n \tcontext_.configuration.agc.minAnalogueGain = camHelper_->gain(minGain);\n \tcontext_.configuration.agc.maxAnalogueGain = camHelper_->gain(maxGain);\n \n+\t/* Lens position is unknown at the startup, so initilize the variable\n+\t * that holds the current position to something out of the range. */\n+\tcontext_.frameContext.af.lensPosition = std::numeric_limits<int32_t>::max();\n+\n \tcontext_.frameContext.frameCount = 0;\n \n \tfor (auto const &algo : algorithms()) {\n@@ -348,6 +352,14 @@ void IPARkISP1::setControls(unsigned int frame)\n \tctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain));\n \n \tsetSensorControls.emit(frame, ctrls);\n+\n+\tif (lensCtrls_ && context_.frameContext.af.applyLensCtrls) {\n+\t\tcontext_.frameContext.af.applyLensCtrls = false;\n+\t\tControlList lensCtrls(*lensCtrls_);\n+\t\tlensCtrls.set(V4L2_CID_FOCUS_ABSOLUTE,\n+\t\t\t static_cast<int32_t>(context_.frameContext.af.lensPosition));\n+\t\tsetLensControls.emit(lensCtrls);\n+\t}\n }\n \n void IPARkISP1::prepareMetadata(unsigned int frame, unsigned int aeState)\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 5f10c26b..de0d37da 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -108,6 +108,7 @@ private:\n \tvoid paramFilled(unsigned int frame);\n \tvoid setSensorControls(unsigned int frame,\n \t\t\t const ControlList &sensorControls);\n+\tvoid setLensControls(const ControlList &lensControls);\n \n \tvoid metadataReady(unsigned int frame, const ControlList &metadata);\n };\n@@ -324,6 +325,7 @@ int RkISP1CameraData::loadIPA(unsigned int hwRevision)\n \t\treturn -ENOENT;\n \n \tipa_->setSensorControls.connect(this, &RkISP1CameraData::setSensorControls);\n+\tipa_->setLensControls.connect(this, &RkISP1CameraData::setLensControls);\n \tipa_->paramsBufferReady.connect(this, &RkISP1CameraData::paramFilled);\n \tipa_->metadataReady.connect(this, &RkISP1CameraData::metadataReady);\n \n@@ -378,6 +380,20 @@ void RkISP1CameraData::setSensorControls([[maybe_unused]] unsigned int frame,\n \tdelayedCtrls_->push(sensorControls);\n }\n \n+void RkISP1CameraData::setLensControls(const ControlList &lensControls)\n+{\n+\tCameraLens *focusLens = sensor_->focusLens();\n+\tif (!focusLens)\n+\t\treturn;\n+\n+\tif (!lensControls.contains(V4L2_CID_FOCUS_ABSOLUTE))\n+\t\treturn;\n+\n+\tconst ControlValue &focusValue = lensControls.get(V4L2_CID_FOCUS_ABSOLUTE);\n+\n+\tfocusLens->setFocusPosition(focusValue.get<int32_t>());\n+}\n+\n void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &metadata)\n {\n \tRkISP1FrameInfo *info = frameInfo_.find(frame);\n", "prefixes": [ "libcamera-devel", "v2", "3/3" ] }