[{"id":30152,"web_url":"https://patchwork.libcamera.org/comment/30152/","msgid":"","date":"2024-06-29T04:51:30","subject":"Re: [PATCH 12/19] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","submitter":{"id":86,"url":"https://patchwork.libcamera.org/api/people/86/","name":"Umang Jain","email":"umang.jain@ideasonboard.com"},"content":"Hi Milan\n\nOn 26/06/24 12:50 pm, Milan Zamazal wrote:\n> This patch adds Algorithm::queueRequest call for the defined algorithms.\n> This is preparation only since there are currently no Algorithm based\n> algorithms defined.\n>\n> Signed-off-by: Milan Zamazal \n> ---\n> include/libcamera/internal/software_isp/software_isp.h | 1 +\n> include/libcamera/ipa/soft.mojom | 1 +\n> src/ipa/simple/soft_simple.cpp | 10 ++++++++++\n> src/libcamera/pipeline/simple/simple.cpp | 2 ++\n> src/libcamera/software_isp/software_isp.cpp | 10 ++++++++++\n> 5 files changed, 24 insertions(+)\n>\n> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\n> index 7365b49a..8753c2fd 100644\n> --- a/include/libcamera/internal/software_isp/software_isp.h\n> +++ b/include/libcamera/internal/software_isp/software_isp.h\n> @@ -72,6 +72,7 @@ public:\n> \tint start();\n> \tvoid stop();\n> \n> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls);\n> \tint queueBuffers(uint32_t frame, FrameBuffer *input,\n> \t\t\t const std::map &outputs);\n> \n> diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\n> index 4975b251..dad352ba 100644\n> --- a/include/libcamera/ipa/soft.mojom\n> +++ b/include/libcamera/ipa/soft.mojom\n> @@ -20,6 +20,7 @@ interface IPASoftInterface {\n> \t\t=> (int32 ret);\n> \n> prepare(uint32 frame);\n> + queueRequest(uint32 frame, libcamera.ControlList sensorControls);\n\nalignment needs to be fixed.\n> \t[async] processStats(uint32 frame, uint32 bufferId, libcamera.ControlList sensorControls);\n> };\n> \n> diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\n> index 9387508e..514a9db5 100644\n> --- a/src/ipa/simple/soft_simple.cpp\n> +++ b/src/ipa/simple/soft_simple.cpp\n> @@ -78,6 +78,7 @@ public:\n> \tint start() override;\n> \tvoid stop() override;\n> \n> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n> \tvoid prepare(const uint32_t frame) override;\n> \tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n> \t\t\t const ControlList &sensorControls) override;\n> @@ -272,6 +273,15 @@ void IPASoftSimple::prepare(const uint32_t frame)\n> \t\talgo->prepare(context_, frame, frameContext, params_);\n> }\n> \n> +void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &controls)\n> +{\n> +\tIPAFrameContext &frameContext = context_.frameContexts.alloc(frame);\n> +\n> +\tfor (auto const &algo : algorithms()) {\n> +\t\talgo->queueRequest(context_, frame, frameContext, controls);\n> +\t}\n> +}\n> +\n> void IPASoftSimple::processStats(\n> \tconst uint32_t frame,\n> \t[[maybe_unused]] const uint32_t bufferId,\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index 5cca94c3..0fa9db38 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -1421,6 +1421,8 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n> \tif (data->useConversion_)\n> \t\tdata->conversionQueue_.push(std::move(buffers));\n> \n> +\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n> +\n\nI think just passing request should be appropriate here\n\n+\tdata->swIsp_->queueRequest(request);\n\nwould read better? and get frame sequence and control list inside the \nfunction ?\n\n> \treturn 0;\n> }\n> \n> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\n> index 812bc910..ba3f1bae 100644\n> --- a/src/libcamera/software_isp/software_isp.cpp\n> +++ b/src/libcamera/software_isp/software_isp.cpp\n> @@ -277,6 +277,16 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,\n> \treturn count;\n> }\n> \n> +/**\n> + * \\brief Queue a request and process the control list from the application\n> + * \\param[in] frame The number of the frame which will be processed next\n> + * \\param[in] controls The controls for the \\a frame\n> + */\n> +void SoftwareIsp::queueRequest(const uint32_t frame, const ControlList &controls)\n> +{\n> +\tipa_->queueRequest(frame, controls);\n> +}\n> +\n> /**\n> * \\brief Queue buffers to Software ISP\n> * \\param[in] frame The frame number","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 6B244BDB1D\n\tfor ;\n\tSat, 29 Jun 2024 04:51:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 701E062C99;\n\tSat, 29 Jun 2024 06:51:38 +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 DE3CC619C7\n\tfor ;\n\tSat, 29 Jun 2024 06:51:35 +0200 (CEST)","from [IPV6:2405:201:2015:f873:55d7:c02e:b2eb:ee3f] (unknown\n\t[IPv6:2405:201:2015:f873:55d7:c02e:b2eb:ee3f])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 38A7F4B0;\n\tSat, 29 Jun 2024 06:51: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=\"dwiHlSwD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719636670;\n\tbh=hgz4IfWa9wL1l4AGuom9+Us/tOWj2XT6BiUazZcYM7I=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=dwiHlSwDLSy5NsKRcpJR9QG8NBNcYNtjUunE5pQx3N7unwuTwplcoq2B1FvS54hqo\n\t0yVskLhOJYdzYeca/AM2N1R8sFaJdAgjyqn1lifRs8OeCUK4Llt8DIu4e7HN+LbzPE\n\tpPg/uYnhNsPwbFytYhlh74BfvsHO30TQYEBvqAGQ=","Message-ID":"","Date":"Sat, 29 Jun 2024 10:21:30 +0530","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 12/19] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","Content-Language":"en-US","To":"Milan Zamazal , libcamera-devel@lists.libcamera.org","References":"<20240626072100.55497-1-mzamazal@redhat.com>\n\t<20240626072100.55497-13-mzamazal@redhat.com>","From":"Umang Jain ","In-Reply-To":"<20240626072100.55497-13-mzamazal@redhat.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":"","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":30282,"web_url":"https://patchwork.libcamera.org/comment/30282/","msgid":"<87y16iidok.fsf@redhat.com>","date":"2024-07-03T17:32:43","subject":"Re: [PATCH 12/19] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"content":"Hi Umang,\n\nthank you for review.\n\nUmang Jain writes:\n\n> Hi Milan\n>\n> On 26/06/24 12:50 pm, Milan Zamazal wrote:\n>> This patch adds Algorithm::queueRequest call for the defined algorithms.\n>> This is preparation only since there are currently no Algorithm based\n>> algorithms defined.\n>>\n>> Signed-off-by: Milan Zamazal \n>> ---\n>> include/libcamera/internal/software_isp/software_isp.h | 1 +\n>> include/libcamera/ipa/soft.mojom | 1 +\n>> src/ipa/simple/soft_simple.cpp | 10 ++++++++++\n>> src/libcamera/pipeline/simple/simple.cpp | 2 ++\n>> src/libcamera/software_isp/software_isp.cpp | 10 ++++++++++\n>> 5 files changed, 24 insertions(+)\n>>\n>> diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\n>> index 7365b49a..8753c2fd 100644\n>> --- a/include/libcamera/internal/software_isp/software_isp.h\n>> +++ b/include/libcamera/internal/software_isp/software_isp.h\n>> @@ -72,6 +72,7 @@ public:\n>> \tint start();\n>> \tvoid stop();\n>> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls);\n>> \tint queueBuffers(uint32_t frame, FrameBuffer *input,\n>> \t\t\t const std::map &outputs);\n>> diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\n>> index 4975b251..dad352ba 100644\n>> --- a/include/libcamera/ipa/soft.mojom\n>> +++ b/include/libcamera/ipa/soft.mojom\n>> @@ -20,6 +20,7 @@ interface IPASoftInterface {\n>> \t\t=> (int32 ret);\n>> prepare(uint32 frame);\n>> + queueRequest(uint32 frame, libcamera.ControlList sensorControls);\n>\n> alignment needs to be fixed.\n\nYes, tabs x spaces mismatch. :-(\n\n>> \t[async] processStats(uint32 frame, uint32 bufferId, libcamera.ControlList sensorControls);\n>> };\n>> diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\n>> index 9387508e..514a9db5 100644\n>> --- a/src/ipa/simple/soft_simple.cpp\n>> +++ b/src/ipa/simple/soft_simple.cpp\n>> @@ -78,6 +78,7 @@ public:\n>> \tint start() override;\n>> \tvoid stop() override;\n>> +\tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n>> \tvoid prepare(const uint32_t frame) override;\n>> \tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n>> \t\t\t const ControlList &sensorControls) override;\n>> @@ -272,6 +273,15 @@ void IPASoftSimple::prepare(const uint32_t frame)\n>> \t\talgo->prepare(context_, frame, frameContext, params_);\n>> }\n>> +void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &controls)\n>> +{\n>> +\tIPAFrameContext &frameContext = context_.frameContexts.alloc(frame);\n>> +\n>> +\tfor (auto const &algo : algorithms()) {\n>> +\t\talgo->queueRequest(context_, frame, frameContext, controls);\n>> +\t}\n>> +}\n>> +\n>> void IPASoftSimple::processStats(\n>> \tconst uint32_t frame,\n>> \t[[maybe_unused]] const uint32_t bufferId,\n>> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n>> index 5cca94c3..0fa9db38 100644\n>> --- a/src/libcamera/pipeline/simple/simple.cpp\n>> +++ b/src/libcamera/pipeline/simple/simple.cpp\n>> @@ -1421,6 +1421,8 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n>> \tif (data->useConversion_)\n>> \t\tdata->conversionQueue_.push(std::move(buffers));\n>> +\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n>> +\n>\n> I think just passing request should be appropriate here\n>\n> +\tdata->swIsp_->queueRequest(request);\n>\n> would read better? and get frame sequence and control list inside the function ?\n\nThe other pipelines (rkisp1, ipu3) use the two arguments, because they\nmust. Although it's not necessary here, I think it's better to be\nconsistent and not to move the logic down. So I'll keep it as it is for\nnow, let's see what the other reviewers think.\n\n>> \treturn 0;\n>> }\n>> diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\n>> index 812bc910..ba3f1bae 100644\n>> --- a/src/libcamera/software_isp/software_isp.cpp\n>> +++ b/src/libcamera/software_isp/software_isp.cpp\n>> @@ -277,6 +277,16 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,\n>> \treturn count;\n>> }\n>> +/**\n>> + * \\brief Queue a request and process the control list from the application\n>> + * \\param[in] frame The number of the frame which will be processed next\n>> + * \\param[in] controls The controls for the \\a frame\n>> + */\n>> +void SoftwareIsp::queueRequest(const uint32_t frame, const ControlList &controls)\n>> +{\n>> +\tipa_->queueRequest(frame, controls);\n>> +}\n>> +\n>> /**\n>> * \\brief Queue buffers to Software ISP\n>> * \\param[in] frame The frame number","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 7D70ABEFBE\n\tfor ;\n\tWed, 3 Jul 2024 17:32:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2131762E25;\n\tWed, 3 Jul 2024 19:32:51 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8EE6662C95\n\tfor ;\n\tWed, 3 Jul 2024 19:32:49 +0200 (CEST)","from mail-lf1-f71.google.com (mail-lf1-f71.google.com\n\t[209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-542-BsxgGIiLOzypWrq7n8N-mQ-1; Wed, 03 Jul 2024 13:32:47 -0400","by mail-lf1-f71.google.com with SMTP id\n\t2adb3069b0e04-52e9763468aso1442813e87.1\n\tfor ;\n\tWed, 03 Jul 2024 10:32:46 -0700 (PDT)","from nuthatch (ip-77-48-47-2.net.vodafone.cz. [77.48.47.2])\n\tby smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-a751561bb1bsm393545766b.37.2024.07.03.10.32.43\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 03 Jul 2024 10:32:43 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"flnpeNMN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1720027968;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=uzy3Z/3yVZ9NPF0hopCJH0cZxBxJUUMGh0BflrAfiA0=;\n\tb=flnpeNMNFGjCwtqJxIamnPKrS+++PR2isWUl53lGe849Lg5r6poWid+rgXrMvk/rpOcTb0\n\tUgHlpFIP3sOSMb5rqrYIrOJSWdwFF5HDdganvjAUOtr+SR4+YgcxPkvzk6e756p8RSBidh\n\t5n8NDBJgEaaK86ZUekws6a/evJ6p6G4=","X-MC-Unique":"BsxgGIiLOzypWrq7n8N-mQ-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1720027965; x=1720632765;\n\th=mime-version:user-agent:message-id:date:references:in-reply-to\n\t:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=uzy3Z/3yVZ9NPF0hopCJH0cZxBxJUUMGh0BflrAfiA0=;\n\tb=i9YAMXVhF+4pmpF6+pq+KBBRqhPS/vbqucFxDze27ogYDV1yAOgmxqDnzvQrfsIGpH\n\thKqYHwjumMocVV1CWCdPR2QVWReDeWmG1b1KDrLUCtPiIfzt0SGWe0k1OzGVYSPyjGC2\n\t1sRD7y18APcxgcau++UbbPBdG4bhIZnpw9+A7Y+ZqoKAEdXWmOzTjy52dDID2zjni4fo\n\tqhWBBJFlxzQaRhh8xxM1a3vhjOvN8aLHiQEu1e3HYcpw90y1gGxcQIKrJaIuOUO6yz16\n\tnAebDOdi4nAZVZCe3Ns4ZBNKR3/ZYVmDv1wyJiMM+s66hLEl2ND7G9kRaEIRTwHaCtFi\n\tiijQ==","X-Gm-Message-State":"AOJu0Yx7DIud7nMpRu3HGvq1jeUFDkYDopP+tTIVKoGRq3Gv+/SPB+oH\n\tvOOcZsYVEhb+5pwA82NJ5y1MJW3ajkVBqgDKO5+ioT0fp6308ZjbWYERD4HFPNrtVej0y54VM7k\n\tltEUa2bR3QVDe6dp6oi9biZe4xGbgqxRiahv2EC9l24+cfg2YVeK4dWa1I2hyoZry6v712RTtzk\n\tvill548jeMAv79rReWerD/M8Has98jxu6FzCNBLKvd5r6rCwiD8g7lTcA=","X-Received":["by 2002:a05:6512:3d29:b0:52c:db76:2a7a with SMTP id\n\t2adb3069b0e04-52e82687e6dmr11630829e87.34.1720027965138; \n\tWed, 03 Jul 2024 10:32:45 -0700 (PDT)","by 2002:a05:6512:3d29:b0:52c:db76:2a7a with SMTP id\n\t2adb3069b0e04-52e82687e6dmr11630809e87.34.1720027964540; \n\tWed, 03 Jul 2024 10:32:44 -0700 (PDT)"],"X-Google-Smtp-Source":"AGHT+IGLWOAyMh+O6Y3B+wdBEbFlX1Q6y54f5pSkYv8Zq7yvqSQxcOTulbe3zgyMQE5qlVXIdQiMTg==","From":"Milan Zamazal ","To":"Umang Jain ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH 12/19] libcamera: software_isp: Call\n\tAlgorithm::queueRequest","In-Reply-To":" (Umang\n\tJain's message of \"Sat, 29 Jun 2024 10:21:30 +0530\")","References":"<20240626072100.55497-1-mzamazal@redhat.com>\n\t<20240626072100.55497-13-mzamazal@redhat.com>\n\t","Date":"Wed, 03 Jul 2024 19:32:43 +0200","Message-ID":"<87y16iidok.fsf@redhat.com>","User-Agent":"Gnus/5.13 (Gnus v5.13)","MIME-Version":"1.0","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain","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\" "}}]