[{"id":15563,"web_url":"https://patchwork.libcamera.org/comment/15563/","msgid":"","date":"2021-03-09T09:56:19","subject":"Re: [libcamera-devel] [PATCH v4 4/7] libcamera: delayed_controls:\n\tRemove spurious no-op queued controls","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"content":"On 04/03/2021 09:17, Naushir Patuck wrote:\n> In DelayedControls::applyControls(), the controls queue would be\n> extended via a no-op control push to fill the intermittent slots with\n> unchanged control values. This is needed so that we read back unchanged\n> control values correctly on every frame.\n> \n> However, there was one additional no-op performed on every frame that is\n> not required, meaning that any controls queued by the pipeline handler\n> would have their write delayed by one further frame. The original\n> StaggeredCtrl did not do this, as it only had one index to manage,\n> whereas DelayedControls uses two.\n> \n> Remove this last no-op push so that the pipeline_handler provided\n> controls would be written on the very next frame if possible. As a\n> consequence, we must mark the control update as completed within the\n> DelayedControls::applyControls() loop, otherwise it might get reused\n> when cycling through the ring buffer.\n> \n> Signed-off-by: Naushir Patuck \n> Reported-by: David Plowman \n> Fixes: 3d4b7b005911 (\"libcamera: delayed_controls: Add helper for controls that apply with a delay\")\n> Tested-by: David Plowman \n> Reviewed-by: Paul Elder \nTested-by: Jean-Michel Hautbois \n> ---\n> src/libcamera/delayed_controls.cpp | 9 ++++++---\n> 1 file changed, 6 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\n> index f6d761d1cc41..5a05741c0285 100644\n> --- a/src/libcamera/delayed_controls.cpp\n> +++ b/src/libcamera/delayed_controls.cpp\n> @@ -226,11 +226,11 @@ void DelayedControls::applyControls(uint32_t sequence)\n> \t * values are set in time to satisfy the sensor delay.\n> \t */\n> \tControlList out(device_->controls());\n> -\tfor (const auto &ctrl : values_) {\n> +\tfor (auto &ctrl : values_) {\n> \t\tconst ControlId *id = ctrl.first;\n> \t\tunsigned int delayDiff = maxDelay_ - controlParams_[id].delay;\n> \t\tunsigned int index = std::max(0, writeCount_ - delayDiff);\n> -\t\tconst Info &info = ctrl.second[index];\n> +\t\tInfo &info = ctrl.second[index];\n> \n> \t\tif (info.updated) {\n> \t\t\tif (controlParams_[id].priorityWrite) {\n> @@ -253,12 +253,15 @@ void DelayedControls::applyControls(uint32_t sequence)\n> \t\t\t\t<< \"Setting \" << id->name()\n> \t\t\t\t<< \" to \" << info.toString()\n> \t\t\t\t<< \" at index \" << index;\n> +\n> +\t\t\t/* Done with this update, so mark as completed. */\n> +\t\t\tinfo.updated = false;\n> \t\t}\n> \t}\n> \n> \twriteCount_++;\n> \n> -\twhile (writeCount_ >= queueCount_) {\n> +\twhile (writeCount_ > queueCount_) {\n> \t\tLOG(DelayedControls, Debug)\n> \t\t\t<< \"Queue is empty, auto queue no-op.\";\n> \t\tpush({});\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 335BCBD80C\n\tfor ;\n\tTue, 9 Mar 2021 09:56:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E97BE68A92;\n\tTue, 9 Mar 2021 10:56:21 +0100 (CET)","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 B9C706051F\n\tfor ;\n\tTue, 9 Mar 2021 10:56:19 +0100 (CET)","from [IPv6:2a01:e0a:169:7140:eb55:7706:22b:1e57] (unknown\n\t[IPv6:2a01:e0a:169:7140:eb55:7706:22b:1e57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6E776A1B;\n\tTue, 9 Mar 2021 10:56:19 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"D1C5CCQh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615283779;\n\tbh=Cfb0EPNhFEJjAIODZ/X/SoRNhS/IJg6cEhZ7TAvcGh4=;\n\th=Subject:To:References:From:Date:In-Reply-To:From;\n\tb=D1C5CCQh7kqhgK12+6FYk6LrRBNrU0DjaqBgkoqEyhpjAgG0TSLaiGuOPOHMMhxR7\n\tSkVnkzgHAqHF6g16P/HPmnBT+9ZBpUY3TXAQ/K8pplX1Ww/voAxCwV4wRWjs6MZ8uQ\n\tYs3dR/GGfuK7KQEWohHT/XCgVOfTvcUFpjsTwky0=","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210304081728.1058394-1-naush@raspberrypi.com>\n\t<20210304081728.1058394-5-naush@raspberrypi.com>","From":"Jean-Michel Hautbois ","Message-ID":"","Date":"Tue, 9 Mar 2021 10:56:19 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.7.1","MIME-Version":"1.0","In-Reply-To":"<20210304081728.1058394-5-naush@raspberrypi.com>","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v4 4/7] libcamera: delayed_controls:\n\tRemove spurious no-op queued controls","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15615,"web_url":"https://patchwork.libcamera.org/comment/15615/","msgid":"<087a93dc-4102-787c-5c72-731c47b8dd88@ideasonboard.com>","date":"2021-03-12T13:30:22","subject":"Re: [libcamera-devel] [PATCH v4 4/7] libcamera: delayed_controls:\n\tRemove spurious no-op queued controls","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 04/03/2021 08:17, Naushir Patuck wrote:\n> In DelayedControls::applyControls(), the controls queue would be\n> extended via a no-op control push to fill the intermittent slots with\n> unchanged control values. This is needed so that we read back unchanged\n> control values correctly on every frame.\n> \n> However, there was one additional no-op performed on every frame that is\n> not required, meaning that any controls queued by the pipeline handler\n> would have their write delayed by one further frame. The original\n> StaggeredCtrl did not do this, as it only had one index to manage,\n> whereas DelayedControls uses two.\n> \n> Remove this last no-op push so that the pipeline_handler provided\n> controls would be written on the very next frame if possible. As a\n> consequence, we must mark the control update as completed within the\n> DelayedControls::applyControls() loop, otherwise it might get reused\n> when cycling through the ring buffer.\n> \n> Signed-off-by: Naushir Patuck \n> Reported-by: David Plowman \n> Fixes: 3d4b7b005911 (\"libcamera: delayed_controls: Add helper for controls that apply with a delay\")\n> Tested-by: David Plowman \n> Reviewed-by: Paul Elder \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/libcamera/delayed_controls.cpp | 9 ++++++---\n> 1 file changed, 6 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp\n> index f6d761d1cc41..5a05741c0285 100644\n> --- a/src/libcamera/delayed_controls.cpp\n> +++ b/src/libcamera/delayed_controls.cpp\n> @@ -226,11 +226,11 @@ void DelayedControls::applyControls(uint32_t sequence)\n> \t * values are set in time to satisfy the sensor delay.\n> \t */\n> \tControlList out(device_->controls());\n> -\tfor (const auto &ctrl : values_) {\n> +\tfor (auto &ctrl : values_) {\n> \t\tconst ControlId *id = ctrl.first;\n> \t\tunsigned int delayDiff = maxDelay_ - controlParams_[id].delay;\n> \t\tunsigned int index = std::max(0, writeCount_ - delayDiff);\n> -\t\tconst Info &info = ctrl.second[index];\n> +\t\tInfo &info = ctrl.second[index];\n> \n> \t\tif (info.updated) {\n> \t\t\tif (controlParams_[id].priorityWrite) {\n> @@ -253,12 +253,15 @@ void DelayedControls::applyControls(uint32_t sequence)\n> \t\t\t\t<< \"Setting \" << id->name()\n> \t\t\t\t<< \" to \" << info.toString()\n> \t\t\t\t<< \" at index \" << index;\n> +\n> +\t\t\t/* Done with this update, so mark as completed. */\n> +\t\t\tinfo.updated = false;\n> \t\t}\n> \t}\n> \n> \twriteCount_++;\n> \n> -\twhile (writeCount_ >= queueCount_) {\n> +\twhile (writeCount_ > queueCount_) {\n> \t\tLOG(DelayedControls, Debug)\n> \t\t\t<< \"Queue is empty, auto queue no-op.\";\n> \t\tpush({});\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 A3CD9BD80C\n\tfor ;\n\tFri, 12 Mar 2021 13:30:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E3C5B68C6A;\n\tFri, 12 Mar 2021 14:30:26 +0100 (CET)","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 DC0ED68C67\n\tfor ;\n\tFri, 12 Mar 2021 14:30:25 +0100 (CET)","from [192.168.0.20]\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 62F6FA2A;\n\tFri, 12 Mar 2021 14:30:25 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"QLvRv8Q8\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615555825;\n\tbh=mleHnXllHC30wYmwrHDvoObl569MXjNUG3zTZCQf8Cg=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=QLvRv8Q8ugGFY/j375Giu/jr1VtZXeeyWW+bBR5PFjn9J+JpyCngifCO1qsguHVqx\n\t0mb848/KziylNdEstA2AgpM6Jn8wKny30Pra04SkidxzJdTpZOFAtBbwN+G6J3qPRg\n\tAQaaZo+mEuKCQbxP6QAfprU6xGyzrocoMprBAMAo=","To":"Naushir Patuck ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210304081728.1058394-1-naush@raspberrypi.com>\n\t<20210304081728.1058394-5-naush@raspberrypi.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<087a93dc-4102-787c-5c72-731c47b8dd88@ideasonboard.com>","Date":"Fri, 12 Mar 2021 13:30:22 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210304081728.1058394-5-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v4 4/7] libcamera: delayed_controls:\n\tRemove spurious no-op queued controls","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]