Patch Detail
Show a patch.
GET /api/1.1/patches/14605/?format=api
{ "id": 14605, "url": "https://patchwork.libcamera.org/api/1.1/patches/14605/?format=api", "web_url": "https://patchwork.libcamera.org/patch/14605/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20211115054400.17797-1-hpa@redhat.com>", "date": "2021-11-15T05:44:00", "name": "[libcamera-devel] ipa: ipu3: af: Auto focus for dw9719 Surface Go2 VCM", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "78b02def4b68e8c96e0dc8703cf47b0ed5e68710", "submitter": { "id": 105, "url": "https://patchwork.libcamera.org/api/1.1/people/105/?format=api", "name": "Kate Hsuan", "email": "hpa@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/14605/mbox/", "series": [ { "id": 2718, "url": "https://patchwork.libcamera.org/api/1.1/series/2718/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2718", "date": "2021-11-15T05:44:00", "name": "[libcamera-devel] ipa: ipu3: af: Auto focus for dw9719 Surface Go2 VCM", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2718/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/14605/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/14605/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 E8C58BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Nov 2021 05:44:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1255D60368;\n\tMon, 15 Nov 2021 06:44:35 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BF8860120\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Nov 2021 06:44:32 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n\t[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n\tus-mta-154-sSdJM9pWNbO2ZYCNasNj8g-1; Mon, 15 Nov 2021 00:44:24 -0500", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12B921808303\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Nov 2021 05:44:24 +0000 (UTC)", "from fedora.redhat.com (unknown [10.39.192.106])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 099065C1BB;\n\tMon, 15 Nov 2021 05:44:21 +0000 (UTC)" ], "Authentication-Results": [ "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"ZqCeVEve\"; dkim-atps=neutral", "relay.mimecast.com;\n\tauth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hpa@redhat.com" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1636955071;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding;\n\tbh=YlKRJ0UQHCMPalzQMv9GGF46L5HrIiTwnpQWbkn2mAw=;\n\tb=ZqCeVEveFIhmc7WZNJu0IA2dG79PBJyRbCm+12AxWv/iopcU2XzGp31KO7zgmGMis1E4T2\n\tFBDwdfnDLnGl4i5ooJE2XnNWn4YpAIdd7yJW4p/QAdSr+111yD8PgtpuKtvSesaeEzpQnE\n\tNsUy9He1lnZ9OgxyAVsmHukqSzRyqFs=", "X-MC-Unique": "sSdJM9pWNbO2ZYCNasNj8g-1", "From": "Kate Hsuan <hpa@redhat.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Mon, 15 Nov 2021 13:44:00 +0800", "Message-Id": "<20211115054400.17797-1-hpa@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[libcamera-devel] [PATCH] ipa: ipu3: af: Auto focus for dw9719\n\tSurface Go2 VCM", "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": "Since VCM for surface Go 2 (dw9719) had been successfully\ndriven, this Af module can be used to control the VCM and\ndetermine the focus value based on the IPU3 AF state.\n\nThe variance of each focus step is determined and a greedy\napproah is used to find the maximum variance of the AF\nstate and a appropriate focus value.\n\nSigned-off-by: Kate Hsuan <hpa@redhat.com>\n---\n src/ipa/ipu3/algorithms/af.cpp | 165 ++++++++++++++++++++++++++++\n src/ipa/ipu3/algorithms/af.h | 48 ++++++++\n src/ipa/ipu3/algorithms/meson.build | 3 +-\n src/ipa/ipu3/ipa_context.h | 6 +\n src/ipa/ipu3/ipu3.cpp | 2 +\n 5 files changed, 223 insertions(+), 1 deletion(-)\n create mode 100644 src/ipa/ipu3/algorithms/af.cpp\n create mode 100644 src/ipa/ipu3/algorithms/af.h", "diff": "diff --git a/src/ipa/ipu3/algorithms/af.cpp b/src/ipa/ipu3/algorithms/af.cpp\nnew file mode 100644\nindex 00000000..c276b539\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/af.cpp\n@@ -0,0 +1,165 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Red Hat\n+ *\n+ * af.cpp - IPU3 Af control\n+ */\n+\n+#include \"af.h\"\n+\n+#include <algorithm>\n+#include <chrono>\n+#include <cmath>\n+#include <numeric>\n+\n+#include <linux/videodev2.h>\n+#include <sys/types.h>\n+#include <sys/stat.h>\n+#include <fcntl.h>\n+#include <sys/ioctl.h>\n+#include <unistd.h>\n+\n+#include <libcamera/base/log.h>\n+\n+#include <libcamera/ipa/core_ipa_interface.h>\n+\n+#include \"libipa/histogram.h\"\n+\n+/**\n+ * \\file af.h\n+ */\n+\n+namespace libcamera {\n+\n+using namespace std::literals::chrono_literals;\n+\n+namespace ipa::ipu3::algorithms {\n+\n+LOG_DEFINE_CATEGORY(IPU3Af)\n+\n+Af::Af(): focus_(0), maxVariance_(0.0), currentVar_(0.0)\n+{\n+\t/* For surface Go 2 back camera VCM */\n+\tvcmFd_ = open(\"/dev/v4l-subdev8\", O_RDWR);\n+}\n+\n+Af::~Af()\n+{\n+\tif(vcmFd_ != -1)\n+\t\tclose(vcmFd_);\n+}\n+\n+int Af::configure(IPAContext &context, const IPAConfigInfo &configInfo)\n+{\n+\tconst IPAConfigInfo tmp __attribute__((unused)) = configInfo;\n+\tcontext.frameContext.af.focus = 0;\n+\tcontext.frameContext.af.maxVar = 0;\n+\tcontext.frameContext.af.stable = false;\n+\n+\tmaxVariance_ = 0;\n+\tignoreFrame_ = 100;\n+\n+\treturn 0;\n+}\n+\n+void Af::vcmSet(int value)\n+{\n+\tint ret;\n+\tstruct v4l2_control ctrl;\n+\tif(vcmFd_ == -1)\n+\t\treturn;\n+\tmemset(&ctrl, 0, sizeof(struct v4l2_control));\n+\tctrl.id = V4L2_CID_FOCUS_ABSOLUTE;\n+\tctrl.value = value;\n+\tret = ioctl(vcmFd_, VIDIOC_S_CTRL, &ctrl);\n+\n+}\n+\n+void Af::process(IPAContext &context, const ipu3_uapi_stats_3a *stats )\n+{\n+\ttypedef struct y_table_item {\n+\t\tuint16_t y1_avg;\n+\t\tuint16_t y2_avg;\n+\t}y_table_item_t;\n+\n+\tuint32_t total = 0;\n+\tdouble mean;\n+\tuint64_t var_sum = 0;\n+\ty_table_item_t *y_item;\n+\n+\ty_item = (y_table_item_t *)stats->af_raw_buffer.y_table;\n+\tint z = 0;\n+\t\n+\tfor(z = 0; z < (IPU3_UAPI_AF_Y_TABLE_MAX_SIZE)/4; z++)\n+\t{\n+\t\ttotal = total + y_item[z].y2_avg;\n+\t\tif(y_item[z].y2_avg == 0)\n+\t\t\tbreak;\n+\t}\n+\tmean = total / z;\n+\n+\tfor(z = 0; z < (IPU3_UAPI_AF_Y_TABLE_MAX_SIZE)/4 && y_item[z].y2_avg != 0; z++)\n+\t{\n+\t\tvar_sum = var_sum + ((y_item[z].y2_avg - mean) * (y_item[z].y2_avg - mean));\n+\t\tif(y_item[z].y2_avg == 0)\n+\t\t\tbreak;\n+\t}\n+\tcurrentVar_ = static_cast<double>(var_sum) /static_cast<double>(z);\n+\tLOG(IPU3Af, Debug) << \"variance: \" << currentVar_;\n+\n+\tif( context.frameContext.af.stable == true )\n+\t{\n+\t\tconst uint32_t diff_var = std::abs(currentVar_ - context.frameContext.af.maxVar);\n+\t\tconst double var_ratio = diff_var / context.frameContext.af.maxVar;\n+\t\tLOG(IPU3Af, Debug) << \"Change ratio: \"\n+\t\t\t\t << var_ratio \n+\t\t\t\t << \" current focus: \"\n+\t\t\t\t << context.frameContext.af.focus;\n+\t\tif(var_ratio > 0.8)\n+\t\t{\n+\t\t\tif(ignoreFrame_ == 0)\n+\t\t\t{\n+\t\t\t\tcontext.frameContext.af.maxVar = 0;\n+\t\t\t\tcontext.frameContext.af.focus = 0;\n+\t\t\t\tfocus_ = 0;\n+\t\t\t\tcontext.frameContext.af.stable = false;\n+\t\t\t\tignoreFrame_ = 60;\n+\t\t\t}\n+\t\t\telse\n+\t\t\t\tignoreFrame_--;\n+\t\t}else\n+\t\t\tignoreFrame_ = 60;\n+\t}else\n+\t{\n+\t\tif(ignoreFrame_ != 0)\n+\t\t\tignoreFrame_--;\n+\t\telse{\n+\t\t\tif(currentVar_ > context.frameContext.af.maxVar)\n+\t\t\t{\n+\t\t\t\tcontext.frameContext.af.maxVar = currentVar_;\n+\t\t\t\tcontext.frameContext.af.focus = focus_;\n+\t\t\t}\n+\n+\t\t\tif(focus_ > 1023)\n+\t\t\t{\n+\t\t\t\tcontext.frameContext.af.stable = true;\n+\t\t\t\tvcmSet(context.frameContext.af.focus);\n+\t\t\t\tLOG(IPU3Af, Debug) << \"Finall Focus \" \n+\t\t\t\t\t\t << context.frameContext.af.focus;\n+\t\t\t}else\n+\t\t\t{\n+\t\t\t\tfocus_ += 5;\n+\t\t\t\tvcmSet(focus_);\n+\t\t\t}\n+\t\t\tLOG(IPU3Af, Debug) << \"Focus searching max var is: \"\n+\t\t\t\t\t << context.frameContext.af.maxVar\n+\t\t\t\t\t << \" Focus step is \" \n+\t\t\t\t\t << context.frameContext.af.focus;\n+\t\t}\n+\t}\n+}\n+\n+\n+} /* namespace ipa::ipu3::algorithms */\n+\n+} /* namespace libcamera */\n\\ No newline at end of file\ndiff --git a/src/ipa/ipu3/algorithms/af.h b/src/ipa/ipu3/algorithms/af.h\nnew file mode 100644\nindex 00000000..64c704b1\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/af.h\n@@ -0,0 +1,48 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Red Hat\n+ *\n+ * af.h - IPU3 Af control\n+ */\n+#ifndef __LIBCAMERA_IPU3_ALGORITHMS_AF_H__\n+#define __LIBCAMERA_IPU3_ALGORITHMS_AF_H__\n+\n+#include <linux/intel-ipu3.h>\n+\n+#include <libcamera/base/utils.h>\n+\n+#include <libcamera/geometry.h>\n+\n+#include \"algorithm.h\"\n+\n+namespace libcamera {\n+\n+namespace ipa::ipu3::algorithms {\n+\n+class Af : public Algorithm\n+{\n+public:\n+\tAf();\n+\t~Af();\n+\n+\tint configure(IPAContext &context, const IPAConfigInfo &configInfo) override;\n+\tvoid process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override;\n+\n+private:\n+\tvoid filterVariance(double new_var);\n+\n+\tvoid vcmSet(int value);\n+\n+\tint vcmFd_;\n+\tint focus_;\n+\tunsigned int ignoreFrame_;\n+\tdouble maxVariance_;\n+\tdouble currentVar_;\n+\n+};\n+\n+} /* namespace ipa::ipu3::algorithms */\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_IPU3_ALGORITHMS_AF_H__ */\ndiff --git a/src/ipa/ipu3/algorithms/meson.build b/src/ipa/ipu3/algorithms/meson.build\nindex 3ec42f72..d32c61d2 100644\n--- a/src/ipa/ipu3/algorithms/meson.build\n+++ b/src/ipa/ipu3/algorithms/meson.build\n@@ -5,5 +5,6 @@ ipu3_ipa_algorithms = files([\n 'algorithm.cpp',\n 'awb.cpp',\n 'blc.cpp',\n- 'tone_mapping.cpp',\n+ 'af.cpp',\n+ 'tone_mapping.cpp'\n ])\ndiff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h\nindex 1e46c61a..5d92f63c 100644\n--- a/src/ipa/ipu3/ipa_context.h\n+++ b/src/ipa/ipu3/ipa_context.h\n@@ -47,6 +47,12 @@ struct IPAFrameContext {\n \t\t} gains;\n \t} awb;\n \n+\tstruct {\n+\t\tuint32_t focus;\n+\t\tdouble maxVar;\n+\t\tbool stable;\n+\t} af;\n+\n \tstruct {\n \t\tdouble gamma;\n \t\tstruct ipu3_uapi_gamma_corr_lut gammaCorrection;\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 5c51607d..980815ee 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -31,6 +31,7 @@\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n #include \"algorithms/agc.h\"\n+#include \"algorithms/af.h\"\n #include \"algorithms/algorithm.h\"\n #include \"algorithms/awb.h\"\n #include \"algorithms/blc.h\"\n@@ -298,6 +299,7 @@ int IPAIPU3::init(const IPASettings &settings,\n \t}\n \n \t/* Construct our Algorithms */\n+\talgorithms_.push_back(std::make_unique<algorithms::Af>());\n \talgorithms_.push_back(std::make_unique<algorithms::Agc>());\n \talgorithms_.push_back(std::make_unique<algorithms::Awb>());\n \talgorithms_.push_back(std::make_unique<algorithms::BlackLevelCorrection>());\n", "prefixes": [ "libcamera-devel" ] }