[{"id":20709,"web_url":"https://patchwork.libcamera.org/comment/20709/","msgid":"<163637929090.275423.7433274260383923313@Monstersaurus>","date":"2021-11-08T13:48:10","subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","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-08 13:13:30)\n> From: Han-Lin Chen \n> \n> The Intel close sourced IPA requires the effective controls applied to\n> the sensor when the statistics are generated. Report effective sensor controls\n> with the stastistics to IPA.\n> \n> Signed-off-by: Han-Lin Chen \n> [Jean-Michel: Reword s/stastistics/statistics]\n\nYou missed one in the commit message ;-)\n\n> Signed-off-by: Jean-Michel Hautbois \n> ---\n> src/libcamera/pipeline/ipu3/frames.h | 3 +++\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++++\n> 2 files changed, 8 insertions(+)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h\n> index 3ef7e445..a897e307 100644\n> --- a/src/libcamera/pipeline/ipu3/frames.h\n> +++ b/src/libcamera/pipeline/ipu3/frames.h\n> @@ -12,6 +12,7 @@\n> #include \n> #include \n> \n> +#include \n\nI suspect checkstyle would suggest a separate group here.\n\n> #include \n> \n> namespace libcamera {\n> @@ -34,6 +35,8 @@ public:\n> FrameBuffer *paramBuffer;\n> FrameBuffer *statBuffer;\n> \n> + ControlList effectiveSensorControls;\n> +\n> bool paramDequeued;\n> bool metadataProcessed;\n> };\n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index 8816efc5..6a7f5b9a 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -667,6 +667,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> return ret;\n> }\n> \n> + data->delayedCtrls_->reset();\n> +\n\nDid I see a commit titled that moves this later?\n\n> return updateControls(data);\n> }\n> \n> @@ -1363,6 +1365,8 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n> request->metadata().set(controls::SensorTimestamp,\n> buffer->metadata().timestamp);\n> \n> + info->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n> +\n> if (request->findBuffer(&rawStream_))\n> pipe()->completeBuffer(request, buffer);\n> \n> @@ -1419,6 +1423,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n> ev.frame = info->id;\n> ev.bufferId = info->statBuffer->cookie();\n> ev.frameTimestamp = request->metadata().get(controls::SensorTimestamp);\n> + ev.sensorControls = info->effectiveSensorControls;\n> ipa_->processEvent(ev);\n> }\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 7B40EBF415\n\tfor ;\n\tMon, 8 Nov 2021 13:48:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id ABE9060368;\n\tMon, 8 Nov 2021 14:48:14 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D0EDC6034D\n\tfor ;\n\tMon, 8 Nov 2021 14:48:13 +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 648FC1853;\n\tMon, 8 Nov 2021 14:48:13 +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=\"owBSSS+8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636379293;\n\tbh=9GxHsbv7gsCPW665QZvKCAaFwAtW1KMGi65PROyg5Cc=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=owBSSS+8CuHDY4Bu3KwVL5bl+e7MnaRV8gklaHoPBxKhzjvoeD+vrYSl89N90LmtB\n\tfI15uVQEfICmKG2B+ivHRGlfPd9wVGhmt1I8WZ0DE6F2ptAy7NH4d6CkDCM9HU8FPp\n\tChHK33e58FpgqnEg7PZd8jhloxcPnanG0ggNRLBU=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211108131350.130665-3-jeanmichel.hautbois@ideasonboard.com>","References":"<20211108131350.130665-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211108131350.130665-3-jeanmichel.hautbois@ideasonboard.com>","From":"Kieran Bingham ","To":"Jean-Michel Hautbois ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 08 Nov 2021 13:48:10 +0000","Message-ID":"<163637929090.275423.7433274260383923313@Monstersaurus>","User-Agent":"alot/0.9.1","Subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","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":20755,"web_url":"https://patchwork.libcamera.org/comment/20755/","msgid":"<08fcc990-6988-4a58-2ef6-769b4f49f19e@ideasonboard.com>","date":"2021-11-09T13:26:26","subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"Hi Kieran,\n\nOn 08/11/2021 14:48, Kieran Bingham wrote:\n> Quoting Jean-Michel Hautbois (2021-11-08 13:13:30)\n>> From: Han-Lin Chen \n>>\n>> The Intel close sourced IPA requires the effective controls applied to\n>> the sensor when the statistics are generated. Report effective sensor controls\n>> with the stastistics to IPA.\n>>\n>> Signed-off-by: Han-Lin Chen \n>> [Jean-Michel: Reword s/stastistics/statistics]\n> \n> You missed one in the commit message ;-)\n\nThanks :-)\n\n> \n>> Signed-off-by: Jean-Michel Hautbois \n>> ---\n>> src/libcamera/pipeline/ipu3/frames.h | 3 +++\n>> src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++++\n>> 2 files changed, 8 insertions(+)\n>>\n>> diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h\n>> index 3ef7e445..a897e307 100644\n>> --- a/src/libcamera/pipeline/ipu3/frames.h\n>> +++ b/src/libcamera/pipeline/ipu3/frames.h\n>> @@ -12,6 +12,7 @@\n>> #include \n>> #include \n>> \n>> +#include \n> \n> I suspect checkstyle would suggest a separate group here.\n\nNot on my side...\n\n> \n>> #include \n>> \n>> namespace libcamera {\n>> @@ -34,6 +35,8 @@ public:\n>> FrameBuffer *paramBuffer;\n>> FrameBuffer *statBuffer;\n>> \n>> + ControlList effectiveSensorControls;\n>> +\n>> bool paramDequeued;\n>> bool metadataProcessed;\n>> };\n>> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> index 8816efc5..6a7f5b9a 100644\n>> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n>> @@ -667,6 +667,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n>> return ret;\n>> }\n>> \n>> + data->delayedCtrls_->reset();\n>> +\n> \n> Did I see a commit titled that moves this later?\n\nYes, I will squash both ;-)\n> \n>> return updateControls(data);\n>> }\n>> \n>> @@ -1363,6 +1365,8 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n>> request->metadata().set(controls::SensorTimestamp,\n>> buffer->metadata().timestamp);\n>> \n>> + info->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n>> +\n>> if (request->findBuffer(&rawStream_))\n>> pipe()->completeBuffer(request, buffer);\n>> \n>> @@ -1419,6 +1423,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n>> ev.frame = info->id;\n>> ev.bufferId = info->statBuffer->cookie();\n>> ev.frameTimestamp = request->metadata().get(controls::SensorTimestamp);\n>> + ev.sensorControls = info->effectiveSensorControls;\n>> ipa_->processEvent(ev);\n>> }\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 6E27DBDB1C\n\tfor ;\n\tTue, 9 Nov 2021 13:26:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C44FB60234;\n\tTue, 9 Nov 2021 14:26:30 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 71AFF600BF\n\tfor ;\n\tTue, 9 Nov 2021 14:26:29 +0100 (CET)","from [IPV6:2a01:e0a:169:7140:caf3:48bf:e1d8:8960] (unknown\n\t[IPv6:2a01:e0a:169:7140:caf3:48bf:e1d8:8960])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2357FFD1;\n\tTue, 9 Nov 2021 14:26:29 +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=\"ZmthtfKX\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636464389;\n\tbh=HUTZf6lz5gwN/uuXlm3+ebXGrLDt0XILktitG9giDM8=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=ZmthtfKXI5ofPhFOcO0QxtbJGLWjCUt0OAUOf/YdwJgAzCH4Cr6KA68EP6tizTqNQ\n\tBXkQmYVmSV3DoPk+4jValxsBRg3LvHQe/jct3D7aMFL0Q1AcmWrR69vNqZBCZPAxMC\n\t+eYye9nJCV4ae+Fhcsw+0FndxCBH/63+wFN1MwbI=","Message-ID":"<08fcc990-6988-4a58-2ef6-769b4f49f19e@ideasonboard.com>","Date":"Tue, 9 Nov 2021 14:26:26 +0100","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101\n\tThunderbird/91.2.1","Content-Language":"en-US","To":"Kieran Bingham ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20211108131350.130665-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211108131350.130665-3-jeanmichel.hautbois@ideasonboard.com>\n\t<163637929090.275423.7433274260383923313@Monstersaurus>","From":"Jean-Michel Hautbois ","In-Reply-To":"<163637929090.275423.7433274260383923313@Monstersaurus>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","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":20789,"web_url":"https://patchwork.libcamera.org/comment/20789/","msgid":"<163653904922.1896795.202745713652310401@Monstersaurus>","date":"2021-11-10T10:10:49","subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","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-09 13:26:26)\n> Hi Kieran,\n> \n> On 08/11/2021 14:48, Kieran Bingham wrote:\n> > Quoting Jean-Michel Hautbois (2021-11-08 13:13:30)\n> >> From: Han-Lin Chen \n> >>\n> >> The Intel close sourced IPA requires the effective controls applied to\n> >> the sensor when the statistics are generated. Report effective sensor controls\n> >> with the stastistics to IPA.\n> >>\n> >> Signed-off-by: Han-Lin Chen \n> >> [Jean-Michel: Reword s/stastistics/statistics]\n> > \n> > You missed one in the commit message ;-)\n> \n> Thanks :-)\n> \n> > \n> >> Signed-off-by: Jean-Michel Hautbois \n> >> ---\n> >> src/libcamera/pipeline/ipu3/frames.h | 3 +++\n> >> src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +++++\n> >> 2 files changed, 8 insertions(+)\n> >>\n> >> diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h\n> >> index 3ef7e445..a897e307 100644\n> >> --- a/src/libcamera/pipeline/ipu3/frames.h\n> >> +++ b/src/libcamera/pipeline/ipu3/frames.h\n> >> @@ -12,6 +12,7 @@\n> >> #include \n> >> #include \n> >> \n> >> +#include \n> > \n> > I suspect checkstyle would suggest a separate group here.\n> \n> Not on my side...\n\nSeems other patches I've seen lately haven't been showing up in\ncheckstyle either, but running clang-format directly highlights:\n\n\n--- src/libcamera/pipeline/ipu3/frames.h\n+++ src/libcamera/pipeline/ipu3/frames.h.clang\n@@ -9,12 +9,14 @@\n\n #include \n #include \n #include \n\n-#include \n #include \n\n+#include \n+\n namespace libcamera {\n\n class FrameBuffer;\n\n(Ignore the '' move if you see that locally, that's a known\nfalse-positive)\n\n> \n> > \n> >> #include \n> >> \n> >> namespace libcamera {\n> >> @@ -34,6 +35,8 @@ public:\n> >> FrameBuffer *paramBuffer;\n> >> FrameBuffer *statBuffer;\n> >> \n> >> + ControlList effectiveSensorControls;\n> >> +\n> >> bool paramDequeued;\n> >> bool metadataProcessed;\n> >> };\n> >> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> >> index 8816efc5..6a7f5b9a 100644\n> >> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> >> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> >> @@ -667,6 +667,8 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n> >> return ret;\n> >> }\n> >> \n> >> + data->delayedCtrls_->reset();\n> >> +\n> > \n> > Did I see a commit titled that moves this later?\n> \n> Yes, I will squash both ;-)\n> > \n> >> return updateControls(data);\n> >> }\n> >> \n> >> @@ -1363,6 +1365,8 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)\n> >> request->metadata().set(controls::SensorTimestamp,\n> >> buffer->metadata().timestamp);\n> >> \n> >> + info->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);\n> >> +\n> >> if (request->findBuffer(&rawStream_))\n> >> pipe()->completeBuffer(request, buffer);\n> >> \n> >> @@ -1419,6 +1423,7 @@ void IPU3CameraData::statBufferReady(FrameBuffer *buffer)\n> >> ev.frame = info->id;\n> >> ev.bufferId = info->statBuffer->cookie();\n> >> ev.frameTimestamp = request->metadata().get(controls::SensorTimestamp);\n> >> + ev.sensorControls = info->effectiveSensorControls;\n> >> ipa_->processEvent(ev);\n> >> }\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 26AA3BF415\n\tfor ;\n\tWed, 10 Nov 2021 10:10:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75A516034A;\n\tWed, 10 Nov 2021 11:10:53 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F3EB760128\n\tfor ;\n\tWed, 10 Nov 2021 11:10:51 +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 A306DD8B;\n\tWed, 10 Nov 2021 11:10:51 +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=\"E7E0dBi+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636539051;\n\tbh=XD0G53mDd3cjl9rMO8xTGDEm21/apYsD/6Tk39sWEVs=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=E7E0dBi+ZkZowVGZ+2am3aJzrtYCeC7KSR8ZKql6iGADqTTqE+2z+Khuu3sD7lWqn\n\tw+XrOwbdKz77JhPchJqeK8QLIHg6DVZr7gPcAs/ZQlit7qWkiQNl4r/p9hLF2zHPOW\n\tioGYSOvWLCnjdaJfLrVC3PM83Wqsg3OVM1lAnN38=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<08fcc990-6988-4a58-2ef6-769b4f49f19e@ideasonboard.com>","References":"<20211108131350.130665-1-jeanmichel.hautbois@ideasonboard.com>\n\t<20211108131350.130665-3-jeanmichel.hautbois@ideasonboard.com>\n\t<163637929090.275423.7433274260383923313@Monstersaurus>\n\t<08fcc990-6988-4a58-2ef6-769b4f49f19e@ideasonboard.com>","From":"Kieran Bingham ","To":"Jean-Michel Hautbois ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Wed, 10 Nov 2021 10:10:49 +0000","Message-ID":"<163653904922.1896795.202745713652310401@Monstersaurus>","User-Agent":"alot/0.9.1","Subject":"Re: [libcamera-devel] [PATCH 02/22] ipu3: ipa: Report effective\n\tsensor controls with statistics to IPA","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\" "}}]