{"id":21107,"url":"https://patchwork.libcamera.org/api/1.1/patches/21107/?format=json","web_url":"https://patchwork.libcamera.org/patch/21107/","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-5-mzamazal@redhat.com>","date":"2024-08-30T15:27:01","name":"[v2,04/20] libcamera: ipu3: Formatting improvements","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3acddb6dc9ca29add4418008c0c1bd550a076aa1","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/21107/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/21107/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21107/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 BCF0DC32C2\n\tfor ;\n\tFri, 30 Aug 2024 15:27:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4E018634E1;\n\tFri, 30 Aug 2024 17:27:45 +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 0446863471\n\tfor ;\n\tFri, 30 Aug 2024 17:27:39 +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-114-8ItqOCIrPa6UJlEjEke0pQ-1;\n\tFri, 30 Aug 2024 11:27:34 -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 0FE2B1955BEF for ;\n\tFri, 30 Aug 2024 15:27:34 +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 A569F1956048; Fri, 30 Aug 2024 15:27:32 +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=\"KdM87X36\"; 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=ywSY6p4fFmH8QIDlsFFlK08JzmSG6iwY6VoDTSN2CvM=;\n\tb=KdM87X36URtxO0UqhYEK6zJChhOh0FH1zWYAiNUSXyzQ4aO9AdzGMwuU8pitPh27BRkgxn\n\tiJtOE2Xv7Sz8zlCbwVqv7OUfr0R+wQDC7Y9P4QIN4fN5+XsxIg4IE+41cIShlcoI6s0BBH\n\txnzT1ibjGeEsd08yYMXzWSHlJ01qxTA=","X-MC-Unique":"8ItqOCIrPa6UJlEjEke0pQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[PATCH v2 04/20] libcamera: ipu3: Formatting improvements","Date":"Fri, 30 Aug 2024 17:27:01 +0200","Message-ID":"<20240830152721.1420313-5-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/ipu3/algorithms/agc.cpp | 31 ++++++++++-----------\n src/ipa/ipu3/algorithms/blc.cpp | 4 +--\n src/ipa/ipu3/ipu3.cpp | 11 ++++----\n src/libcamera/pipeline/ipu3/ipu3.cpp | 40 +++++++++++++++-------------\n 4 files changed, 45 insertions(+), 41 deletions(-)","diff":"diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\nindex 3378c4fd..548b64a4 100644\n--- a/src/ipa/ipu3/algorithms/agc.cpp\n+++ b/src/ipa/ipu3/algorithms/agc.cpp\n@@ -14,6 +14,7 @@\n #include \n \n #include \n+\n #include \n \n #include \"libipa/histogram.h\"\n@@ -136,11 +137,9 @@ Histogram Agc::parseStatistics(const ipu3_uapi_stats_3a *stats,\n \t\t\t\treinterpret_cast(\n \t\t\t\t\t&stats->awb_raw_buffer.meta_data[cellPosition]);\n \n-\t\t\trgbTriples_.push_back({\n-\t\t\t\tcell->R_avg,\n-\t\t\t\t(cell->Gr_avg + cell->Gb_avg) / 2,\n-\t\t\t\tcell->B_avg\n-\t\t\t});\n+\t\t\trgbTriples_.push_back({ cell->R_avg,\n+\t\t\t\t\t\t(cell->Gr_avg + cell->Gb_avg) / 2,\n+\t\t\t\t\t\tcell->B_avg });\n \n \t\t\t/*\n \t\t\t * Store the average green value to estimate the\n@@ -184,9 +183,10 @@ double Agc::estimateLuminance(double gain) const\n \t\tblueSum += std::min(std::get<2>(rgbTriples_[i]) * gain, 255.0);\n \t}\n \n-\tdouble ySum = redSum * rGain_ * 0.299\n-\t\t + greenSum * gGain_ * 0.587\n-\t\t + blueSum * bGain_ * 0.114;\n+\tdouble ySum =\n+\t\tredSum * rGain_ * 0.299 +\n+\t\tgreenSum * gGain_ * 0.587 +\n+\t\tblueSum * bGain_ * 0.114;\n \n \treturn ySum / (bdsGrid_.height * bdsGrid_.width) / 255;\n }\n@@ -216,8 +216,8 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \t * The Agc algorithm needs to know the effective exposure value that was\n \t * applied to the sensor when the statistics were collected.\n \t */\n-\tutils::Duration exposureTime = context.configuration.sensor.lineDuration\n-\t\t\t\t * frameContext.sensor.exposure;\n+\tutils::Duration exposureTime =\n+\t\tcontext.configuration.sensor.lineDuration * frameContext.sensor.exposure;\n \tdouble analogueGain = frameContext.sensor.gain;\n \tutils::Duration effectiveExposureValue = exposureTime * analogueGain;\n \n@@ -241,12 +241,13 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \tmetadata.set(controls::ExposureTime, exposureTime.get());\n \n \t/* \\todo Use VBlank value calculated from each frame exposure. */\n-\tuint32_t vTotal = context.configuration.sensor.size.height\n-\t\t\t+ context.configuration.sensor.defVBlank;\n-\tutils::Duration frameDuration = context.configuration.sensor.lineDuration\n-\t\t\t\t * vTotal;\n+\tuint32_t vTotal =\n+\t\tcontext.configuration.sensor.size.height +\n+\t\tcontext.configuration.sensor.defVBlank;\n+\tutils::Duration frameDuration =\n+\t\tcontext.configuration.sensor.lineDuration *\n+\t\tvTotal;\n \tmetadata.set(controls::FrameDuration, frameDuration.get());\n-\n }\n \n REGISTER_IPA_ALGORITHM(Agc, \"Agc\")\ndiff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp\nindex fa4b9272..35748fb2 100644\n--- a/src/ipa/ipu3/algorithms/blc.cpp\n+++ b/src/ipa/ipu3/algorithms/blc.cpp\n@@ -55,8 +55,8 @@ void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context,\n \t * tuning processes. This is a first rough approximation.\n \t */\n \tparams->obgrid_param.gr = 64;\n-\tparams->obgrid_param.r = 64;\n-\tparams->obgrid_param.b = 64;\n+\tparams->obgrid_param.r = 64;\n+\tparams->obgrid_param.b = 64;\n \tparams->obgrid_param.gb = 64;\n \n \t/* Enable the custom black level correction processing */\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 656c51fc..e6b2b5bb 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -24,10 +24,11 @@\n \n #include \n #include \n+#include \n+\n #include \n #include \n #include \n-#include \n \n #include \"libcamera/internal/mapped_framebuffer.h\"\n #include \"libcamera/internal/yaml_parser.h\"\n@@ -308,8 +309,8 @@ int IPAIPU3::init(const IPASettings &settings,\n \n \t/* Clean context */\n \tcontext_.configuration = {};\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@@ -472,8 +473,8 @@ int IPAIPU3::configure(const IPAConfigInfo &configInfo,\n \tcontext_.frameContexts.clear();\n \n \t/* Initialise the sensor configuration. */\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 \tcontext_.configuration.sensor.size = sensorInfo_.outputSize;\n \n \t/*\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 29172f34..6b4fe486 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -18,12 +18,13 @@\n #include \n #include \n #include \n-#include \n-#include \n #include \n #include \n #include \n \n+#include \n+#include \n+\n #include \"libcamera/internal/camera.h\"\n #include \"libcamera/internal/camera_lens.h\"\n #include \"libcamera/internal/camera_sensor.h\"\n@@ -417,9 +418,9 @@ PipelineHandlerIPU3::generateConfiguration(Camera *camera, Spanresolution().shrunkBy({ 1, 1 })\n-\t\t\t\t\t .alignedDownTo(ImgUDevice::kOutputMarginWidth,\n-\t\t\t\t\t\t\t ImgUDevice::kOutputMarginHeight);\n+\tSize minSize = sensor->resolution()\n+\t\t\t .shrunkBy({ 1, 1 })\n+\t\t\t .alignedDownTo(ImgUDevice::kOutputMarginWidth,\n+\t\t\t\t\t ImgUDevice::kOutputMarginHeight);\n \n \t/*\n \t * Either the smallest margin-aligned size larger than the viewfinder\n \t * size or the adjusted sensor resolution.\n \t */\n \tminSize = kViewfinderSize.grownBy({ 1, 1 })\n-\t\t\t\t .alignedUpTo(ImgUDevice::kOutputMarginWidth,\n-\t\t\t\t\t ImgUDevice::kOutputMarginHeight)\n-\t\t\t\t .boundedTo(minSize);\n+\t\t\t .alignedUpTo(ImgUDevice::kOutputMarginWidth,\n+\t\t\t\t ImgUDevice::kOutputMarginHeight)\n+\t\t\t .boundedTo(minSize);\n \n \t/*\n \t * Re-scale in the sensor's native coordinates. Report (0,0) as\n@@ -1116,19 +1118,19 @@ int PipelineHandlerIPU3::registerCameras()\n \t\t * returned through the ImgU main and secondary outputs.\n \t\t */\n \t\tdata->cio2_.bufferReady().connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::cio2BufferReady);\n+\t\t\t\t\t\t &IPU3CameraData::cio2BufferReady);\n \t\tdata->cio2_.bufferAvailable.connect(\n \t\t\tdata.get(), &IPU3CameraData::queuePendingRequests);\n \t\tdata->imgu_->input_->bufferReady.connect(&data->cio2_,\n-\t\t\t\t\t&CIO2Device::tryReturnBuffer);\n+\t\t\t\t\t\t\t &CIO2Device::tryReturnBuffer);\n \t\tdata->imgu_->output_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n+\t\t\t\t\t\t\t &IPU3CameraData::imguOutputBufferReady);\n \t\tdata->imgu_->viewfinder_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::imguOutputBufferReady);\n+\t\t\t\t\t\t\t &IPU3CameraData::imguOutputBufferReady);\n \t\tdata->imgu_->param_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::paramBufferReady);\n+\t\t\t\t\t\t\t &IPU3CameraData::paramBufferReady);\n \t\tdata->imgu_->stat_->bufferReady.connect(data.get(),\n-\t\t\t\t\t&IPU3CameraData::statBufferReady);\n+\t\t\t\t\t\t\t&IPU3CameraData::statBufferReady);\n \n \t\t/* Create and register the Camera instance. */\n \t\tconst std::string &cameraId = cio2->sensor()->id();\n","prefixes":["v2","04/20"]}