{"id":20550,"url":"https://patchwork.libcamera.org/api/patches/20550/?format=json","web_url":"https://patchwork.libcamera.org/patch/20550/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240703175119.1872585-10-mzamazal@redhat.com>","date":"2024-07-03T17:51:09","name":"[v2,09/19] libcamera: software_isp: Create algorithms","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"462453e36b62fe810ba40f80e63a71e5785b5260","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20550/mbox/","series":[{"id":4440,"url":"https://patchwork.libcamera.org/api/series/4440/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4440","date":"2024-07-03T17:51:00","name":"Software ISP refactoring","version":2,"mbox":"https://patchwork.libcamera.org/series/4440/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20550/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20550/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 41AC9BEFBE\n\tfor ;\n\tWed, 3 Jul 2024 17:51:58 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A5E2363331;\n\tWed, 3 Jul 2024 19:51:56 +0200 (CEST)","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 7164A6333F\n\tfor ;\n\tWed, 3 Jul 2024 19:51:47 +0200 (CEST)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-490-2LbwXxuYN4Su9imKr6ZXSA-1;\n\tWed, 03 Jul 2024 13:51:45 -0400","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.12])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 1FA811955BC2; Wed, 3 Jul 2024 17:51:44 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.224.13])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id A7E831954B0E; Wed, 3 Jul 2024 17:51:42 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"PuucoWtb\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1720029106;\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\tin-reply-to:in-reply-to:references:references;\n\tbh=/6BCnKnHWS97PmlRW52YeLNopayab9Iq9rGegxGF62o=;\n\tb=PuucoWtbSv3BExLW/wXLVn9GFC8PiCnSHGjnGUKoVXyXReehz68+yC007EftNcSN5fCVmd\n\t7ll4K8WZwnajHTt0XOf8/72ZZUv7MIREnY4iy55MusfM/+lLi0wDgMiMhpwu1U5DzYCp7K\n\tk1UvAQR2q6CoVmK6BNXKRe2SWIGYZkI=","X-MC-Unique":"2LbwXxuYN4Su9imKr6ZXSA-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tUmang Jain ","Subject":"[PATCH v2 09/19] libcamera: software_isp: Create algorithms","Date":"Wed, 3 Jul 2024 19:51:09 +0200","Message-ID":"<20240703175119.1872585-10-mzamazal@redhat.com>","In-Reply-To":"<20240703175119.1872585-1-mzamazal@redhat.com>","References":"<20240703175119.1872585-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","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":"We are ready to introduce algorithms now. First, let's create\nalgorithms. The algorithms are not called yet, calls to them will be\nadded in followup patches.\n\nThe maximum number of contexts is set to the same value as in hardware\npipelines.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Umang Jain \n---\n src/ipa/simple/algorithms/meson.build | 4 ++++\n src/ipa/simple/data/uncalibrated.yaml | 1 +\n src/ipa/simple/meson.build | 7 +++++--\n src/ipa/simple/soft_simple.cpp | 14 ++++++++++++++\n 4 files changed, 24 insertions(+), 2 deletions(-)\n create mode 100644 src/ipa/simple/algorithms/meson.build","diff":"diff --git a/src/ipa/simple/algorithms/meson.build b/src/ipa/simple/algorithms/meson.build\nnew file mode 100644\nindex 00000000..31d26e43\n--- /dev/null\n+++ b/src/ipa/simple/algorithms/meson.build\n@@ -0,0 +1,4 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+soft_simple_ipa_algorithms = files([\n+])\ndiff --git a/src/ipa/simple/data/uncalibrated.yaml b/src/ipa/simple/data/uncalibrated.yaml\nindex ff981a1a..2cdc39a8 100644\n--- a/src/ipa/simple/data/uncalibrated.yaml\n+++ b/src/ipa/simple/data/uncalibrated.yaml\n@@ -2,4 +2,5 @@\n %YAML 1.1\n ---\n version: 1\n+algorithms:\n ...\ndiff --git a/src/ipa/simple/meson.build b/src/ipa/simple/meson.build\nindex 363251fb..7515a8d8 100644\n--- a/src/ipa/simple/meson.build\n+++ b/src/ipa/simple/meson.build\n@@ -1,5 +1,8 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+subdir('algorithms')\n+subdir('data')\n+\n ipa_name = 'ipa_soft_simple'\n \n soft_simple_sources = files([\n@@ -8,6 +11,8 @@ soft_simple_sources = files([\n 'black_level.cpp',\n ])\n \n+soft_simple_sources += soft_simple_ipa_algorithms\n+\n mod = shared_module(ipa_name,\n [soft_simple_sources, libcamera_generated_ipa_headers],\n name_prefix : '',\n@@ -25,6 +30,4 @@ if ipa_sign_module\n build_by_default : true)\n endif\n \n-subdir('data')\n-\n ipa_names += ipa_name\ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex 09e3c8f6..dd300387 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -53,12 +53,15 @@ static constexpr float kExposureOptimal = kExposureBinsCount / 2.0;\n * enough to prevent the exposure from wobbling around the optimal value.\n */\n static constexpr float kExposureSatisfactory = 0.2;\n+/* Maximum number of frame contexts to be held */\n+static constexpr uint32_t kMaxFrameContexts = 16;\n \n class IPASoftSimple : public ipa::soft::IPASoftInterface, public Module\n {\n public:\n \tIPASoftSimple()\n \t\t: params_(nullptr), stats_(nullptr), blackLevel_(BlackLevel()),\n+\t\t context_({ {}, {}, { kMaxFrameContexts } }),\n \t\t ignoreUpdates_(0)\n \t{\n \t}\n@@ -92,6 +95,8 @@ private:\n \tstatic constexpr unsigned int kGammaLookupSize = 1024;\n \tstd::array gammaTable_;\n \tint lastBlackLevel_ = -1;\n+\t/* Local parameter storage */\n+\tstruct IPAContext context_;\n \n \tint32_t exposureMin_, exposureMax_;\n \tint32_t exposure_;\n@@ -138,6 +143,15 @@ int IPASoftSimple::init(const IPASettings &settings,\n \tunsigned int version = (*data)[\"version\"].get(0);\n \tLOG(IPASoft, Debug) << \"Tuning file version \" << version;\n \n+\tif (!data->contains(\"algorithms\")) {\n+\t\tLOG(IPASoft, Error) << \"Tuning file doesn't contain algorithms\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tint ret = createAlgorithms(context_, (*data)[\"algorithms\"]);\n+\tif (ret)\n+\t\treturn ret;\n+\n \tparams_ = nullptr;\n \tstats_ = nullptr;\n \n","prefixes":["v2","09/19"]}