[{"id":21155,"web_url":"https://patchwork.libcamera.org/comment/21155/","msgid":"<163768439015.3059017.5870923655065804217@Monstersaurus>","date":"2021-11-23T16:19:50","subject":"Re: [libcamera-devel] [PATCH v3 10/11] ipa: rkisp1: agc: Introduce\n\tprepare call","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jean-Michel Hautbois (2021-11-23 15:04:22)\n> When a new parameter buffer needs to be queued, we need to specify which\n> algorithm is activated or not in the ISP. Add a simple prepare function\n> in AGC for that, which may later evolve to take the exposure locking\n> into account. For that function to be called, we also need to add the\n> loop on the algorithms in IPARkISP1::queueRequest.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Reviewed-by: Laurent Pinchart \n\nTempted to add in the commit message that we no longer disable the AE\nalgorithm based on the controls::AeEnable, which will be handled in a\ndifferent manner later.\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/rkisp1/algorithms/agc.cpp | 7 +++++++\n> src/ipa/rkisp1/algorithms/agc.h | 1 +\n> src/ipa/rkisp1/rkisp1.cpp | 12 +++---------\n> 3 files changed, 11 insertions(+), 9 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\n> index 9c6d312e..0433813a 100644\n> --- a/src/ipa/rkisp1/algorithms/agc.cpp\n> +++ b/src/ipa/rkisp1/algorithms/agc.cpp\n> @@ -260,6 +260,13 @@ void Agc::process(IPAContext &context, const rkisp1_stat_buffer *stats)\n> frameCount_++;\n> }\n> \n> +void Agc::prepare([[maybe_unused]] IPAContext &context,\n> + rkisp1_params_cfg *params)\n> +{\n> + params->module_ens |= RKISP1_CIF_ISP_MODULE_AEC;\n> + params->module_en_update |= RKISP1_CIF_ISP_MODULE_AEC;\n> +}\n> +\n> } /* namespace ipa::rkisp1::algorithms */\n> \n> } /* namespace libcamera */\n> diff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\n> index 83159743..ac95dea5 100644\n> --- a/src/ipa/rkisp1/algorithms/agc.h\n> +++ b/src/ipa/rkisp1/algorithms/agc.h\n> @@ -28,6 +28,7 @@ public:\n> ~Agc() = default;\n> \n> int configure(IPAContext &context, const IPACameraSensorInfo &configInfo) override;\n> + void prepare(IPAContext &context, rkisp1_params_cfg *params) override;\n> void process(IPAContext &context, const rkisp1_stat_buffer *stats) override;\n> \n> private:\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 89d98b6c..59e868ff 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -270,19 +270,13 @@ void IPARkISP1::processEvent(const RkISP1Event &event)\n> }\n> \n> void IPARkISP1::queueRequest(unsigned int frame, rkisp1_params_cfg *params,\n> - const ControlList &controls)\n> + [[maybe_unused]] const ControlList &controls)\n> {\n> /* Prepare parameters buffer. */\n> memset(params, 0, sizeof(*params));\n> \n> - /* Auto Exposure on/off. */\n> - if (controls.contains(controls::AeEnable)) {\n> - autoExposure_ = controls.get(controls::AeEnable);\n> - if (autoExposure_)\n> - params->module_ens = RKISP1_CIF_ISP_MODULE_AEC;\n> -\n> - params->module_en_update = RKISP1_CIF_ISP_MODULE_AEC;\n> - }\n> + for (auto const &algo : algorithms_)\n> + algo->prepare(context_, params);\n> \n> RkISP1Action op;\n> op.op = ActionParamFilled;\n> -- \n> 2.32.0\n>","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 97662BDB13\n\tfor ;\n\tTue, 23 Nov 2021 16:19:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D491B60230;\n\tTue, 23 Nov 2021 17:19:54 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 10D4560121\n\tfor ;\n\tTue, 23 Nov 2021 17:19:53 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C432A1B;\n\tTue, 23 Nov 2021 17:19:52 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"nFwoUnWs\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1637684392;\n\tbh=Ua5Qu73KcBjB62QQygbbYqw2nikq8ZlY59zkICqwALg=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=nFwoUnWsxdBA8vbnbyX1yYS0XmQMoAKJoc9GXS+rJOaVr0w7rkCtX7fovs2k/Up34\n\tVhKU9ShefKT2YLhmaPNrk/MdfuiNzeLynhsjammaH+RjraKTzlUpvFphzH6sWx3qX0\n\tW9bgdN3FXTCoqgaDKFLngFtzs4Y1TNysV05xDFYM=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211123150423.125524-11-jeanmichel.hautbois@ideasonboard.com>","References":"<20211123150423.125524-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211123150423.125524-11-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham ","To":"Jean-Michel Hautbois ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 23 Nov 2021 16:19:50 +0000","Message-ID":"<163768439015.3059017.5870923655065804217@Monstersaurus>","User-Agent":"alot/0.10","Subject":"Re: [libcamera-devel] [PATCH v3 10/11] ipa: rkisp1: agc: Introduce\n\tprepare call","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\" "}}]