[{"id":31059,"web_url":"https://patchwork.libcamera.org/comment/31059/","msgid":"<20240902183409.GB1995@pendragon.ideasonboard.com>","date":"2024-09-02T18:34:09","subject":"Re: [PATCH v3 04/18] libcamera: ipu3: Formatting improvements","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Milan,\n\nThank you for the patch.\n\nOn Mon, Sep 02, 2024 at 05:41:57PM +0200, Milan Zamazal wrote:\n> The LSP autoformatter doesn't like some of the current formatting, let's\n> make it happier.  Note that not all of its suggestions were accepted\n> because readability is preferred and adjusting .clang-format may not be\n> easy or possible.\n> \n> Signed-off-by: Milan Zamazal <mzamazal@redhat.com>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n>  src/ipa/ipu3/algorithms/agc.cpp      |  2 +-\n>  src/ipa/ipu3/algorithms/blc.cpp      |  4 ++--\n>  src/ipa/ipu3/ipu3.cpp                | 11 ++++++-----\n>  src/libcamera/pipeline/ipu3/ipu3.cpp | 17 +++++++++--------\n>  4 files changed, 18 insertions(+), 16 deletions(-)\n> \n> diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp\n> index 3378c4fd..c5f3d8f0 100644\n> --- a/src/ipa/ipu3/algorithms/agc.cpp\n> +++ b/src/ipa/ipu3/algorithms/agc.cpp\n> @@ -14,6 +14,7 @@\n>  #include <libcamera/base/utils.h>\n>  \n>  #include <libcamera/control_ids.h>\n> +\n>  #include <libcamera/ipa/core_ipa_interface.h>\n>  \n>  #include \"libipa/histogram.h\"\n> @@ -246,7 +247,6 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n>  \tutils::Duration frameDuration = context.configuration.sensor.lineDuration\n>  \t\t\t\t      * vTotal;\n>  \tmetadata.set(controls::FrameDuration, frameDuration.get<std::micro>());\n> -\n>  }\n>  \n>  REGISTER_IPA_ALGORITHM(Agc, \"Agc\")\n> diff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp\n> index 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 */\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index 9dcc89ae..6ebf7c1d 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -24,10 +24,11 @@\n>  \n>  #include <libcamera/control_ids.h>\n>  #include <libcamera/framebuffer.h>\n> +#include <libcamera/request.h>\n> +\n>  #include <libcamera/ipa/ipa_interface.h>\n>  #include <libcamera/ipa/ipa_module_info.h>\n>  #include <libcamera/ipa/ipu3_ipa_interface.h>\n> -#include <libcamera/request.h>\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/*\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 29172f34..430aa902 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -18,12 +18,13 @@\n>  #include <libcamera/camera.h>\n>  #include <libcamera/control_ids.h>\n>  #include <libcamera/formats.h>\n> -#include <libcamera/ipa/ipu3_ipa_interface.h>\n> -#include <libcamera/ipa/ipu3_ipa_proxy.h>\n>  #include <libcamera/property_ids.h>\n>  #include <libcamera/request.h>\n>  #include <libcamera/stream.h>\n>  \n> +#include <libcamera/ipa/ipu3_ipa_interface.h>\n> +#include <libcamera/ipa/ipu3_ipa_proxy.h>\n> +\n>  #include \"libcamera/internal/camera.h\"\n>  #include \"libcamera/internal/camera_lens.h\"\n>  #include \"libcamera/internal/camera_sensor.h\"\n> @@ -1116,19 +1117,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();","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 1FD76BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  2 Sep 2024 18:34:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4120D618FF;\n\tMon,  2 Sep 2024 20:34:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01188618FD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon,  2 Sep 2024 20:34:41 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 66A784CE;\n\tMon,  2 Sep 2024 20:33:30 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"E737CVRD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725302010;\n\tbh=6i6tasf6SCKybrkSoFuGLTJf9vmi7O2erazPwqM34QU=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=E737CVRDUy/ssTTDRVqaTQZu4UToDxdhOAgf1scu4J/Vio3GADTrOHL3tm97Sxkti\n\tVMzahxa+3DOqNITXE3b0OOSk8Yt1oYXDIMvjGRhh0SG6/D5zoTjstmzJ6c9pMEpHNE\n\t2i/BWNJA1EQ6GS/j0y4FzL1H6JF7voR99YjSiWpQ=","Date":"Mon, 2 Sep 2024 21:34:09 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Milan Zamazal <mzamazal@redhat.com>","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v3 04/18] libcamera: ipu3: Formatting improvements","Message-ID":"<20240902183409.GB1995@pendragon.ideasonboard.com>","References":"<20240902154212.1281257-1-mzamazal@redhat.com>\n\t<20240902154212.1281257-5-mzamazal@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240902154212.1281257-5-mzamazal@redhat.com>","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]