{"id":3872,"url":"https://patchwork.libcamera.org/api/1.1/patches/3872/?format=json","web_url":"https://patchwork.libcamera.org/patch/3872/","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":"<20200528145132.96102-1-naush@raspberrypi.com>","date":"2020-05-28T14:51:32","name":"[libcamera-devel] ipa: rpi: Add \"focus\" algorithm","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"577ffdf65e337b66518b7c8fc1640ba9a4e9e29d","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3872/mbox/","series":[{"id":934,"url":"https://patchwork.libcamera.org/api/1.1/series/934/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=934","date":"2020-05-28T14:51:32","name":"[libcamera-devel] ipa: rpi: Add \"focus\" algorithm","version":1,"mbox":"https://patchwork.libcamera.org/series/934/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3872/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3872/checks/","tags":{},"headers":{"Return-Path":"","Received":["from mail-wm1-x341.google.com (mail-wm1-x341.google.com\n\t[IPv6:2a00:1450:4864:20::341])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A5402603D3\n\tfor ;\n\tThu, 28 May 2020 16:51:42 +0200 (CEST)","by mail-wm1-x341.google.com with SMTP id j198so4674559wmj.0\n\tfor ;\n\tThu, 28 May 2020 07:51:42 -0700 (PDT)","from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tu23sm7284558wmu.20.2020.05.28.07.51.40\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 28 May 2020 07:51:40 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"CkI6uBIe\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=jgXiadbZYvKLQndADklLass72kpnnq3zeVMnbuSWbvE=;\n\tb=CkI6uBIeBqyGrb2zfFqvCe+9KAqy/8X4Rgo5i+XTlBp6rBUZFgYoFQiiWvxB9lmzp2\n\t8TqbgHjl+ZOU47oIAQ8zoBgJnHua+mFVZkvfhTCVJA7qHYkxy6bGnvodDn5jr11HzKPi\n\tD40K6T/U6nEgHYob1CWZHyTjF/JB+GYVMKuJI83kLaJvKSigH5ur1MNTbjD1/PGZK+mf\n\tx34/pZrlskQwIX6wK6XmecBCo276gM8LYzd3hKsikwSTa8Gi++sMlCq6LqrmnayHcmpy\n\tvpDVRblNgMvMim50TYouqFd2nyql5sUpB+yXI7hAFt8DGZ7/S/Q6KaMUoQJTL/wqaTMl\n\tkoXg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=jgXiadbZYvKLQndADklLass72kpnnq3zeVMnbuSWbvE=;\n\tb=ivm2U68zhqOeDE/EQjoPBxae6tzAW2zkW9RTVJGQqmte6UhH3qj/Ag1VD2pzHtUEuH\n\t2ydLrSsn2aGU/IQ00MUAuvG6pOefK7nc9wwPscbHcO/PsbKNoGdFQv9a85Q6o85QW7eU\n\tMaQYuD3cAKbJzePb/sC+bZI3su+sUfRBHHwi6/65CVgGrsMZz5PZ5yuqOg10xYh2uzFW\n\tFe8Y9ttwBIvChO1ivvLFUbzjFTE3RtbDVP37QbD9DsBKoHMqa5LzhIfBCtpov2En+CbA\n\tus919THPBgEPP81b7bxuO11lyP4D/B4plJzDwAPqzzA+hz6O8FIyxaApHRr8e+ypi5pQ\n\tSQCg==","X-Gm-Message-State":"AOAM533NTyyJLAz8rF9ROaOuCZdPfJzvC3JRuBVLFn4colN01uKYll7F\n\tcpIqD5IDaKq3T8G6MPXxxpJlTHAJuugIXQ==","X-Google-Smtp-Source":"ABdhPJyev8ozBXADwDoKqJVo02czNy1g9dAWHXqJTk2oD5BsA9fqcWoyeckEjWMmLUhNIkMJ2qBFvw==","X-Received":"by 2002:a1c:3dd6:: with SMTP id\n\tk205mr2767319wma.87.1590677501675; \n\tThu, 28 May 2020 07:51:41 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 May 2020 15:51:32 +0100","Message-Id":"<20200528145132.96102-1-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] ipa: rpi: Add \"focus\" algorithm","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","X-List-Received-Date":"Thu, 28 May 2020 14:51:43 -0000"},"content":"From: David Plowman \n\nAdds FocusStatus to the image metadata, containing contrast measurements\nacross the image. Optionally also prints a contrast measure to the\nconsole, to aid in manual adjustment of the lens. Note that it is not an\nactual auto-focus algorithm that can drive a lens!\n\nSigned-off-by: David Plowman \nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/controller/focus_status.h | 26 ++++++++++\n src/ipa/raspberrypi/controller/rpi/focus.cpp | 51 +++++++++++++++++++\n src/ipa/raspberrypi/controller/rpi/focus.hpp | 31 +++++++++++\n src/ipa/raspberrypi/data/imx477.json | 4 ++\n src/ipa/raspberrypi/meson.build | 1 +\n 5 files changed, 113 insertions(+)\n create mode 100644 src/ipa/raspberrypi/controller/focus_status.h\n create mode 100644 src/ipa/raspberrypi/controller/rpi/focus.cpp\n create mode 100644 src/ipa/raspberrypi/controller/rpi/focus.hpp","diff":"diff --git a/src/ipa/raspberrypi/controller/focus_status.h b/src/ipa/raspberrypi/controller/focus_status.h\nnew file mode 100644\nindex 00000000..3ad88777\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/focus_status.h\n@@ -0,0 +1,26 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Limited\n+ *\n+ * focus_status.h - focus measurement status\n+ */\n+#pragma once\n+\n+#include \n+\n+// The focus algorithm should post the following structure into the image's\n+// \"focus.status\" metadata. Recall that it's only reporting focus (contrast)\n+// measurements, it's not driving any kind of auto-focus algorithm!\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+struct FocusStatus {\n+\tint num;\n+\tuint32_t focus_measures[FOCUS_REGIONS];\n+};\n+\n+#ifdef __cplusplus\n+}\n+#endif\ndiff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp\nnew file mode 100644\nindex 00000000..d6cdc4bf\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp\n@@ -0,0 +1,51 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Limited\n+ *\n+ * focus.cpp - focus algorithm\n+ */\n+#include \n+\n+#include \"../focus_status.h\"\n+#include \"../logging.hpp\"\n+#include \"focus.hpp\"\n+\n+using namespace RPi;\n+\n+#define NAME \"rpi.focus\"\n+\n+Focus::Focus(Controller *controller)\n+\t: Algorithm(controller)\n+{\n+}\n+\n+char const *Focus::Name() const\n+{\n+\treturn NAME;\n+}\n+\n+void Focus::Read(boost::property_tree::ptree const ¶ms)\n+{\n+\tprint_ = params.get(\"print\", 0);\n+}\n+\n+void Focus::Process(StatisticsPtr &stats, Metadata *image_metadata)\n+{\n+\tFocusStatus status;\n+\tint i;\n+\tfor (i = 0; i < FOCUS_REGIONS; i++)\n+\t\tstatus.focus_measures[i] = stats->focus_stats[i].contrast_val[1][1] / 1000;\n+\tstatus.num = i;\n+\timage_metadata->Set(\"focus.status\", status);\n+\tif (print_) {\n+\t\tuint32_t value = (status.focus_measures[5] + status.focus_measures[6]) / 10;\n+\t\tRPI_LOG(\"Focus contrast measure: \" << value);\n+\t}\n+}\n+\n+/* Register algorithm with the system. */\n+static Algorithm *Create(Controller *controller)\n+{\n+\treturn new Focus(controller);\n+}\n+static RegisterAlgorithm reg(NAME, &Create);\ndiff --git a/src/ipa/raspberrypi/controller/rpi/focus.hpp b/src/ipa/raspberrypi/controller/rpi/focus.hpp\nnew file mode 100644\nindex 00000000..d53401f7\n--- /dev/null\n+++ b/src/ipa/raspberrypi/controller/rpi/focus.hpp\n@@ -0,0 +1,31 @@\n+/* SPDX-License-Identifier: BSD-2-Clause */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Limited\n+ *\n+ * focus.hpp - focus algorithm\n+ */\n+#pragma once\n+\n+#include \"../algorithm.hpp\"\n+#include \"../metadata.hpp\"\n+\n+/*\n+ * The \"focus\" algorithm. All it does it print out a version of the\n+ * focus contrast measure; there is no actual auto-focus mechanism to\n+ * control.\n+ */\n+\n+namespace RPi {\n+\n+class Focus : public Algorithm\n+{\n+public:\n+\tFocus(Controller *controller);\n+\tchar const *Name() const override;\n+\tvoid Read(boost::property_tree::ptree const ¶ms) override;\n+\tvoid Process(StatisticsPtr &stats, Metadata *image_metadata) override;\n+private:\n+\tbool print_;\n+};\n+\n+} /* namespace RPi */\ndiff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json\nindex dce5234f..389e8ce8 100644\n--- a/src/ipa/raspberrypi/data/imx477.json\n+++ b/src/ipa/raspberrypi/data/imx477.json\n@@ -412,5 +412,9 @@\n \"rpi.sharpen\":\n {\n \n+ },\n+ \"rpi.focus\":\n+ {\n+\t\"print\": 1\n }\n }\ndiff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build\nindex 697902e9..9445cd09 100644\n--- a/src/ipa/raspberrypi/meson.build\n+++ b/src/ipa/raspberrypi/meson.build\n@@ -29,6 +29,7 @@ rpi_ipa_sources = files([\n 'controller/rpi/awb.cpp',\n 'controller/rpi/sharpen.cpp',\n 'controller/rpi/black_level.cpp',\n+ 'controller/rpi/focus.cpp',\n 'controller/rpi/geq.cpp',\n 'controller/rpi/noise.cpp',\n 'controller/rpi/lux.cpp',\n","prefixes":["libcamera-devel"]}