[{"id":20463,"web_url":"https://patchwork.libcamera.org/comment/20463/","msgid":"","date":"2021-10-25T21:23:07","subject":"Re: [libcamera-devel] [PATCH v3 08/19] ipa: ipu3: tonemapping:\n\tGenerate the LUT only on gamma change","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jean-Michel,\n\nThank you for the patch.\n\nOn Fri, Oct 22, 2021 at 05:12:07PM +0200, Jean-Michel Hautbois wrote:\n> The Tone mapping algorithm calculates the gamma curve for every frame,\n\ns/Tone/tone/\n\n> regardless of whether the gamma value has changed or not. This issue is\n> exasperated as we currently hardcode the gamma to a single value.\n> \n> Optimise the implementation to only recalculate the look up table when\n> the gamma setting is changed, and store the gamma setting of the LUT\n> curve as part of the IPA context.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/ipa/ipu3/algorithms/tone_mapping.cpp | 5 +++++\n> src/ipa/ipu3/ipa_context.h | 1 +\n> src/ipa/ipu3/ipu3.cpp | 3 +++\n> 3 files changed, 9 insertions(+)\n> \n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> index 3af96261..40337f9d 100644\n> --- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> +++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> @@ -43,6 +43,9 @@ void ToneMapping::process([[maybe_unused]] IPAContext &context,\n> \t */\n> \tgamma_ = 1.1;\n> \n> +\tif (context.frameContext.toneMapping.gamma == gamma_)\n> +\t\treturn;\n> +\n> \tstruct ipu3_uapi_gamma_corr_lut &lut =\n> \t\tcontext.frameContext.toneMapping.gammaCorrection;\n> \n> @@ -53,6 +56,8 @@ void ToneMapping::process([[maybe_unused]] IPAContext &context,\n> \t\t/* The output value is expressed on 13 bits. */\n> \t\tlut.lut[i] = gamma * 8191;\n> \t}\n> +\n> +\tcontext.frameContext.toneMapping.gamma = gamma_;\n> }\n> \n> } /* namespace ipa::ipu3::algorithms */\n> diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h\n> index 847c03fe..e14bb561 100644\n> --- a/src/ipa/ipu3/ipa_context.h\n> +++ b/src/ipa/ipu3/ipa_context.h\n> @@ -48,6 +48,7 @@ struct IPAFrameContext {\n> \t} awb;\n> \n> \tstruct {\n> +\t\tdouble gamma;\n> \t\tstruct ipu3_uapi_gamma_corr_lut gammaCorrection;\n> \t} toneMapping;\n> };\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index cd27872b..f7632bc0 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -151,6 +151,9 @@\n> * \\struct IPAFrameContext::toneMapping\n> * \\brief Context for ToneMapping and Gamma control\n> *\n> + * \\var IPAFrameContext::toneMapping::gamma\n> + * \\brief Gamma value for the LUT\n> + *\n> * \\var IPAFrameContext::toneMapping::gammaCorrection\n> * \\brief Per-pixel tone mapping implemented as a LUT\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 22134BF415\n\tfor ;\n\tMon, 25 Oct 2021 21:23:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 81CA764878;\n\tMon, 25 Oct 2021 23:23:31 +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 CC4B960125\n\tfor ;\n\tMon, 25 Oct 2021 23:23:29 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4516FE0A;\n\tMon, 25 Oct 2021 23:23:29 +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=\"gCrxEBKR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1635197009;\n\tbh=SvvA+sVdYowQjNgP2T8vu9qy9jQsBRMRcN6OdKUKWyM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=gCrxEBKRqzzg6CycbmLlQmnydcThDCCBZfK3X/w9pXVOa+gp5wX5/kvaKBYW/dnwJ\n\tL9hcRXOXIAadBvHHCTurycwEeoKQtfByyuk4ERAsvrdm8KhaoNwjaoLqFrdQoR2kof\n\tM2DBMmLMWbKrmaV2SPjQ3JxVzNGk2LTCCI7IvtQk=","Date":"Tue, 26 Oct 2021 00:23:07 +0300","From":"Laurent Pinchart ","To":"Jean-Michel Hautbois ","Message-ID":"","References":"<20211022151218.111966-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211022151218.111966-9-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211022151218.111966-9-jeanmichel.hautbois@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 08/19] ipa: ipu3: tonemapping:\n\tGenerate the LUT only on gamma change","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":20467,"web_url":"https://patchwork.libcamera.org/comment/20467/","msgid":"<163519735941.1095920.16479033288822909558@Monstersaurus>","date":"2021-10-25T21:29:19","subject":"Re: [libcamera-devel] [PATCH v3 08/19] ipa: ipu3: tonemapping:\n\tGenerate the LUT only on gamma change","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-10-22 16:12:07)\n> The Tone mapping algorithm calculates the gamma curve for every frame,\n> regardless of whether the gamma value has changed or not. This issue is\n> exasperated as we currently hardcode the gamma to a single value.\n> \n> Optimise the implementation to only recalculate the look up table when\n> the gamma setting is changed, and store the gamma setting of the LUT\n> curve as part of the IPA context.\n> \n> Signed-off-by: Jean-Michel Hautbois \n> Signed-off-by: Kieran Bingham \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/ipu3/algorithms/tone_mapping.cpp | 5 +++++\n> src/ipa/ipu3/ipa_context.h | 1 +\n> src/ipa/ipu3/ipu3.cpp | 3 +++\n> 3 files changed, 9 insertions(+)\n> \n> diff --git a/src/ipa/ipu3/algorithms/tone_mapping.cpp b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> index 3af96261..40337f9d 100644\n> --- a/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> +++ b/src/ipa/ipu3/algorithms/tone_mapping.cpp\n> @@ -43,6 +43,9 @@ void ToneMapping::process([[maybe_unused]] IPAContext &context,\n> */\n> gamma_ = 1.1;\n> \n> + if (context.frameContext.toneMapping.gamma == gamma_)\n> + return;\n> +\n> struct ipu3_uapi_gamma_corr_lut &lut =\n> context.frameContext.toneMapping.gammaCorrection;\n> \n> @@ -53,6 +56,8 @@ void ToneMapping::process([[maybe_unused]] IPAContext &context,\n> /* The output value is expressed on 13 bits. */\n> lut.lut[i] = gamma * 8191;\n> }\n> +\n> + context.frameContext.toneMapping.gamma = gamma_;\n> }\n> \n> } /* namespace ipa::ipu3::algorithms */\n> diff --git a/src/ipa/ipu3/ipa_context.h b/src/ipa/ipu3/ipa_context.h\n> index 847c03fe..e14bb561 100644\n> --- a/src/ipa/ipu3/ipa_context.h\n> +++ b/src/ipa/ipu3/ipa_context.h\n> @@ -48,6 +48,7 @@ struct IPAFrameContext {\n> } awb;\n> \n> struct {\n> + double gamma;\n> struct ipu3_uapi_gamma_corr_lut gammaCorrection;\n> } toneMapping;\n> };\n> diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\n> index cd27872b..f7632bc0 100644\n> --- a/src/ipa/ipu3/ipu3.cpp\n> +++ b/src/ipa/ipu3/ipu3.cpp\n> @@ -151,6 +151,9 @@\n> * \\struct IPAFrameContext::toneMapping\n> * \\brief Context for ToneMapping and Gamma control\n> *\n> + * \\var IPAFrameContext::toneMapping::gamma\n> + * \\brief Gamma value for the LUT\n> + *\n> * \\var IPAFrameContext::toneMapping::gammaCorrection\n> * \\brief Per-pixel tone mapping implemented as a LUT\n> *\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 CC8F6BDB1C\n\tfor ;\n\tMon, 25 Oct 2021 21:29:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4349664878;\n\tMon, 25 Oct 2021 23:29:23 +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 3F30F60125\n\tfor ;\n\tMon, 25 Oct 2021 23:29:22 +0200 (CEST)","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 D4B2FE0A;\n\tMon, 25 Oct 2021 23:29:21 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"aWlb3epO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1635197361;\n\tbh=xilF88DDIDcL3z4yhskqU4jt0OZGhxfcox2WS7d3X2k=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=aWlb3epOZjuAmKP3JFeOlZRU1A58M8b0VPxOs0RVM13KGlowT6EvMBykVo69cRCQB\n\tPN1BqU6CNNrWCtodMKEWWZUpZtWslVXQpGP1HfBcqYYTeNnj1O6JQrPqq1MUX9Vu+s\n\tHNGDR34O9esD9oS251SzMNrL3X2iqjZSSJGHIm4I=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211022151218.111966-9-jeanmichel.hautbois@ideasonboard.com>","References":"<20211022151218.111966-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211022151218.111966-9-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham ","To":"Jean-Michel Hautbois ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 25 Oct 2021 22:29:19 +0100","Message-ID":"<163519735941.1095920.16479033288822909558@Monstersaurus>","User-Agent":"alot/0.9.1","Subject":"Re: [libcamera-devel] [PATCH v3 08/19] ipa: ipu3: tonemapping:\n\tGenerate the LUT only on gamma change","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\" "}}]