[{"id":31227,"web_url":"https://patchwork.libcamera.org/comment/31227/","msgid":"<172624284011.3474483.16149696918630638881@ping.linuxembedded.co.uk>","date":"2024-09-13T15:54:00","subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Paul Elder (2024-09-13 16:47:40)\n> The ControlInfo information for AwbEnable and ColourGains were declared\n> and exposed in the top-level IPA. These should instead be exposed by the\n> AWB part of the IPA, as it doesn't make sense to support these controls\n> when AWB is disabled, for example.\n> \n> Move the declaration of these controls out of the top-level IPA and into\n> AWB.\n> \n> Signed-off-by: Paul Elder \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/rkisp1/algorithms/awb.cpp | 2 ++\n> src/ipa/rkisp1/rkisp1.cpp | 2 --\n> 2 files changed, 2 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> index edd36ef47..13247762f 100644\n> --- a/src/ipa/rkisp1/algorithms/awb.cpp\n> +++ b/src/ipa/rkisp1/algorithms/awb.cpp\n> @@ -52,6 +52,8 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n> cmap[&controls::ColourTemperature] = ControlInfo(kMinColourTemperature,\n> kMaxColourTemperature,\n> kDefaultColourTemperature);\n> + cmap[&controls::AwbEnable] = ControlInfo(false, true);\n> + cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);\n> \n> MatrixInterpolator gains;\n> int ret = gains.readYaml(tuningData[\"gains\"], \"ct\", \"gains\");\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 56541190a..a20b83c98 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -116,8 +116,6 @@ const IPAHwSettings ipaHwSettingsV12{\n> \n> /* List of controls handled by the RkISP1 IPA */\n> const ControlInfoMap::Map rkisp1Controls{\n> - { &controls::AwbEnable, ControlInfo(false, true) },\n> - { &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },\n> { &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },\n> { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n> };\n> -- \n> 2.39.2\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 37B90C3257\n\tfor ;\n\tFri, 13 Sep 2024 15:54:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0F7BF634FC;\n\tFri, 13 Sep 2024 17:54:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 451A8634F4\n\tfor ;\n\tFri, 13 Sep 2024 17:54:03 +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 E62B0EA5;\n\tFri, 13 Sep 2024 17:52:43 +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=\"ZkVRoNX4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726242764;\n\tbh=j/+mboBJz4XCEN9fFNJwFAR/NQXLTg0l/7HXTxiWuFQ=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=ZkVRoNX40pBsGvg5UxsRg6f+gNoztl2kx+mU3eC2xxiIbMB6m7+6kPSzU/nQ3IyA1\n\tO3Fc5M3eAiYqD7QA34JW+DkCeMDS3gDIEyfbmWTIZxjmYxriu4LDFI0vFq4BELeCP9\n\t2OnHzx1HnEUzF3c61648KXtCS7CEfZ1E1wHm3z48=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240913154740.678284-1-paul.elder@ideasonboard.com>","References":"<20240913154740.678284-1-paul.elder@ideasonboard.com>","Subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","From":"Kieran Bingham ","Cc":"Paul Elder ","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 13 Sep 2024 16:54:00 +0100","Message-ID":"<172624284011.3474483.16149696918630638881@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":"","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\" "}},{"id":31228,"web_url":"https://patchwork.libcamera.org/comment/31228/","msgid":"<172624311118.3474483.10403968363018001087@ping.linuxembedded.co.uk>","date":"2024-09-13T15:58:31","subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Kieran Bingham (2024-09-13 16:54:00)\n> Quoting Paul Elder (2024-09-13 16:47:40)\n> > The ControlInfo information for AwbEnable and ColourGains were declared\n> > and exposed in the top-level IPA. These should instead be exposed by the\n> > AWB part of the IPA, as it doesn't make sense to support these controls\n> > when AWB is disabled, for example.\n> > \n> > Move the declaration of these controls out of the top-level IPA and into\n> > AWB.\n> > \n> > Signed-off-by: Paul Elder \n> \n> Reviewed-by: Kieran Bingham \n\nBut it fails to apply. Maybe it needs rebasing?\n\n./send-for-testing.sh 4590\ngit -C libcamera fetch --prune libcamera.org\ngit -C libcamera fetch --prune gl.fdo\ngit -C libcamera am --quit\nfatal: Resolve operation not in progress, we are not resuming.\ngit -C libcamera reset --hard\nHEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\ngit -C libcamera switch --detach\nHEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\ngit -C libcamera checkout libcamera.org/master\nPrevious HEAD position was 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\nHEAD is now at 66c9b157e95b libcamera: pipeline: simple: Use MediaLink string helper\nPreparing patchwork/4590\ngit -C libcamera show-ref --verify --quiet refs/heads/patchwork/4590\ngit -C libcamera checkout -b patchwork/4590\nSwitched to a new branch 'patchwork/4590'\ngit -C libcamera pw series apply 4590 -s\nApplying: ipa: rkisp1: awb: Declare ControlInfo in AWB\nerror: sha1 information is lacking or useless (src/ipa/rkisp1/algorithms/awb.cpp).\nerror: could not build fake ancestor\nhint: Use 'git am --show-current-patch=diff' to see the failed patch\nPatch failed at 0001 ipa: rkisp1: awb: Declare ControlInfo in AWB\nWhen you have resolved this problem, run \"git am --continue\".\nIf you prefer to skip this patch, run \"git am --skip\" instead.\nTo restore the original branch and stop patching, run \"git am --abort\".\n\n\n--\nKieran\n\n> \n> > ---\n> > src/ipa/rkisp1/algorithms/awb.cpp | 2 ++\n> > src/ipa/rkisp1/rkisp1.cpp | 2 --\n> > 2 files changed, 2 insertions(+), 2 deletions(-)\n> > \n> > diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> > index edd36ef47..13247762f 100644\n> > --- a/src/ipa/rkisp1/algorithms/awb.cpp\n> > +++ b/src/ipa/rkisp1/algorithms/awb.cpp\n> > @@ -52,6 +52,8 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n> > cmap[&controls::ColourTemperature] = ControlInfo(kMinColourTemperature,\n> > kMaxColourTemperature,\n> > kDefaultColourTemperature);\n> > + cmap[&controls::AwbEnable] = ControlInfo(false, true);\n> > + cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);\n> > \n> > MatrixInterpolator gains;\n> > int ret = gains.readYaml(tuningData[\"gains\"], \"ct\", \"gains\");\n> > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > index 56541190a..a20b83c98 100644\n> > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > @@ -116,8 +116,6 @@ const IPAHwSettings ipaHwSettingsV12{\n> > \n> > /* List of controls handled by the RkISP1 IPA */\n> > const ControlInfoMap::Map rkisp1Controls{\n> > - { &controls::AwbEnable, ControlInfo(false, true) },\n> > - { &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },\n> > { &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },\n> > { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n> > };\n> > -- \n> > 2.39.2\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 9755EC324C\n\tfor ;\n\tFri, 13 Sep 2024 15:58:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1E30D634FB;\n\tFri, 13 Sep 2024 17:58:35 +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 EAAC7634E3\n\tfor ;\n\tFri, 13 Sep 2024 17:58:33 +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 A0BBFEA5;\n\tFri, 13 Sep 2024 17:57:14 +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=\"W8o7Q5bO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726243034;\n\tbh=bNoR80usqgBolo1K475Luf8tUEaAsrU528Xq3w6f0u4=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=W8o7Q5bOKt/AG5+y3NL/cuDqmJ/oggGSXEoUq+Uyz1pL+H/Xh3vUne9qqBrGAO6g3\n\tPgv3tBNNUST3MOCly3xvLItnYzMiz/fEfy331FfeX14bsZTT71la3dE33FBZRL+0ZW\n\ttDwBEQMPBqY9bbYv2Gez/2vtCjW6DsqJEjz/2k/U=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<172624284011.3474483.16149696918630638881@ping.linuxembedded.co.uk>","References":"<20240913154740.678284-1-paul.elder@ideasonboard.com>\n\t<172624284011.3474483.16149696918630638881@ping.linuxembedded.co.uk>","Subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","From":"Kieran Bingham ","Cc":"Paul Elder ","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 13 Sep 2024 16:58:31 +0100","Message-ID":"<172624311118.3474483.10403968363018001087@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":"","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\" "}},{"id":34051,"web_url":"https://patchwork.libcamera.org/comment/34051/","msgid":"<174559423032.1586992.9795964146169029872@ping.linuxembedded.co.uk>","date":"2025-04-25T15:17:10","subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Kieran Bingham (2024-09-13 16:58:31)\n> Quoting Kieran Bingham (2024-09-13 16:54:00)\n> > Quoting Paul Elder (2024-09-13 16:47:40)\n> > > The ControlInfo information for AwbEnable and ColourGains were declared\n> > > and exposed in the top-level IPA. These should instead be exposed by the\n> > > AWB part of the IPA, as it doesn't make sense to support these controls\n> > > when AWB is disabled, for example.\n> > > \n> > > Move the declaration of these controls out of the top-level IPA and into\n> > > AWB.\n> > > \n> > > Signed-off-by: Paul Elder \n> > \n> > Reviewed-by: Kieran Bingham \n> \n> But it fails to apply. Maybe it needs rebasing?\n\nPaul, could you send the latest rebased version of this please?\n\nThis should be easy to merge when it passes CI!\n\n(Bonus opportunity for anyone to add an extra tag already!)\n--\nKieran\n\n\n> \n> ./send-for-testing.sh 4590\n> git -C libcamera fetch --prune libcamera.org\n> git -C libcamera fetch --prune gl.fdo\n> git -C libcamera am --quit\n> fatal: Resolve operation not in progress, we are not resuming.\n> git -C libcamera reset --hard\n> HEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\n> git -C libcamera switch --detach\n> HEAD is now at 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\n> git -C libcamera checkout libcamera.org/master\n> Previous HEAD position was 7852d1bf0495 libcamera: debayer_cpu: Sync DMABUFs\n> HEAD is now at 66c9b157e95b libcamera: pipeline: simple: Use MediaLink string helper\n> Preparing patchwork/4590\n> git -C libcamera show-ref --verify --quiet refs/heads/patchwork/4590\n> git -C libcamera checkout -b patchwork/4590\n> Switched to a new branch 'patchwork/4590'\n> git -C libcamera pw series apply 4590 -s\n> Applying: ipa: rkisp1: awb: Declare ControlInfo in AWB\n> error: sha1 information is lacking or useless (src/ipa/rkisp1/algorithms/awb.cpp).\n> error: could not build fake ancestor\n> hint: Use 'git am --show-current-patch=diff' to see the failed patch\n> Patch failed at 0001 ipa: rkisp1: awb: Declare ControlInfo in AWB\n> When you have resolved this problem, run \"git am --continue\".\n> If you prefer to skip this patch, run \"git am --skip\" instead.\n> To restore the original branch and stop patching, run \"git am --abort\".\n> \n> \n> --\n> Kieran\n> \n> > \n> > > ---\n> > > src/ipa/rkisp1/algorithms/awb.cpp | 2 ++\n> > > src/ipa/rkisp1/rkisp1.cpp | 2 --\n> > > 2 files changed, 2 insertions(+), 2 deletions(-)\n> > > \n> > > diff --git a/src/ipa/rkisp1/algorithms/awb.cpp b/src/ipa/rkisp1/algorithms/awb.cpp\n> > > index edd36ef47..13247762f 100644\n> > > --- a/src/ipa/rkisp1/algorithms/awb.cpp\n> > > +++ b/src/ipa/rkisp1/algorithms/awb.cpp\n> > > @@ -52,6 +52,8 @@ int Awb::init(IPAContext &context, const YamlObject &tuningData)\n> > > cmap[&controls::ColourTemperature] = ControlInfo(kMinColourTemperature,\n> > > kMaxColourTemperature,\n> > > kDefaultColourTemperature);\n> > > + cmap[&controls::AwbEnable] = ControlInfo(false, true);\n> > > + cmap[&controls::ColourGains] = ControlInfo(0.0f, 3.996f, 1.0f);\n> > > \n> > > MatrixInterpolator gains;\n> > > int ret = gains.readYaml(tuningData[\"gains\"], \"ct\", \"gains\");\n> > > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> > > index 56541190a..a20b83c98 100644\n> > > --- a/src/ipa/rkisp1/rkisp1.cpp\n> > > +++ b/src/ipa/rkisp1/rkisp1.cpp\n> > > @@ -116,8 +116,6 @@ const IPAHwSettings ipaHwSettingsV12{\n> > > \n> > > /* List of controls handled by the RkISP1 IPA */\n> > > const ControlInfoMap::Map rkisp1Controls{\n> > > - { &controls::AwbEnable, ControlInfo(false, true) },\n> > > - { &controls::ColourGains, ControlInfo(0.0f, 3.996f, 1.0f) },\n> > > { &controls::Sharpness, ControlInfo(0.0f, 10.0f, 1.0f) },\n> > > { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) },\n> > > };\n> > > -- \n> > > 2.39.2\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 7E24BBE08B\n\tfor ;\n\tFri, 25 Apr 2025 15:17:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 61A1468ACD;\n\tFri, 25 Apr 2025 17:17:15 +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 8EBD9617E4\n\tfor ;\n\tFri, 25 Apr 2025 17:17:13 +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 720B3982;\n\tFri, 25 Apr 2025 17:17: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=\"CIM7VUyP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1745594230;\n\tbh=AnyU3LzdblCuwts2UVsayBhocOoPe19I78RoVTB1v2U=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=CIM7VUyPda42QCNQF2ctQKd+niK5VmpctdLDE8gp5+8z3CmOzqEAe+W+9jnY+g5MZ\n\tPwVSt31PASRNGVM4xyPR0tWu/C5MtCyOpSpvit4qnYqygmXhkk3rfa0v4bG9wF8W9c\n\tG2pA3C8ny+TnDGb6iHecxCRbND13iVNyZ6CLt9uQ=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<172624311118.3474483.10403968363018001087@ping.linuxembedded.co.uk>","References":"<20240913154740.678284-1-paul.elder@ideasonboard.com>\n\t<172624284011.3474483.16149696918630638881@ping.linuxembedded.co.uk>\n\t<172624311118.3474483.10403968363018001087@ping.linuxembedded.co.uk>","Subject":"Re: [PATCH] ipa: rkisp1: awb: Declare ControlInfo in AWB","From":"Kieran Bingham ","Cc":"Paul Elder ","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 25 Apr 2025 16:17:10 +0100","Message-ID":"<174559423032.1586992.9795964146169029872@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":"","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\" "}}]