{"id":18479,"url":"https://patchwork.libcamera.org/api/1.1/patches/18479/?format=json","web_url":"https://patchwork.libcamera.org/patch/18479/","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":"<20230327122030.11756-11-naush@raspberrypi.com>","date":"2023-03-27T12:20:30","name":"[libcamera-devel,v2,10/10] ipa: raspberrypi: Remove the focus reporting algorithm","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2e29972293d4f6b079bf9589bfd05c8a6a28b3a2","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/18479/mbox/","series":[{"id":3819,"url":"https://patchwork.libcamera.org/api/1.1/series/3819/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3819","date":"2023-03-27T12:20:20","name":"Raspberry Pi: Generalised algorithms","version":2,"mbox":"https://patchwork.libcamera.org/series/3819/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18479/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18479/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 33779C32A0\n\tfor ;\n\tMon, 27 Mar 2023 12:20:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B75046278B;\n\tMon, 27 Mar 2023 14:20:55 +0200 (CEST)","from mail-io1-xd30.google.com (mail-io1-xd30.google.com\n\t[IPv6:2607:f8b0:4864:20::d30])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B78A6276A\n\tfor ;\n\tMon, 27 Mar 2023 14:20:52 +0200 (CEST)","by mail-io1-xd30.google.com with SMTP id d14so3784998ion.9\n\tfor ;\n\tMon, 27 Mar 2023 05:20:52 -0700 (PDT)","from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tr7-20020a5edb47000000b00758ff97aaedsm3239026iop.16.2023.03.27.05.20.50\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 27 Mar 2023 05:20:51 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1679919655;\n\tbh=I+GJeNia0yCq893YG/WPqw5ionNfPpft/qbqOyAt4ew=;\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=g7vz9Ak86zExOVDQbpC9xJFM9ba3Vpwqk89u3d5ihbxNio3CeXleFmy0o7G6wswR2\n\th71XuRfRspZJPow0sCtyO9sC1lQJqCeBt5MCpaEmCmNZFkY/5oqcW7oLNhFLNuYNP2\n\tzZ+2AwdVpgrPI34iDFp7xsNnRIGqSpVDyd7keuwNk46UaxHkfYrYNV4opa4XWMy3ib\n\tvkRZhMAgVoW+Cw5hM9OtSAgpwkxN0IUPF0mcHTemq7ICf5u59GaTGsHBNjEWgaVLKV\n\tx+xybbT869BJ20+OnYAx+89A5S1ju5bYw50o9Jnl+Xb3FEuVDxEbnC9Ff9Q3WmmIT6\n\tY5O9V+p0ltQbA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1679919652;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=gCzt2lkm41Vsp+5UNwKr7yvk6OMuYLjlo17eIpDSEa8=;\n\tb=P75iVoblhdiGehWMQ9j4cIUDqhkr/Kosn+7YFxV1vC6putKODLIHMEXjPE6zWw5564\n\tgYA0IfrBlYlgTOtSqEYET3FJF6tnIBNde5VRLWKE1qJ7eY0ISz8+EADvce8YouQfIYli\n\tEk0ntQjoD4rMz/heCzniZmm/bHMyrKCtJKTRSgJiPFQ05MkcBY1yv+DnshZoMzmiR3ML\n\tc+3MPjiGUuyfJi0l/lmKTJ899XMS/2PxBLlBZne3Z7wi9pSgxEgAmhcMXWUThj1w6k9K\n\tkJMeFxNvI21om8Y/Y2Egm+h7ov7n6UrC8piGfoY8+Yv3L02hhKRFfh/iIeykdbZisk9m\n\tuI6w=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"P75iVobl\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112; t=1679919652;\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\t:subject:date:message-id:reply-to;\n\tbh=gCzt2lkm41Vsp+5UNwKr7yvk6OMuYLjlo17eIpDSEa8=;\n\tb=LTV5RaDA3aH/p1acsAuYH2ValbWpM46NmbC6S62zUIDjN+Xd09L/qMcGELS/ZTl4l8\n\tAw2d78OJTzpQYCcjDwDSRGFe8I5huFi8LE640APvtIynzmURwZVMn9CczFIezBjlP4He\n\tRbDQQxfPijmbTrkixXVtjYlcaf93C7cm2gE3KwydEgRQqPlBrKc1HFVTiKnCPC78XBNt\n\teidTcOsz+8uGQOc5FuO1WAEhmgIXd4cF7N7vMrB6ETU0aMHG3F7xy6W+q18dX8MJImcv\n\tjcQIfmxfEBKZHS242YYMPG+mfJqsUoamwpSQeFUOQElBGvzjvSwmXnEXoxNDU4gUicxw\n\taSSQ==","X-Gm-Message-State":"AO0yUKVFjbpnaZm6HmbSK1R3kLy8ovGZlxFcD+se+6sHiFxWgt+Ttyof\n\tTltqnFrX4JVpLw3ZywCbFYBlmTliwQ6M4HaN0VJHLQ==","X-Google-Smtp-Source":"AK7set/scNFAwKnbx7lLY9se+Sy9BXdj238sT+f02zzNL/sMn5Lw1z5F0cJmRuFPLRb/rMLg5qGfeg==","X-Received":"by 2002:a5d:9d8d:0:b0:753:2226:952f with SMTP id\n\tay13-20020a5d9d8d000000b007532226952fmr13274248iob.0.1679919651660; \n\tMon, 27 Mar 2023 05:20:51 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 27 Mar 2023 13:20:30 +0100","Message-Id":"<20230327122030.11756-11-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20230327122030.11756-1-naush@raspberrypi.com>","References":"<20230327122030.11756-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 10/10] ipa: raspberrypi: Remove the\n\tfocus reporting 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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Update the IPA focus reporting code to use the generalised statistics\nRegion structure.\n\nRemove the focus reporting algorithm as the functionality is duplicated\nthis bit of IPA code. Remove focus_status.h as it is no longer needed.\n\nSigned-off-by: Naushir Patuck \n---\n src/ipa/raspberrypi/controller/focus_status.h | 20 --------\n src/ipa/raspberrypi/controller/rpi/af.h | 1 -\n src/ipa/raspberrypi/controller/rpi/focus.cpp | 49 -------------------\n src/ipa/raspberrypi/data/imx290.json | 3 --\n src/ipa/raspberrypi/data/imx296.json | 3 --\n src/ipa/raspberrypi/data/imx296_mono.json | 3 --\n src/ipa/raspberrypi/data/imx477.json | 3 --\n src/ipa/raspberrypi/data/imx477_noir.json | 3 --\n .../raspberrypi/data/imx477_scientific.json | 3 --\n src/ipa/raspberrypi/data/imx477_v1.json | 3 --\n src/ipa/raspberrypi/data/imx708.json | 3 --\n src/ipa/raspberrypi/data/imx708_noir.json | 3 --\n src/ipa/raspberrypi/data/imx708_wide.json | 3 --\n .../raspberrypi/data/imx708_wide_noir.json | 3 --\n src/ipa/raspberrypi/meson.build | 1 -\n src/ipa/raspberrypi/raspberrypi.cpp | 16 ++++--\n 16 files changed, 11 insertions(+), 109 deletions(-)\n delete mode 100644 src/ipa/raspberrypi/controller/focus_status.h\n delete mode 100644 src/ipa/raspberrypi/controller/rpi/focus.cpp","diff":"diff --git a/src/ipa/raspberrypi/controller/focus_status.h b/src/ipa/raspberrypi/controller/focus_status.h\ndeleted file mode 100644\nindex 8b74e59840c1..000000000000\n--- a/src/ipa/raspberrypi/controller/focus_status.h\n+++ /dev/null\n@@ -1,20 +0,0 @@\n-/* SPDX-License-Identifier: BSD-2-Clause */\n-/*\n- * Copyright (C) 2020, Raspberry Pi Ltd\n- *\n- * focus_status.h - focus measurement status\n- */\n-#pragma once\n-\n-#include \n-\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-\n-struct FocusStatus {\n-\tunsigned int num;\n-\tuint32_t focusMeasures[FOCUS_REGIONS];\n-};\ndiff --git a/src/ipa/raspberrypi/controller/rpi/af.h b/src/ipa/raspberrypi/controller/rpi/af.h\nindex b479feb88c39..6d2bae671a22 100644\n--- a/src/ipa/raspberrypi/controller/rpi/af.h\n+++ b/src/ipa/raspberrypi/controller/rpi/af.h\n@@ -28,7 +28,6 @@\n * \"nuisance\" scans. During each interval where PDAF is not working, only\n * ONE scan will be performed; CAF cannot track objects using CDAF alone.\n *\n- * This algorithm is unrelated to \"rpi.focus\" which merely reports CDAF FoM.\n */\n \n namespace RPiController {\ndiff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp\ndeleted file mode 100644\nindex ea3cc00e42c3..000000000000\n--- a/src/ipa/raspberrypi/controller/rpi/focus.cpp\n+++ /dev/null\n@@ -1,49 +0,0 @@\n-/* SPDX-License-Identifier: BSD-2-Clause */\n-/*\n- * Copyright (C) 2020, Raspberry Pi Ltd\n- *\n- * focus.cpp - focus algorithm\n- */\n-#include \n-\n-#include \n-\n-#include \"../focus_status.h\"\n-#include \"focus.h\"\n-\n-using namespace RPiController;\n-using namespace libcamera;\n-\n-LOG_DEFINE_CATEGORY(RPiFocus)\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::process(StatisticsPtr &stats, Metadata *imageMetadata)\n-{\n-\tFocusStatus status;\n-\tfor (unsigned int i = 0; i < stats->focusRegions.numRegions(); i++)\n-\t\tstatus.focusMeasures[i] = stats->focusRegions.get(i).val;\n-\tstatus.num = stats->focusRegions.numRegions();\n-\timageMetadata->set(\"focus.status\", status);\n-\n-\tLOG(RPiFocus, Debug)\n-\t\t<< \"Focus contrast measure: \"\n-\t\t<< (status.focusMeasures[5] + status.focusMeasures[6]) / 10;\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/data/imx290.json b/src/ipa/raspberrypi/data/imx290.json\nindex bfb9c6093d26..ace68d0ebf1c 100644\n--- a/src/ipa/raspberrypi/data/imx290.json\n+++ b/src/ipa/raspberrypi/data/imx290.json\n@@ -195,9 +195,6 @@\n }\n ]\n }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx296.json b/src/ipa/raspberrypi/data/imx296.json\nindex 346f5b658957..ae8722c46a85 100644\n--- a/src/ipa/raspberrypi/data/imx296.json\n+++ b/src/ipa/raspberrypi/data/imx296.json\n@@ -532,9 +532,6 @@\n \"strength\": 1.0,\n \"limit\": 0.18\n }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\ndiff --git a/src/ipa/raspberrypi/data/imx296_mono.json b/src/ipa/raspberrypi/data/imx296_mono.json\nindex e9fa30c6a08d..30965b4b8d61 100644\n--- a/src/ipa/raspberrypi/data/imx296_mono.json\n+++ b/src/ipa/raspberrypi/data/imx296_mono.json\n@@ -228,9 +228,6 @@\n \"strength\": 1.0,\n \"limit\": 0.18\n }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\ndiff --git a/src/ipa/raspberrypi/data/imx477.json b/src/ipa/raspberrypi/data/imx477.json\nindex bfc0774ffdfc..daffc268ff43 100644\n--- a/src/ipa/raspberrypi/data/imx477.json\n+++ b/src/ipa/raspberrypi/data/imx477.json\n@@ -513,9 +513,6 @@\n },\n {\n \"rpi.sharpen\": { }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx477_noir.json b/src/ipa/raspberrypi/data/imx477_noir.json\nindex dadd97bc3d78..52d7f072d0ce 100644\n--- a/src/ipa/raspberrypi/data/imx477_noir.json\n+++ b/src/ipa/raspberrypi/data/imx477_noir.json\n@@ -424,9 +424,6 @@\n },\n {\n \"rpi.sharpen\": { }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx477_scientific.json b/src/ipa/raspberrypi/data/imx477_scientific.json\nindex 17c4ed0a5e74..26c692fdbab9 100644\n--- a/src/ipa/raspberrypi/data/imx477_scientific.json\n+++ b/src/ipa/raspberrypi/data/imx477_scientific.json\n@@ -474,9 +474,6 @@\n },\n {\n \"rpi.sharpen\": { }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx477_v1.json b/src/ipa/raspberrypi/data/imx477_v1.json\nindex 5bcaac67069b..d64020091efa 100644\n--- a/src/ipa/raspberrypi/data/imx477_v1.json\n+++ b/src/ipa/raspberrypi/data/imx477_v1.json\n@@ -511,9 +511,6 @@\n },\n {\n \"rpi.sharpen\": { }\n- },\n- {\n- \"rpi.focus\": { }\n }\n ]\n }\n\\ No newline at end of file\ndiff --git a/src/ipa/raspberrypi/data/imx708.json b/src/ipa/raspberrypi/data/imx708.json\nindex c38b2d4cf256..b9830a3bf692 100644\n--- a/src/ipa/raspberrypi/data/imx708.json\n+++ b/src/ipa/raspberrypi/data/imx708.json\n@@ -512,9 +512,6 @@\n {\n \"rpi.sharpen\": { }\n },\n- {\n- \"rpi.focus\": { }\n- },\n {\n \"rpi.af\":\n {\ndiff --git a/src/ipa/raspberrypi/data/imx708_noir.json b/src/ipa/raspberrypi/data/imx708_noir.json\nindex 082274e34c53..075f70355cec 100644\n--- a/src/ipa/raspberrypi/data/imx708_noir.json\n+++ b/src/ipa/raspberrypi/data/imx708_noir.json\n@@ -512,9 +512,6 @@\n {\n \"rpi.sharpen\": { }\n },\n- {\n- \"rpi.focus\": { }\n- },\n {\n \"rpi.af\":\n {\ndiff --git a/src/ipa/raspberrypi/data/imx708_wide.json b/src/ipa/raspberrypi/data/imx708_wide.json\nindex cdc61436995d..b772efee3b96 100644\n--- a/src/ipa/raspberrypi/data/imx708_wide.json\n+++ b/src/ipa/raspberrypi/data/imx708_wide.json\n@@ -403,9 +403,6 @@\n {\n \"rpi.sharpen\": { }\n },\n- {\n- \"rpi.focus\": { }\n- },\n {\n \"rpi.af\":\n {\ndiff --git a/src/ipa/raspberrypi/data/imx708_wide_noir.json b/src/ipa/raspberrypi/data/imx708_wide_noir.json\nindex 8a7f59910833..c5f6b53dca7a 100644\n--- a/src/ipa/raspberrypi/data/imx708_wide_noir.json\n+++ b/src/ipa/raspberrypi/data/imx708_wide_noir.json\n@@ -403,9 +403,6 @@\n {\n \"rpi.sharpen\": { }\n },\n- {\n- \"rpi.focus\": { }\n- },\n {\n \"rpi.af\":\n {\ndiff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build\nindex 9230e17bca22..de78cbd80f9c 100644\n--- a/src/ipa/raspberrypi/meson.build\n+++ b/src/ipa/raspberrypi/meson.build\n@@ -33,7 +33,6 @@ 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',\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex d813b1b7ca61..c7b9b7007ce9 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -50,7 +50,6 @@\n #include \"denoise_algorithm.h\"\n #include \"denoise_status.h\"\n #include \"dpc_status.h\"\n-#include \"focus_status.h\"\n #include \"geq_status.h\"\n #include \"lux_status.h\"\n #include \"metadata.h\"\n@@ -640,14 +639,18 @@ void IPARPi::reportMetadata(unsigned int ipaContext)\n \t\t\t\t\t static_cast(blackLevelStatus->blackLevelG),\n \t\t\t\t\t static_cast(blackLevelStatus->blackLevelB) });\n \n-\tFocusStatus *focusStatus = rpiMetadata.getLocked(\"focus.status\");\n-\tif (focusStatus && focusStatus->num == 12) {\n+\tRPiController::FocusRegions *focusStatus =\n+\t\trpiMetadata.getLocked(\"focus.status\");\n+\tif (focusStatus) {\n+\t\tlibcamera::Size size = focusStatus->size();\n \t\t/*\n \t\t * We get a 4x3 grid of regions by default. Calculate the average\n \t\t * FoM over the central two positions to give an overall scene FoM.\n \t\t * This can change later if it is not deemed suitable.\n \t\t */\n-\t\tint32_t focusFoM = (focusStatus->focusMeasures[5] + focusStatus->focusMeasures[6]) / 2;\n+\t\tASSERT(size == Size(4, 3));\n+\t\tint32_t focusFoM = (focusStatus->get({ 1, 1 }).val +\n+\t\t\t\t focusStatus->get({ 2, 1 }).val) / 2;\n \t\tlibcameraMetadata_.set(controls::FocusFoM, focusFoM);\n \t}\n \n@@ -1426,7 +1429,6 @@ RPiController::StatisticsPtr IPARPi::fillStatistics(bcm2835_isp_stats *stats) co\n \t\tstatistics->focusRegions.set(i, { stats->focus_stats[i].contrast_val[1][1] / 1000,\n \t\t\t\t\t\t stats->focus_stats[i].contrast_val_num[1][1],\n \t\t\t\t\t\t stats->focus_stats[i].contrast_val_num[1][0] });\n-\n \treturn statistics;\n }\n \n@@ -1443,6 +1445,10 @@ void IPARPi::processStats(unsigned int bufferId, unsigned int ipaContext)\n \tSpan mem = it->second.planes()[0];\n \tbcm2835_isp_stats *stats = reinterpret_cast(mem.data());\n \tRPiController::StatisticsPtr statistics = fillStatistics(stats);\n+\n+\t/* Save the focus stats in the metadata structure to report out later. */\n+\trpiMetadata_[ipaContext].set(\"focus.status\", statistics->focusRegions);\n+\n \thelper_->process(statistics, rpiMetadata);\n \tcontroller_.process(statistics, &rpiMetadata);\n \n","prefixes":["libcamera-devel","v2","10/10"]}