{"id":22441,"url":"https://patchwork.libcamera.org/api/1.1/patches/22441/?format=json","web_url":"https://patchwork.libcamera.org/patch/22441/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20241220162724.756494-2-stefan.klug@ideasonboard.com>","date":"2024-12-20T16:26:47","name":"[RFC,1/7] libcamera: delayed_controls: Add push() function that accepts a sequence number","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c6107d488256c7a6a7e095cac1cc52c9b43dca54","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/22441/mbox/","series":[{"id":4925,"url":"https://patchwork.libcamera.org/api/1.1/series/4925/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4925","date":"2024-12-20T16:26:46","name":"Improve regulation on rkisp1","version":1,"mbox":"https://patchwork.libcamera.org/series/4925/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/22441/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/22441/checks/","tags":{},"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 E5ED2C327D\n\tfor ;\n\tFri, 20 Dec 2024 16:27:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8E1C6684AE;\n\tFri, 20 Dec 2024 17:27:33 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D41F3684B0\n\tfor ;\n\tFri, 20 Dec 2024 17:27:30 +0100 (CET)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:4eeb:7fa7:1fd0:c13d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 27D35B2B;\n\tFri, 20 Dec 2024 17:26: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=\"ENc8XRD9\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1734712011;\n\tbh=ORIfxUJ3LyKZFWZ3XrcRzMS9DCyA9wbndIgzn5uYX8E=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ENc8XRD9JRpAvEKln7SdbEp8K1RemRQcFltoFunf4VStK0qw9TcabEUEzt8TVNVoZ\n\t4VyU75K0ArWozrV2wvFHdqpfLbp5tXx5+iVNN8oxS9o5e/VJan4JazWmkFkEeDNK3v\n\tdVtmgez61Tu/dnWOAPz6vpDzOgtUJWzkMzqkINds=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[RFC PATCH 1/7] libcamera: delayed_controls: Add push() function\n\tthat accepts a sequence number","Date":"Fri, 20 Dec 2024 17:26:47 +0100","Message-ID":"<20241220162724.756494-2-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20241220162724.756494-1-stefan.klug@ideasonboard.com>","References":"<20241220162724.756494-1-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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\" "},"content":"The push function is assymetric to the get() and applyControls()\nfunction in that it doesn't allow to specify a frame number. This leads\nto the unfortunate situation that it is very difficult to detect if\nanything goes out of sync. Add a version of the push() function that\ntakes a sequence paramater and warns when the sequence provided differs\nfrom the expected sequence. Don't take any further actions for now to\nsee where issues pop up.\n\nSigned-off-by: Stefan Klug \n---\n include/libcamera/internal/delayed_controls.h | 1 +\n src/libcamera/delayed_controls.cpp | 33 +++++++++++++++++--\n 2 files changed, 32 insertions(+), 2 deletions(-)","diff":"diff --git a/include/libcamera/internal/delayed_controls.h b/include/libcamera/internal/delayed_controls.h\nindex e8d3014d92cb..f1467fd79814 100644\n--- a/include/libcamera/internal/delayed_controls.h\n+++ b/include/libcamera/internal/delayed_controls.h\n@@ -30,6 +30,7 @@ public:\n \tvoid reset();\n \n \tbool push(const ControlList &controls);\n+\tbool push(uint32_t sequence, const ControlList &controls);\n \tControlList get(uint32_t sequence);\n \n \tvoid applyControls(uint32_t sequence);\ndiff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\nindex 94d0a575b01b..6c82d5058ae8 100644\n--- a/src/libcamera/delayed_controls.cpp\n+++ b/src/libcamera/delayed_controls.cpp\n@@ -144,10 +144,39 @@ void DelayedControls::reset()\n * Push a set of controls to the control queue. This increases the control queue\n * depth by one.\n *\n+ * \\note The usage of this function is discouraged as it does not provide a way\n+ * to detect double pushes for the same sequence. Better\n+ * DelayedControls::push(uint32_t sequence, const ControlList &controls)\n+ * instead.\n+ *\n * \\returns true if \\a controls are accepted, or false otherwise\n */\n-bool DelayedControls::push(const ControlList &controls)\n+bool DelayedControls::push(const ControlList &controls) {\n+\tLOG(DelayedControls, Debug) << \"Deprecated: Push without sequence number\";\n+\treturn push(queueCount_, controls);\n+}\n+\n+/**\n+ * \\brief Push a set of controls on the queue\n+ * \\param[in] sequence The sequence number to push for\n+ * \\param[in] controls List of controls to add to the device queue\n+ *\n+ * Push a set of controls to the control queue. This increases the control queue\n+ * depth by one.\n+ *\n+ * The \\a sequence number is used to do some sanity checks to detect double\n+ * pushes for the same sequence (either due to a bug or a request underrun).\n+ *\n+ * \\returns true if \\a controls are accepted, or false otherwise\n+ */\n+bool DelayedControls::push(uint32_t sequence, const ControlList &controls)\n {\n+\tif(sequence != queueCount_) {\n+\t\tLOG(DelayedControls, Warning)\n+\t\t\t<< \"Double push for sequence \" << sequence\n+\t\t\t<< \" current queue index: \" << queueCount_;\n+\t}\n+\n \t/* Copy state from previous frame. */\n \tfor (auto &ctrl : values_) {\n \t\tInfo &info = ctrl.second[queueCount_];\n@@ -276,7 +305,7 @@ void DelayedControls::applyControls(uint32_t sequence)\n \twhile (writeCount_ > queueCount_) {\n \t\tLOG(DelayedControls, Debug)\n \t\t\t<< \"Queue is empty, auto queue no-op.\";\n-\t\tpush({});\n+\t\tpush(queueCount_, {});\n \t}\n \n \tdevice_->setControls(&out);\n","prefixes":["RFC","1/7"]}