[{"id":30389,"web_url":"https://patchwork.libcamera.org/comment/30389/","msgid":"<a80314c2-ceb8-42c0-a99b-2afc8ae13596@ideasonboard.com>","date":"2024-07-12T15:07:55","subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/people/156/","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"content":"Hi Stefan\n\n\nOn 12/07/2024 15:32, Stefan Klug wrote:\n> When the colour temperature does not change between frames, the ccm\n> inside the frame context is not updated and the metadata contains\n> invalid data. Fix that by caching the ccm inside the active state.\n>\n> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n> ---\n\n\nMakes sense to me: Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>\n\n>   src/ipa/rkisp1/algorithms/ccm.cpp | 7 +++++--\n>   src/ipa/rkisp1/ipa_context.h      | 4 ++++\n>   2 files changed, 9 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\n> index 4c4e3f5029a4..e9b1e78b7ec1 100644\n> --- a/src/ipa/rkisp1/algorithms/ccm.cpp\n> +++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n> @@ -101,7 +101,7 @@ void Ccm::setParameters(rkisp1_params_cfg *params,\n>   /**\n>    * \\copydoc libcamera::ipa::Algorithm::prepare\n>    */\n> -void Ccm::prepare(IPAContext &context, const uint32_t frame,\n> +void Ccm::prepare([[maybe_unused]] IPAContext &context, const uint32_t frame,\n>   \t\t  IPAFrameContext &frameContext,\n>   \t\t  rkisp1_params_cfg *params)\n>   {\n> @@ -111,13 +111,16 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n>   \t * \\todo The colour temperature will likely be noisy, add filtering to\n>   \t * avoid updating the CCM matrix all the time.\n>   \t */\n> -\tif (frame > 0 && ct == ct_)\n> +\tif (frame > 0 && ct == ct_) {\n> +\t\tframeContext.ccm.ccm = context.activeState.ccm.ccm;\n>   \t\treturn;\n> +\t}\n>   \n>   \tct_ = ct;\n>   \tMatrix<float, 3, 3> ccm = ccm_.get(ct);\n>   \tMatrix<int16_t, 3, 1> offsets = offsets_.get(ct);\n>   \n> +\tcontext.activeState.ccm.ccm = ccm;\n>   \tframeContext.ccm.ccm = ccm;\n>   \n>   \tsetParameters(params, ccm, offsets);\n> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> index 27a9bf62fc16..061efc0c578e 100644\n> --- a/src/ipa/rkisp1/ipa_context.h\n> +++ b/src/ipa/rkisp1/ipa_context.h\n> @@ -97,6 +97,10 @@ struct IPAActiveState {\n>   \t\tbool autoEnabled;\n>   \t} awb;\n>   \n> +\tstruct {\n> +\t\tMatrix<float, 3, 3> ccm;\n> +\t} ccm;\n> +\n>   \tstruct {\n>   \t\tint8_t brightness;\n>   \t\tuint8_t contrast;","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 B13AEBD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 12 Jul 2024 15:08:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A80FB6336F;\n\tFri, 12 Jul 2024 17:07:59 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 36D7E62E17\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Jul 2024 17:07:58 +0200 (CEST)","from [192.168.0.43]\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8493C735\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Jul 2024 17:07:23 +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=\"Xcg3WLLT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1720796843;\n\tbh=no7Cd7PKcprj4CZB9nZWYKriF9uRxytBU3i5Sc4TTlA=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=Xcg3WLLTkoutEMRkA4FmMTJtltDav9Rxic05VPN6wnTxf6kyc/KPIiHloQmEAQMqm\n\t5k67hnDj4i3ukEgpVuv3Xx/VZDKgTcb2onSscP8eAuL+Im7RgaE8muQoUKpWlks6rS\n\tlRkWPVdV4CV1ENa1y4Ly102jZpY25F+0C1RS+NCw=","Message-ID":"<a80314c2-ceb8-42c0-a99b-2afc8ae13596@ideasonboard.com>","Date":"Fri, 12 Jul 2024 16:07:55 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","To":"libcamera-devel@lists.libcamera.org","References":"<20240712143227.3036702-1-stefan.klug@ideasonboard.com>\n\t<20240712143227.3036702-6-stefan.klug@ideasonboard.com>","Content-Language":"en-US","From":"Dan Scally <dan.scally@ideasonboard.com>","Autocrypt":"addr=dan.scally@ideasonboard.com; keydata=\n\t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","In-Reply-To":"<20240712143227.3036702-6-stefan.klug@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","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>"}},{"id":30409,"web_url":"https://patchwork.libcamera.org/comment/30409/","msgid":"<172101208344.269677.3943347879377536939@ping.linuxembedded.co.uk>","date":"2024-07-15T02:54:43","subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2024-07-12 15:32:06)\n> When the colour temperature does not change between frames, the ccm\n> inside the frame context is not updated and the metadata contains\n> invalid data. Fix that by caching the ccm inside the active state.\n> \n> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n> ---\n>  src/ipa/rkisp1/algorithms/ccm.cpp | 7 +++++--\n>  src/ipa/rkisp1/ipa_context.h      | 4 ++++\n>  2 files changed, 9 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\n> index 4c4e3f5029a4..e9b1e78b7ec1 100644\n> --- a/src/ipa/rkisp1/algorithms/ccm.cpp\n> +++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n> @@ -101,7 +101,7 @@ void Ccm::setParameters(rkisp1_params_cfg *params,\n>  /**\n>   * \\copydoc libcamera::ipa::Algorithm::prepare\n>   */\n> -void Ccm::prepare(IPAContext &context, const uint32_t frame,\n> +void Ccm::prepare([[maybe_unused]] IPAContext &context, const uint32_t frame,\n\nIs this maybe_unused required? You've added usage, not removed it ... it\ncertainly looks used to me ?\n\n>                   IPAFrameContext &frameContext,\n>                   rkisp1_params_cfg *params)\n>  {\n> @@ -111,13 +111,16 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n>          * \\todo The colour temperature will likely be noisy, add filtering to\n>          * avoid updating the CCM matrix all the time.\n>          */\n> -       if (frame > 0 && ct == ct_)\n> +       if (frame > 0 && ct == ct_) {\n> +               frameContext.ccm.ccm = context.activeState.ccm.ccm;\n>                 return;\n> +       }\n>  \n>         ct_ = ct;\n>         Matrix<float, 3, 3> ccm = ccm_.get(ct);\n>         Matrix<int16_t, 3, 1> offsets = offsets_.get(ct);\n>  \n> +       context.activeState.ccm.ccm = ccm;\n\nShould we save a copy - and fill the context.activeState.ccm.ccm\ndirectly from the ccm_.get ? (Though that might then look unbalanced\nagainst the offsets).\n\nOr otherwise, as this is only accessed internally here - what about\nmoving Matrix<float, 3, 3> ccm; and Matrix<int16_t, 3, 1> offsets; to\nthe private class instance ? Then there's no extra copy ...\n\nBut if you still prefer this route - then\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n>         frameContext.ccm.ccm = ccm;\n>  \n>         setParameters(params, ccm, offsets);\n> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> index 27a9bf62fc16..061efc0c578e 100644\n> --- a/src/ipa/rkisp1/ipa_context.h\n> +++ b/src/ipa/rkisp1/ipa_context.h\n> @@ -97,6 +97,10 @@ struct IPAActiveState {\n>                 bool autoEnabled;\n>         } awb;\n>  \n> +       struct {\n> +               Matrix<float, 3, 3> ccm;\n> +       } ccm;\n> +\n>         struct {\n>                 int8_t brightness;\n>                 uint8_t contrast;\n> -- \n> 2.43.0\n>","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 23382BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 15 Jul 2024 02:54:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 011826336F;\n\tMon, 15 Jul 2024 04:54:49 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 981B4619A3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Jul 2024 04:54:46 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2046F496;\n\tMon, 15 Jul 2024 04:54:10 +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=\"hithDEnD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1721012050;\n\tbh=cVMfG7xH/XyZHlfqxFRxwxCLNYP8Gg8yadXqulVMS7Y=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=hithDEnDdJceXI0+dCtA4Jn53SlqpmHIbBZFrMrP467eE6ABBIJRufpBsc6VVbzdJ\n\tQ5Eqeu4vJyKnPJu8QiRmFeWQ0Oqotr42JeDRAbG3hoN8Skgdf/AYwuWeYKQpsCfyzm\n\ttw6w6bQ0weUl32PZN7qB2rrWyUTcmKZ4lx6Nr+48=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240712143227.3036702-6-stefan.klug@ideasonboard.com>","References":"<20240712143227.3036702-1-stefan.klug@ideasonboard.com>\n\t<20240712143227.3036702-6-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"Stefan Klug <stefan.klug@ideasonboard.com>","To":"Stefan Klug <stefan.klug@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 15 Jul 2024 03:54:43 +0100","Message-ID":"<172101208344.269677.3943347879377536939@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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>"}},{"id":30438,"web_url":"https://patchwork.libcamera.org/comment/30438/","msgid":"<Zpod2GGl5wRxG94U@pyrite.rasen.tech>","date":"2024-07-19T08:03:36","subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Fri, Jul 12, 2024 at 04:32:06PM +0200, Stefan Klug wrote:\n> When the colour temperature does not change between frames, the ccm\n> inside the frame context is not updated and the metadata contains\n> invalid data. Fix that by caching the ccm inside the active state.\n> \n> Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\n\n> ---\n>  src/ipa/rkisp1/algorithms/ccm.cpp | 7 +++++--\n>  src/ipa/rkisp1/ipa_context.h      | 4 ++++\n>  2 files changed, 9 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/ccm.cpp b/src/ipa/rkisp1/algorithms/ccm.cpp\n> index 4c4e3f5029a4..e9b1e78b7ec1 100644\n> --- a/src/ipa/rkisp1/algorithms/ccm.cpp\n> +++ b/src/ipa/rkisp1/algorithms/ccm.cpp\n> @@ -101,7 +101,7 @@ void Ccm::setParameters(rkisp1_params_cfg *params,\n>  /**\n>   * \\copydoc libcamera::ipa::Algorithm::prepare\n>   */\n> -void Ccm::prepare(IPAContext &context, const uint32_t frame,\n> +void Ccm::prepare([[maybe_unused]] IPAContext &context, const uint32_t frame,\n>  \t\t  IPAFrameContext &frameContext,\n>  \t\t  rkisp1_params_cfg *params)\n>  {\n> @@ -111,13 +111,16 @@ void Ccm::prepare(IPAContext &context, const uint32_t frame,\n>  \t * \\todo The colour temperature will likely be noisy, add filtering to\n>  \t * avoid updating the CCM matrix all the time.\n>  \t */\n> -\tif (frame > 0 && ct == ct_)\n> +\tif (frame > 0 && ct == ct_) {\n> +\t\tframeContext.ccm.ccm = context.activeState.ccm.ccm;\n>  \t\treturn;\n> +\t}\n>  \n>  \tct_ = ct;\n>  \tMatrix<float, 3, 3> ccm = ccm_.get(ct);\n>  \tMatrix<int16_t, 3, 1> offsets = offsets_.get(ct);\n>  \n> +\tcontext.activeState.ccm.ccm = ccm;\n>  \tframeContext.ccm.ccm = ccm;\n>  \n>  \tsetParameters(params, ccm, offsets);\n> diff --git a/src/ipa/rkisp1/ipa_context.h b/src/ipa/rkisp1/ipa_context.h\n> index 27a9bf62fc16..061efc0c578e 100644\n> --- a/src/ipa/rkisp1/ipa_context.h\n> +++ b/src/ipa/rkisp1/ipa_context.h\n> @@ -97,6 +97,10 @@ struct IPAActiveState {\n>  \t\tbool autoEnabled;\n>  \t} awb;\n>  \n> +\tstruct {\n> +\t\tMatrix<float, 3, 3> ccm;\n> +\t} ccm;\n> +\n>  \tstruct {\n>  \t\tint8_t brightness;\n>  \t\tuint8_t contrast;\n> -- \n> 2.43.0\n>","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 323A6C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 19 Jul 2024 08:03:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 155676336F;\n\tFri, 19 Jul 2024 10:03:44 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C0F2619A3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 19 Jul 2024 10:03:43 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-024.catv02.itscom.jp\n\t[175.177.49.24])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F19DC73E;\n\tFri, 19 Jul 2024 10:03:02 +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=\"BCNR/ugV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1721376183;\n\tbh=ipN9dsvWFJKyrk48YLlXnxaWzQ1tD0z/SHeOc6iYhUA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=BCNR/ugVUvzqTOC8WuNenasdyGaXEUGbcVB2vt5pElKlCXFodWxn9DVpEf7KbeUP7\n\thoin38hpjaCR7NkNabT32J5nYXsXLdwiPLvVV2X18+wU5LxuKoRaDZWZ15e/BKGCO4\n\toErXwAOb+NpGI2LQtF+/AbOh9yqNBDMQcYIibjrI=","Date":"Fri, 19 Jul 2024 17:03:36 +0900","From":"Paul Elder <paul.elder@ideasonboard.com>","To":"Stefan Klug <stefan.klug@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1 5/5] ipa: rkisp1: ccm: Ensure metadata contains valid\n\tccm","Message-ID":"<Zpod2GGl5wRxG94U@pyrite.rasen.tech>","References":"<20240712143227.3036702-1-stefan.klug@ideasonboard.com>\n\t<20240712143227.3036702-6-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240712143227.3036702-6-stefan.klug@ideasonboard.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>"}}]