{"id":21109,"url":"https://patchwork.libcamera.org/api/1.1/patches/21109/?format=json","web_url":"https://patchwork.libcamera.org/patch/21109/","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":"<20240830152721.1420313-7-mzamazal@redhat.com>","date":"2024-08-30T15:27:03","name":"[v2,06/20] libcamera: rkisp1: Formatting improvements","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"deb3e73034db531b218d57004020940ab17051e4","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21109/mbox/","series":[{"id":4552,"url":"https://patchwork.libcamera.org/api/1.1/series/4552/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4552","date":"2024-08-30T15:26:57","name":"Remove unused includes","version":2,"mbox":"https://patchwork.libcamera.org/series/4552/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21109/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21109/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 0947FC32D7\n\tfor ;\n\tFri, 30 Aug 2024 15:27:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4EF26634DD;\n\tFri, 30 Aug 2024 17:27:48 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8DA1C634CD\n\tfor ;\n\tFri, 30 Aug 2024 17:27:40 +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-609-W8HZjzsuOZOCehhDV3wvvA-1;\n\tFri, 30 Aug 2024 11:27:38 -0400","from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.17])\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\n\tid 518911955BFE for ;\n\tFri, 30 Aug 2024 15:27:37 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.65])\n\tby mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 3975D1956048; Fri, 30 Aug 2024 15:27:35 +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=\"ZrHs/hF4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1725031659;\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=pGplRR87kOfW0wQVbOTmZ8UmxjSQD6qIhfe6qeyQVvo=;\n\tb=ZrHs/hF4RnHLrB//KArwILwTbqDABRnFMJiFii3o/QXx8tqK2t13k1KbbPq5PMPHKiL/JR\n\tcvNpRtbc0/Z1Y+0sQsfKs7Z/NlHfbPe02QNkMAReySDu5Ras6WBhZC9XxG3ZHN6FBS1jJq\n\tsbRoF4oMvaaMIoTZeHstjIVkPlzojnY=","X-MC-Unique":"W8HZjzsuOZOCehhDV3wvvA-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[PATCH v2 06/20] libcamera: rkisp1: Formatting improvements","Date":"Fri, 30 Aug 2024 17:27:03 +0200","Message-ID":"<20240830152721.1420313-7-mzamazal@redhat.com>","In-Reply-To":"<20240830152721.1420313-1-mzamazal@redhat.com>","References":"<20240830152721.1420313-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.17","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":"The LSP autoformatter doesn't like some of the current formatting, let's\nmake it happy.\n\nSigned-off-by: Milan Zamazal \n---\n src/ipa/rkisp1/algorithms/awb.cpp | 18 +++++++++---------\n src/ipa/rkisp1/algorithms/dpf.cpp | 4 ++--\n src/ipa/rkisp1/rkisp1.cpp | 20 +++++++++++---------\n 3 files changed, 22 insertions(+), 20 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\nindex a5972015..35435fe2 100644\n--- a/src/ipa/rkisp1/algorithms/awb.cpp\n+++ b/src/ipa/rkisp1/algorithms/awb.cpp\n@@ -12,6 +12,7 @@\n #include \n \n #include \n+\n #include \n \n /**\n@@ -209,10 +210,9 @@ void Awb::process(IPAContext &context,\n \tdouble blueMean;\n \n \tmetadata.set(controls::AwbEnable, frameContext.awb.autoEnabled);\n-\tmetadata.set(controls::ColourGains, {\n-\t\t\tstatic_cast(frameContext.awb.gains.red),\n-\t\t\tstatic_cast(frameContext.awb.gains.blue)\n-\t\t});\n+\tmetadata.set(controls::ColourGains,\n+\t\t { static_cast(frameContext.awb.gains.red),\n+\t\t static_cast(frameContext.awb.gains.blue) });\n \n \tif (rgbMode_) {\n \t\tgreenMean = awb->awb_mean[0].mean_y_or_g;\n@@ -305,11 +305,11 @@ void Awb::process(IPAContext &context,\n \tactiveState.awb.gains.automatic.green = 1.0;\n \n \tLOG(RkISP1Awb, Debug) << std::showpoint\n-\t\t<< \"Means [\" << redMean << \", \" << greenMean << \", \" << blueMean\n-\t\t<< \"], gains [\" << activeState.awb.gains.automatic.red << \", \"\n-\t\t<< activeState.awb.gains.automatic.green << \", \"\n-\t\t<< activeState.awb.gains.automatic.blue << \"], temp \"\n-\t\t<< activeState.awb.temperatureK << \"K\";\n+\t\t\t << \"Means [\" << redMean << \", \" << greenMean << \", \" << blueMean\n+\t\t\t << \"], gains [\" << activeState.awb.gains.automatic.red << \", \"\n+\t\t\t << activeState.awb.gains.automatic.green << \", \"\n+\t\t\t << activeState.awb.gains.automatic.blue << \"], temp \"\n+\t\t\t << activeState.awb.temperatureK << \"K\";\n }\n \n REGISTER_IPA_ALGORITHM(Awb, \"Awb\")\ndiff --git a/src/ipa/rkisp1/algorithms/dpf.cpp b/src/ipa/rkisp1/algorithms/dpf.cpp\nindex 94080b28..ef1f25d7 100644\n--- a/src/ipa/rkisp1/algorithms/dpf.cpp\n+++ b/src/ipa/rkisp1/algorithms/dpf.cpp\n@@ -116,8 +116,8 @@ int Dpf::init([[maybe_unused]] IPAContext &context,\n \t}\n \n \tconfig_.rb_flt.fltsize = values.size() == RKISP1_CIF_ISP_DPF_MAX_SPATIAL_COEFFS\n-\t\t\t ? RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9\n-\t\t\t : RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_9x9;\n+\t\t\t\t\t ? RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_13x9\n+\t\t\t\t\t : RKISP1_CIF_ISP_DPF_RB_FILTERSIZE_9x9;\n \n \tstd::copy_n(values.begin(), values.size(),\n \t\t std::begin(config_.rb_flt.spatial_coeff));\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 55269579..3c13c82e 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -17,10 +17,11 @@\n \n #include \n #include \n+#include \n+\n #include \n #include \n #include \n-#include \n \n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n@@ -162,8 +163,8 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,\n \t\treturn -ENODEV;\n \t}\n \n-\tcontext_.configuration.sensor.lineDuration = sensorInfo.minLineLength\n-\t\t\t\t\t\t * 1.0s / sensorInfo.pixelRate;\n+\tcontext_.configuration.sensor.lineDuration =\n+\t\tsensorInfo.minLineLength * 1.0s / sensorInfo.pixelRate;\n \n \t/* Load the tuning data file. */\n \tFile file(settings.configurationFile);\n@@ -264,12 +265,13 @@ int IPARkISP1::configure(const IPAConfigInfo &ipaConfig,\n \tcontext_.configuration.sensor.maxAnalogueGain =\n \t\tcontext_.camHelper->gain(maxGain);\n \n-\tcontext_.configuration.raw = std::any_of(streamConfig.begin(), streamConfig.end(),\n-\t\t[](auto &cfg) -> bool {\n-\t\t\tPixelFormat pixelFormat{ cfg.second.pixelFormat };\n-\t\t\tconst PixelFormatInfo &format = PixelFormatInfo::info(pixelFormat);\n-\t\t\treturn format.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n-\t\t});\n+\tcontext_.configuration.raw =\n+\t\tstd::any_of(streamConfig.begin(), streamConfig.end(),\n+\t\t\t [](auto &cfg) -> bool {\n+\t\t\t\t PixelFormat pixelFormat{ cfg.second.pixelFormat };\n+\t\t\t\t const PixelFormatInfo &format = PixelFormatInfo::info(pixelFormat);\n+\t\t\t\t return format.colourEncoding == PixelFormatInfo::ColourEncodingRAW;\n+\t\t\t });\n \n \tfor (auto const &a : algorithms()) {\n \t\tAlgorithm *algo = static_cast(a.get());\n","prefixes":["v2","06/20"]}