From patchwork Thu Mar 10 20:51:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 15439 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 401FBBF415 for ; Thu, 10 Mar 2022 20:51:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id ED0BC632E2; Thu, 10 Mar 2022 21:51:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1646945503; bh=6bRgsnx2Uz4G6N66Zb6iPnZZRza1TY0By0XaUzbovNM=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=13rqmajSCDWAhoZ244LNLJ8l98x1noP9jM8Dlrzo1sX14+IYFhiRV+w9Bw7db3p/O 7hg2V8CiQ912xylzaHx8uDy01vmkarrZBIc6bVUIQyqjxDRMQvjq6NCQAV+BxMAoEr UgkFxiCSDqRr+buig9wrph8Pnh2yoNCA7U5VfBbDky5QMfVOwEqtf/5kQYhCOFCth6 swYxAqj1bdYnilRC022rxQykyYmFVq/zBabLeSlizKde8QS03xF7sNwb/Ver3mVDE3 NOIKVCtyeOK7lhLqdoIYNKBMn8CUkl3ZVztlyIynEAAfy2+c3+Bi+RjRH6V1lzpHoC S5c9enxvdbLTQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 35398601F8 for ; Thu, 10 Mar 2022 21:51:40 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="d6kytAAy"; dkim-atps=neutral Received: from perceval.ideasonboard.com (unknown [103.251.226.203]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 32F90491; Thu, 10 Mar 2022 21:51:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1646945500; bh=6bRgsnx2Uz4G6N66Zb6iPnZZRza1TY0By0XaUzbovNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d6kytAAyTtUHU3yEc9TjdDPJ4vTo1i0uonZqmXc7RQCYnGq8/XNJnMzLfvtLUz8zY baC2dTuuH1t1OrfKYVaLQwOIZFe0WFem26hR5b0eFsZfWMheqGtmGHwg1NPstKV9Gw xXxccpPmxxkdA52Ewqpe2ff4PF2BHTBUDfTpH3zI= To: libcamera-devel@lists.libcamera.org Date: Fri, 11 Mar 2022 02:21:28 +0530 Message-Id: <20220310205130.336361-2-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220310205130.336361-1-umang.jain@ideasonboard.com> References: <20220310205130.336361-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libipa: algorithm: Pass frame number to prepare() and process() X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Umang Jain via libcamera-devel From: Umang Jain Reply-To: Umang Jain Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The frame number will be used to retrieve their respective IPAFrameContext from a container in subsequent commits. Signed-off-by: Umang Jain --- src/ipa/ipu3/algorithms/agc.cpp | 3 ++- src/ipa/ipu3/algorithms/agc.h | 2 +- src/ipa/ipu3/algorithms/awb.cpp | 4 ++-- src/ipa/ipu3/algorithms/awb.h | 4 ++-- src/ipa/ipu3/algorithms/blc.cpp | 6 ++++-- src/ipa/ipu3/algorithms/blc.h | 2 +- src/ipa/ipu3/algorithms/tone_mapping.cpp | 7 +++++-- src/ipa/ipu3/algorithms/tone_mapping.h | 4 ++-- src/ipa/ipu3/ipu3.cpp | 4 ++-- src/ipa/libipa/algorithm.cpp | 2 ++ src/ipa/libipa/algorithm.h | 6 ++++-- 11 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/ipa/ipu3/algorithms/agc.cpp b/src/ipa/ipu3/algorithms/agc.cpp index 1eb1bcef..cdc1327a 100644 --- a/src/ipa/ipu3/algorithms/agc.cpp +++ b/src/ipa/ipu3/algorithms/agc.cpp @@ -315,13 +315,14 @@ double Agc::estimateLuminance(IPAFrameContext &frameContext, /** * \brief Process IPU3 statistics, and run AGC operations + * \param frame The frame number * \param[in] context The shared IPA context * \param[in] stats The IPU3 statistics and ISP results * * Identify the current image brightness, and use that to estimate the optimal * new exposure and gain for the scene. */ -void Agc::process(IPAContext &context, const ipu3_uapi_stats_3a *stats) +void Agc::process(const uint32_t frame, IPAContext &context, const ipu3_uapi_stats_3a *stats) { /* * Estimate the gain needed to have the proportion of pixels in a given diff --git a/src/ipa/ipu3/algorithms/agc.h b/src/ipa/ipu3/algorithms/agc.h index ad705605..e48506e5 100644 --- a/src/ipa/ipu3/algorithms/agc.h +++ b/src/ipa/ipu3/algorithms/agc.h @@ -28,7 +28,7 @@ public: ~Agc() = default; int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; - void process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override; + void process(const uint32_t frame, IPAContext &context, const ipu3_uapi_stats_3a *stats) override; private: double measureBrightness(const ipu3_uapi_stats_3a *stats, diff --git a/src/ipa/ipu3/algorithms/awb.cpp b/src/ipa/ipu3/algorithms/awb.cpp index dc25be81..f1e753e6 100644 --- a/src/ipa/ipu3/algorithms/awb.cpp +++ b/src/ipa/ipu3/algorithms/awb.cpp @@ -387,7 +387,7 @@ void Awb::calculateWBGains(const ipu3_uapi_stats_3a *stats) /** * \copydoc libcamera::ipa::Algorithm::process */ -void Awb::process(IPAContext &context, const ipu3_uapi_stats_3a *stats) +void Awb::process(const uint32_t frame, IPAContext &context, const ipu3_uapi_stats_3a *stats) { calculateWBGains(stats); @@ -411,7 +411,7 @@ constexpr uint16_t Awb::threshold(float value) /** * \copydoc libcamera::ipa::Algorithm::prepare */ -void Awb::prepare(IPAContext &context, ipu3_uapi_params *params) +void Awb::prepare([[maybe_unused]] const uint32_t frame, IPAContext &context, ipu3_uapi_params *params) { /* * Green saturation thresholds are reduced because we are using the diff --git a/src/ipa/ipu3/algorithms/awb.h b/src/ipa/ipu3/algorithms/awb.h index ab4b0a33..ef177a4a 100644 --- a/src/ipa/ipu3/algorithms/awb.h +++ b/src/ipa/ipu3/algorithms/awb.h @@ -39,8 +39,8 @@ public: ~Awb(); int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; - void prepare(IPAContext &context, ipu3_uapi_params *params) override; - void process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override; + void prepare(const uint32_t frame, IPAContext &context, ipu3_uapi_params *params) override; + void process(const uint32_t frame, IPAContext &context, const ipu3_uapi_stats_3a *stats) override; private: /* \todo Make these structs available to all the ISPs ? */ diff --git a/src/ipa/ipu3/algorithms/blc.cpp b/src/ipa/ipu3/algorithms/blc.cpp index 78ab7bff..e9b4bed8 100644 --- a/src/ipa/ipu3/algorithms/blc.cpp +++ b/src/ipa/ipu3/algorithms/blc.cpp @@ -38,14 +38,16 @@ BlackLevelCorrection::BlackLevelCorrection() /** * \brief Fill in the parameter structure, and enable black level correction + * \param frame The frame number * \param context The shared IPA context * \param params The IPU3 parameters * * Populate the IPU3 parameter structure with the correction values for each * channel and enable the corresponding ImgU block processing. */ -void BlackLevelCorrection::prepare([[maybe_unused]] IPAContext &context, - ipu3_uapi_params *params) +void BlackLevelCorrection::prepare([[maybe_unused]] const uint32_t frame, + [[maybe_unused]] IPAContext &context, + ipu3_uapi_params *params) { /* * The Optical Black Level correction values diff --git a/src/ipa/ipu3/algorithms/blc.h b/src/ipa/ipu3/algorithms/blc.h index d8da1748..e4c22070 100644 --- a/src/ipa/ipu3/algorithms/blc.h +++ b/src/ipa/ipu3/algorithms/blc.h @@ -18,7 +18,7 @@ class BlackLevelCorrection : public Algorithm public: BlackLevelCorrection(); - void prepare(IPAContext &context, ipu3_uapi_params *params) override; + void prepare(const uint32_t frame, IPAContext &context, ipu3_uapi_params *params) override; }; } /* namespace ipa::ipu3::algorithms */ diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp index 2040eda5..bba5bc9a 100644 --- a/src/ipa/ipu3/algorithms/tone_mapping.cpp +++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp @@ -49,13 +49,15 @@ int ToneMapping::configure(IPAContext &context, /** * \brief Fill in the parameter structure, and enable gamma control + * \param frame The frame number * \param context The shared IPA context * \param params The IPU3 parameters * * Populate the IPU3 parameter structure with our tone mapping look up table and * enable the gamma control module in the processing blocks. */ -void ToneMapping::prepare([[maybe_unused]] IPAContext &context, +void ToneMapping::prepare([[maybe_unused]] const uint32_t frame, + [[maybe_unused]] IPAContext &context, ipu3_uapi_params *params) { /* Copy the calculated LUT into the parameters buffer. */ @@ -71,13 +73,14 @@ void ToneMapping::prepare([[maybe_unused]] IPAContext &context, /** * \brief Calculate the tone mapping look up table + * \param frame The frame number * \param context The shared IPA context * \param stats The IPU3 statistics and ISP results * * The tone mapping look up table is generated as an inverse power curve from * our gamma setting. */ -void ToneMapping::process(IPAContext &context, +void ToneMapping::process(const uint32_t frame, IPAContext &context, [[maybe_unused]] const ipu3_uapi_stats_3a *stats) { /* diff --git a/src/ipa/ipu3/algorithms/tone_mapping.h b/src/ipa/ipu3/algorithms/tone_mapping.h index b727ab1e..041c9c0d 100644 --- a/src/ipa/ipu3/algorithms/tone_mapping.h +++ b/src/ipa/ipu3/algorithms/tone_mapping.h @@ -19,8 +19,8 @@ public: ToneMapping(); int configure(IPAContext &context, const IPAConfigInfo &configInfo) override; - void prepare(IPAContext &context, ipu3_uapi_params *params) override; - void process(IPAContext &context, const ipu3_uapi_stats_3a *stats) override; + void prepare(const uint32_t frame, IPAContext &context, ipu3_uapi_params *params) override; + void process(const uint32_t frame, IPAContext &context, const ipu3_uapi_stats_3a *stats) override; private: double gamma_; diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 8f079588..81788b9a 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -573,7 +573,7 @@ void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params) params->use = {}; for (auto const &algo : algorithms_) - algo->prepare(context_, params); + algo->prepare(frame, context_, params); paramsBufferReady.emit(frame); } @@ -597,7 +597,7 @@ void IPAIPU3::parseStatistics(unsigned int frame, ControlList ctrls(controls::controls); for (auto const &algo : algorithms_) - algo->process(context_, stats); + algo->process(frame, context_, stats); setControls(frame); diff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp index 398d5372..01967f07 100644 --- a/src/ipa/libipa/algorithm.cpp +++ b/src/ipa/libipa/algorithm.cpp @@ -48,6 +48,7 @@ namespace ipa { /** * \fn Algorithm::prepare() * \brief Fill the \a params buffer with ISP processing parameters for a frame + * \param[in] frame The frame number * \param[in] context The shared IPA context * \param[out] params The ISP specific parameters. * @@ -63,6 +64,7 @@ namespace ipa { /** * \fn Algorithm::process() * \brief Process ISP statistics, and run algorithm operations + * \param[in] frame The frame number * \param[in] context The shared IPA context * \param[in] stats The IPA statistics and ISP results * diff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h index 766aee5d..1df93625 100644 --- a/src/ipa/libipa/algorithm.h +++ b/src/ipa/libipa/algorithm.h @@ -22,12 +22,14 @@ public: return 0; } - virtual void prepare([[maybe_unused]] Context &context, + virtual void prepare([[maybe_unused]] const uint32_t frame, + [[maybe_unused]] Context &context, [[maybe_unused]] Params *params) { } - virtual void process([[maybe_unused]] Context &context, + virtual void process([[maybe_unused]] const uint32_t frame, + [[maybe_unused]] Context &context, [[maybe_unused]] const Stats *stats) { }