[{"id":17217,"web_url":"https://patchwork.libcamera.org/comment/17217/","msgid":"","date":"2021-05-24T23:52:13","subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch. I'm going through the patchwork backlog and\nrealized I had forgotten about this one. Sorry about that.\n\nOn Tue, Apr 27, 2021 at 10:21:50AM +0900, Hirokazu Honda wrote:\n> The original updateControls() has the assumption that ctrls and\n> v4l2Ctrls lists are in the same order. It is dependent on the\n> caller implementation though. This changes updateControls()\n> implementation so that it works without the assumption.\n> \n> Signed-off-by: Hirokazu Honda \n\nReviewed-by: Laurent Pinchart \n\nWill push shortly once the tests pass.\n\n> ---\n> src/libcamera/v4l2_device.cpp | 26 +++++++-------------------\n> 1 file changed, 7 insertions(+), 19 deletions(-)\n> \n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 397029ac..64501523 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -178,12 +178,6 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n> \n> \tControlList ctrls{ controls_ };\n> \n> -\t/*\n> -\t * Start by filling the ControlList. This can't be combined with filling\n> -\t * v4l2Ctrls, as updateControls() relies on both containers having the\n> -\t * same order, and the control list is based on a map, which is not\n> -\t * sorted by insertion order.\n> -\t */\n> \tfor (uint32_t id : ids) {\n> \t\tconst auto iter = controls_.find(id);\n> \t\tif (iter == controls_.end()) {\n> @@ -520,19 +514,13 @@ void V4L2Device::listControls()\n> void V4L2Device::updateControls(ControlList *ctrls,\n> \t\t\t\tSpan v4l2Ctrls)\n> {\n> -\tunsigned int i = 0;\n> -\tfor (auto &ctrl : *ctrls) {\n> -\t\tif (i == v4l2Ctrls.size())\n> -\t\t\tbreak;\n> +\tfor (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> +\t\tconst unsigned int id = v4l2Ctrl.id;\n> \n> -\t\tconst struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];\n> -\t\tunsigned int id = ctrl.first;\n> -\t\tControlValue &value = ctrl.second;\n> -\n> -\t\tconst auto iter = controls_.find(id);\n> -\t\tswitch (iter->first->type()) {\n> +\t\tControlValue value = ctrls->get(id);\n> +\t\tswitch (value.type()) {\n> \t\tcase ControlTypeInteger64:\n> -\t\t\tvalue.set(v4l2Ctrl->value64);\n> +\t\t\tvalue.set(v4l2Ctrl.value64);\n> \t\t\tbreak;\n> \n> \t\tcase ControlTypeByte:\n> @@ -547,11 +535,11 @@ void V4L2Device::updateControls(ControlList *ctrls,\n> \t\t\t * \\todo To be changed when support for string controls\n> \t\t\t * will be added.\n> \t\t\t */\n> -\t\t\tvalue.set(v4l2Ctrl->value);\n> +\t\t\tvalue.set(v4l2Ctrl.value);\n> \t\t\tbreak;\n> \t\t}\n> \n> -\t\ti++;\n> +\t\tctrls->set(id, value);\n> \t}\n> }\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 C6B70C3200\n\tfor ;\n\tMon, 24 May 2021 23:52:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C5BF768919;\n\tTue, 25 May 2021 01:52:21 +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 2B1E1601A9\n\tfor ;\n\tTue, 25 May 2021 01:52:19 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 85F4A344;\n\tTue, 25 May 2021 01:52:18 +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=\"ZhyhLJAW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621900338;\n\tbh=gvpBmrhiVFW5tX0YM8KzWpELOJlW/fRytt7flxUKykA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=ZhyhLJAWLkCzLTChXcOd2M4enfwn6htJ+PqVqYHkEXbmhGswqgG3xO6P/ISTC3Nzv\n\tHbLdHPdnNZKoDf4wtTvWZv3T5xldyu4GsbGL01kzHERyhj4T6Dsw72pnFvaXcpzg6X\n\tKOzyjXtT6Zh6vZefDO5NIII7F8xTlZoeMbYidWx8=","Date":"Tue, 25 May 2021 02:52:13 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210427012150.5338-1-hiroh@chromium.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210427012150.5338-1-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","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","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17225,"web_url":"https://patchwork.libcamera.org/comment/17225/","msgid":"","date":"2021-05-25T05:35:17","subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Laurent,\n\nOn Tue, May 25, 2021 at 8:52 AM Laurent Pinchart <\nlaurent.pinchart@ideasonboard.com> wrote:\n\n> Hi Hiro,\n>\n> Thank you for the patch. I'm going through the patchwork backlog and\n> realized I had forgotten about this one. Sorry about that.\n>\n> On Tue, Apr 27, 2021 at 10:21:50AM +0900, Hirokazu Honda wrote:\n> > The original updateControls() has the assumption that ctrls and\n> > v4l2Ctrls lists are in the same order. It is dependent on the\n> > caller implementation though. This changes updateControls()\n> > implementation so that it works without the assumption.\n> >\n> > Signed-off-by: Hirokazu Honda \n>\n> Reviewed-by: Laurent Pinchart \n>\n> Will push shortly once the tests pass.\n>\n>\nI am sorry I noticed the patch has a bug. Somehow I haven't caught it.\nI submit a fix patch for review.\nhttps://patchwork.libcamera.org/patch/12396/\n\n-Hiro\n\n\n> > ---\n> > src/libcamera/v4l2_device.cpp | 26 +++++++-------------------\n> > 1 file changed, 7 insertions(+), 19 deletions(-)\n> >\n> > diff --git a/src/libcamera/v4l2_device.cpp\n> b/src/libcamera/v4l2_device.cpp\n> > index 397029ac..64501523 100644\n> > --- a/src/libcamera/v4l2_device.cpp\n> > +++ b/src/libcamera/v4l2_device.cpp\n> > @@ -178,12 +178,6 @@ ControlList V4L2Device::getControls(const\n> std::vector &ids)\n> >\n> > ControlList ctrls{ controls_ };\n> >\n> > - /*\n> > - * Start by filling the ControlList. This can't be combined with\n> filling\n> > - * v4l2Ctrls, as updateControls() relies on both containers having\n> the\n> > - * same order, and the control list is based on a map, which is not\n> > - * sorted by insertion order.\n> > - */\n> > for (uint32_t id : ids) {\n> > const auto iter = controls_.find(id);\n> > if (iter == controls_.end()) {\n> > @@ -520,19 +514,13 @@ void V4L2Device::listControls()\n> > void V4L2Device::updateControls(ControlList *ctrls,\n> > Span v4l2Ctrls)\n> > {\n> > - unsigned int i = 0;\n> > - for (auto &ctrl : *ctrls) {\n> > - if (i == v4l2Ctrls.size())\n> > - break;\n> > + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> > + const unsigned int id = v4l2Ctrl.id;\n> >\n> > - const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];\n> > - unsigned int id = ctrl.first;\n> > - ControlValue &value = ctrl.second;\n> > -\n> > - const auto iter = controls_.find(id);\n> > - switch (iter->first->type()) {\n> > + ControlValue value = ctrls->get(id);\n> > + switch (value.type()) {\n> > case ControlTypeInteger64:\n> > - value.set(v4l2Ctrl->value64);\n> > + value.set(v4l2Ctrl.value64);\n> > break;\n> >\n> > case ControlTypeByte:\n> > @@ -547,11 +535,11 @@ void V4L2Device::updateControls(ControlList *ctrls,\n> > * \\todo To be changed when support for string\n> controls\n> > * will be added.\n> > */\n> > - value.set(v4l2Ctrl->value);\n> > + value.set(v4l2Ctrl.value);\n> > break;\n> > }\n> >\n> > - i++;\n> > + ctrls->set(id, value);\n> > }\n> > }\n> >\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\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 74868C3201\n\tfor ;\n\tTue, 25 May 2021 05:35:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 37E8068921;\n\tTue, 25 May 2021 07:35:30 +0200 (CEST)","from mail-ed1-x532.google.com (mail-ed1-x532.google.com\n\t[IPv6:2a00:1450:4864:20::532])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C1D75602AC\n\tfor ;\n\tTue, 25 May 2021 07:35:28 +0200 (CEST)","by mail-ed1-x532.google.com with SMTP id h16so34587740edr.6\n\tfor ;\n\tMon, 24 May 2021 22:35:28 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"M15piypn\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=7LJxcvodiHG5awr3QaxbYCw99QYQyIXNM6Ezcec1Giw=;\n\tb=M15piypnb2Is3wl8e/8/4mheFtMfdlYFJ9N0fMjsMrHH47ttbmv8kHjvheeP9tM1fQ\n\topzE5dI/SimNM4+RB0QWywdK8+DkRkhALVdS6DXoxlN9bmf6ITZJi11c5FTwbH4UhY5h\n\tMdjKoEACRdQdDr43zOlcpVk8/udh4vEYZtV7E=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=7LJxcvodiHG5awr3QaxbYCw99QYQyIXNM6Ezcec1Giw=;\n\tb=hkTkBdOKFLG3OE4uQUm1CPF/Bc0e98Jpu9105C2d/YnOg94mTiWOoQtjcQMS0U3zKy\n\tSZ5fonmHMBPQWeFIon0V2EzKDb98AQbLs67TS9DUuWlh/jrBozmtYAY3Jmg/g9L7pMNQ\n\t3Bcnl9BMqM4e4RQZM9lzjjfmHcPu3FTYhoP4livNGQDg363w6wuzGMJURHwDWOgHYI3D\n\tMfJRfad7qNjR97rXrn7fUvbM+W1/5g5nYMdzwd58v6dzJAWuNdOXUERlFPiQXVZfCifQ\n\tdu5upoCq8JmI1yeOm4UY5tEXWDviLj196vaHNZMrjXBN4534cetsw+H3Xn0cBvwMDpG1\n\to8dw==","X-Gm-Message-State":"AOAM532ed41KvyylhV6G+eW+f9uWZZuB4guthi8x52HVrwetEEJP/Tzq\n\tW4c/8J4RXno/u69lz0LplcxHTG4UsjDw2sXBWvVKcQ==","X-Google-Smtp-Source":"ABdhPJxO/swcIYKvCKdWfia3eglPEANhXAYLgVPTRFoLZ8fMXz/GzHWFbMrOeaFHBGHporkpe/FCjHkbe+ND8xer1Sk=","X-Received":"by 2002:a50:bec1:: with SMTP id\n\te1mr29932744edk.116.1621920928456; \n\tMon, 24 May 2021 22:35:28 -0700 (PDT)","MIME-Version":"1.0","References":"<20210427012150.5338-1-hiroh@chromium.org>\n\t","In-Reply-To":"","From":"Hirokazu Honda ","Date":"Tue, 25 May 2021 14:35:17 +0900","Message-ID":"","To":"Laurent Pinchart ","Content-Type":"multipart/alternative; boundary=\"000000000000cb75c605c320e431\"","Subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17226,"web_url":"https://patchwork.libcamera.org/comment/17226/","msgid":"","date":"2021-05-25T08:58:51","subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nOn Tue, May 25, 2021 at 02:35:17PM +0900, Hirokazu Honda wrote:\n> On Tue, May 25, 2021 at 8:52 AM Laurent Pinchart wrote:\n> > Hi Hiro,\n> >\n> > Thank you for the patch. I'm going through the patchwork backlog and\n> > realized I had forgotten about this one. Sorry about that.\n> >\n> > On Tue, Apr 27, 2021 at 10:21:50AM +0900, Hirokazu Honda wrote:\n> > > The original updateControls() has the assumption that ctrls and\n> > > v4l2Ctrls lists are in the same order. It is dependent on the\n> > > caller implementation though. This changes updateControls()\n> > > implementation so that it works without the assumption.\n> > >\n> > > Signed-off-by: Hirokazu Honda \n> >\n> > Reviewed-by: Laurent Pinchart \n> >\n> > Will push shortly once the tests pass.\n>\n> I am sorry I noticed the patch has a bug. Somehow I haven't caught it.\n> I submit a fix patch for review.\n> https://patchwork.libcamera.org/patch/12396/\n\nOops :-S We've received reports from users who are affected by this, so\nI've sent a revert that I'll merge now, to be able to discuss the fix\nwithout pressure.\n\n> > > ---\n> > > src/libcamera/v4l2_device.cpp | 26 +++++++-------------------\n> > > 1 file changed, 7 insertions(+), 19 deletions(-)\n> > >\n> > > diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> > > index 397029ac..64501523 100644\n> > > --- a/src/libcamera/v4l2_device.cpp\n> > > +++ b/src/libcamera/v4l2_device.cpp\n> > > @@ -178,12 +178,6 @@ ControlList V4L2Device::getControls(const std::vector &ids)\n> > >\n> > > ControlList ctrls{ controls_ };\n> > >\n> > > - /*\n> > > - * Start by filling the ControlList. This can't be combined with filling\n> > > - * v4l2Ctrls, as updateControls() relies on both containers having the\n> > > - * same order, and the control list is based on a map, which is not\n> > > - * sorted by insertion order.\n> > > - */\n> > > for (uint32_t id : ids) {\n> > > const auto iter = controls_.find(id);\n> > > if (iter == controls_.end()) {\n> > > @@ -520,19 +514,13 @@ void V4L2Device::listControls()\n> > > void V4L2Device::updateControls(ControlList *ctrls,\n> > > Span v4l2Ctrls)\n> > > {\n> > > - unsigned int i = 0;\n> > > - for (auto &ctrl : *ctrls) {\n> > > - if (i == v4l2Ctrls.size())\n> > > - break;\n> > > + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> > > + const unsigned int id = v4l2Ctrl.id;\n> > >\n> > > - const struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];\n> > > - unsigned int id = ctrl.first;\n> > > - ControlValue &value = ctrl.second;\n> > > -\n> > > - const auto iter = controls_.find(id);\n> > > - switch (iter->first->type()) {\n> > > + ControlValue value = ctrls->get(id);\n> > > + switch (value.type()) {\n> > > case ControlTypeInteger64:\n> > > - value.set(v4l2Ctrl->value64);\n> > > + value.set(v4l2Ctrl.value64);\n> > > break;\n> > >\n> > > case ControlTypeByte:\n> > > @@ -547,11 +535,11 @@ void V4L2Device::updateControls(ControlList *ctrls,\n> > > * \\todo To be changed when support for string controls\n> > > * will be added.\n> > > */\n> > > - value.set(v4l2Ctrl->value);\n> > > + value.set(v4l2Ctrl.value);\n> > > break;\n> > > }\n> > >\n> > > - i++;\n> > > + ctrls->set(id, value);\n> > > }\n> > > }\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 44E40C3202\n\tfor ;\n\tTue, 25 May 2021 08:59:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 44FD568924;\n\tTue, 25 May 2021 10:58:58 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2EC14602AF\n\tfor ;\n\tTue, 25 May 2021 10:58:57 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A3144344;\n\tTue, 25 May 2021 10:58:56 +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=\"csO8hvP7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621933136;\n\tbh=9yWBgBnek/7C4rkkbQBYpsP0cABIUGv4hP+zP3J2M0A=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=csO8hvP7l0M9jUYtx7u5zVZrfwTAv+hzrIvi+eDJom6Z9c/8AEUymXdDhLI1W7gXb\n\tsefL2TawPA1B16rWOzKf3EP8HdsLXgm2m+mjOJtj6SqWet5C+IRTCKUnXXhPQnM0of\n\tJRLILb4rR7UMkUWSh9S92MCQMqaEbM57OLs9M/CU=","Date":"Tue, 25 May 2021 11:58:51 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210427012150.5338-1-hiroh@chromium.org>\n\t\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17231,"web_url":"https://patchwork.libcamera.org/comment/17231/","msgid":"","date":"2021-05-25T09:05:33","subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Laurent,\n\nOn Tue, May 25, 2021 at 5:58 PM Laurent Pinchart <\nlaurent.pinchart@ideasonboard.com> wrote:\n\n> Hi Hiro,\n>\n> On Tue, May 25, 2021 at 02:35:17PM +0900, Hirokazu Honda wrote:\n> > On Tue, May 25, 2021 at 8:52 AM Laurent Pinchart wrote:\n> > > Hi Hiro,\n> > >\n> > > Thank you for the patch. I'm going through the patchwork backlog and\n> > > realized I had forgotten about this one. Sorry about that.\n> > >\n> > > On Tue, Apr 27, 2021 at 10:21:50AM +0900, Hirokazu Honda wrote:\n> > > > The original updateControls() has the assumption that ctrls and\n> > > > v4l2Ctrls lists are in the same order. It is dependent on the\n> > > > caller implementation though. This changes updateControls()\n> > > > implementation so that it works without the assumption.\n> > > >\n> > > > Signed-off-by: Hirokazu Honda \n> > >\n> > > Reviewed-by: Laurent Pinchart \n> > >\n> > > Will push shortly once the tests pass.\n> >\n> > I am sorry I noticed the patch has a bug. Somehow I haven't caught it.\n> > I submit a fix patch for review.\n> > https://patchwork.libcamera.org/patch/12396/\n>\n> Oops :-S We've received reports from users who are affected by this, so\n> I've sent a revert that I'll merge now, to be able to discuss the fix\n> without pressure.\n>\n>\nSounds good. sorry for breakage.\n\n-Hiro\n\n> > > > ---\n> > > > src/libcamera/v4l2_device.cpp | 26 +++++++-------------------\n> > > > 1 file changed, 7 insertions(+), 19 deletions(-)\n> > > >\n> > > > diff --git a/src/libcamera/v4l2_device.cpp\n> b/src/libcamera/v4l2_device.cpp\n> > > > index 397029ac..64501523 100644\n> > > > --- a/src/libcamera/v4l2_device.cpp\n> > > > +++ b/src/libcamera/v4l2_device.cpp\n> > > > @@ -178,12 +178,6 @@ ControlList V4L2Device::getControls(const\n> std::vector &ids)\n> > > >\n> > > > ControlList ctrls{ controls_ };\n> > > >\n> > > > - /*\n> > > > - * Start by filling the ControlList. This can't be combined\n> with filling\n> > > > - * v4l2Ctrls, as updateControls() relies on both containers\n> having the\n> > > > - * same order, and the control list is based on a map, which\n> is not\n> > > > - * sorted by insertion order.\n> > > > - */\n> > > > for (uint32_t id : ids) {\n> > > > const auto iter = controls_.find(id);\n> > > > if (iter == controls_.end()) {\n> > > > @@ -520,19 +514,13 @@ void V4L2Device::listControls()\n> > > > void V4L2Device::updateControls(ControlList *ctrls,\n> > > > Span v4l2Ctrls)\n> > > > {\n> > > > - unsigned int i = 0;\n> > > > - for (auto &ctrl : *ctrls) {\n> > > > - if (i == v4l2Ctrls.size())\n> > > > - break;\n> > > > + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> > > > + const unsigned int id = v4l2Ctrl.id;\n> > > >\n> > > > - const struct v4l2_ext_control *v4l2Ctrl =\n> &v4l2Ctrls[i];\n> > > > - unsigned int id = ctrl.first;\n> > > > - ControlValue &value = ctrl.second;\n> > > > -\n> > > > - const auto iter = controls_.find(id);\n> > > > - switch (iter->first->type()) {\n> > > > + ControlValue value = ctrls->get(id);\n> > > > + switch (value.type()) {\n> > > > case ControlTypeInteger64:\n> > > > - value.set(v4l2Ctrl->value64);\n> > > > + value.set(v4l2Ctrl.value64);\n> > > > break;\n> > > >\n> > > > case ControlTypeByte:\n> > > > @@ -547,11 +535,11 @@ void V4L2Device::updateControls(ControlList\n> *ctrls,\n> > > > * \\todo To be changed when support for string\n> controls\n> > > > * will be added.\n> > > > */\n> > > > - value.set(v4l2Ctrl->value);\n> > > > + value.set(v4l2Ctrl.value);\n> > > > break;\n> > > > }\n> > > >\n> > > > - i++;\n> > > > + ctrls->set(id, value);\n> > > > }\n> > > > }\n> > > >\n>\n> --\n> Regards,\n>\n> Laurent Pinchart\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 C780CC3200\n\tfor ;\n\tTue, 25 May 2021 09:05:46 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8A0CA68929;\n\tTue, 25 May 2021 11:05:46 +0200 (CEST)","from mail-ed1-x534.google.com (mail-ed1-x534.google.com\n\t[IPv6:2a00:1450:4864:20::534])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 577ED602AF\n\tfor ;\n\tTue, 25 May 2021 11:05:45 +0200 (CEST)","by mail-ed1-x534.google.com with SMTP id r11so35185477edt.13\n\tfor ;\n\tTue, 25 May 2021 02:05:45 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Y7fRbu6M\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=gQMzL253g0L1dgy4MScxWrbIVunJHge/7/Mz2EpJreo=;\n\tb=Y7fRbu6MxaBNbnOfh7FgMUqPY2bzZ7qiOmtZ3LPXdWUInQAta+Nq16wbIlZ4FZto4w\n\tngLP+X0rJpi3/NzMSUcg6kn2p+EISEhrERgbP9A3brZVFZPikAjecNJhyWqf8nEkzb4S\n\t1aR6UxM6/4aM+DeMW8G5CVGoJY/qxH0tSAvBI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=gQMzL253g0L1dgy4MScxWrbIVunJHge/7/Mz2EpJreo=;\n\tb=hCrxACB9rUkxXqGc9rONm8mP3hc+w4thk2CU7HMQRRBjjyxuPS0XSq5kiPaSmEpiTv\n\ta9fzQLmDFHjsp1OgG2oGrZt/d65/FntruPZaHt8h7tjdhywXXRYVSf82opyYa4Q4ymh+\n\tjRRx1Ykhyvl7N4g0C2CfdkGHsxrDAhMvGx5iNS2S/WjOJOVkt3oWWU85sM/8CpdCqK3w\n\tkd6R/71/i/sK4wPPdnjCG2f7/oncKiFkGURFAElvk5dbCcgen0/VdNgfBAxlZv3vf0Cj\n\tpwFWKqzaNX2gZ8/pQVhVVV/QyJrD7W6A2E4FfIT9HMgWzqexHcAdwkqdMppAnMux8Zqw\n\tg99Q==","X-Gm-Message-State":"AOAM530MZUfdbr/nHWRHUD7V1waJEuFxBQlxdn/KQC5PRTuR9wW1skEu\n\tgcHzLSl0vcNOcusyNs2RZcXKqmvWrib3bix7cTwFnJjRwkU=","X-Google-Smtp-Source":"ABdhPJxNWbFDu3A1CQPJcguQmZ1exCkLaBIEl4XyWgcGECcZdDPuu3jUT9alIrZiEKslmadapuDs892sMKfvPZxgbDM=","X-Received":"by 2002:a50:afa3:: with SMTP id\n\th32mr30223220edd.202.1621933545109; \n\tTue, 25 May 2021 02:05:45 -0700 (PDT)","MIME-Version":"1.0","References":"<20210427012150.5338-1-hiroh@chromium.org>\n\t\n\t\n\t","In-Reply-To":"","From":"Hirokazu Honda ","Date":"Tue, 25 May 2021 18:05:33 +0900","Message-ID":"","To":"Laurent Pinchart ","Content-Type":"multipart/alternative; boundary=\"000000000000ce4e7105c323d496\"","Subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17234,"web_url":"https://patchwork.libcamera.org/comment/17234/","msgid":"","date":"2021-05-25T09:13:04","subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nOn Tue, May 25, 2021 at 06:05:33PM +0900, Hirokazu Honda wrote:\n> On Tue, May 25, 2021 at 5:58 PM Laurent Pinchart wrote:\n> > On Tue, May 25, 2021 at 02:35:17PM +0900, Hirokazu Honda wrote:\n> > > On Tue, May 25, 2021 at 8:52 AM Laurent Pinchart wrote:\n> > > > Hi Hiro,\n> > > >\n> > > > Thank you for the patch. I'm going through the patchwork backlog and\n> > > > realized I had forgotten about this one. Sorry about that.\n> > > >\n> > > > On Tue, Apr 27, 2021 at 10:21:50AM +0900, Hirokazu Honda wrote:\n> > > > > The original updateControls() has the assumption that ctrls and\n> > > > > v4l2Ctrls lists are in the same order. It is dependent on the\n> > > > > caller implementation though. This changes updateControls()\n> > > > > implementation so that it works without the assumption.\n> > > > >\n> > > > > Signed-off-by: Hirokazu Honda \n> > > >\n> > > > Reviewed-by: Laurent Pinchart \n> > > >\n> > > > Will push shortly once the tests pass.\n> > >\n> > > I am sorry I noticed the patch has a bug. Somehow I haven't caught it.\n> > > I submit a fix patch for review.\n> > > https://patchwork.libcamera.org/patch/12396/\n> >\n> > Oops :-S We've received reports from users who are affected by this, so\n> > I've sent a revert that I'll merge now, to be able to discuss the fix\n> > without pressure.\n>\n> Sounds good. sorry for breakage.\n\nNo worries, it happens. It means we're missing a unit test case though.\n\n> > > > > ---\n> > > > > src/libcamera/v4l2_device.cpp | 26 +++++++-------------------\n> > > > > 1 file changed, 7 insertions(+), 19 deletions(-)\n> > > > >\n> > > > > diff --git a/src/libcamera/v4l2_device.cpp\n> > b/src/libcamera/v4l2_device.cpp\n> > > > > index 397029ac..64501523 100644\n> > > > > --- a/src/libcamera/v4l2_device.cpp\n> > > > > +++ b/src/libcamera/v4l2_device.cpp\n> > > > > @@ -178,12 +178,6 @@ ControlList V4L2Device::getControls(const\n> > std::vector &ids)\n> > > > >\n> > > > > ControlList ctrls{ controls_ };\n> > > > >\n> > > > > - /*\n> > > > > - * Start by filling the ControlList. This can't be combined\n> > with filling\n> > > > > - * v4l2Ctrls, as updateControls() relies on both containers\n> > having the\n> > > > > - * same order, and the control list is based on a map, which\n> > is not\n> > > > > - * sorted by insertion order.\n> > > > > - */\n> > > > > for (uint32_t id : ids) {\n> > > > > const auto iter = controls_.find(id);\n> > > > > if (iter == controls_.end()) {\n> > > > > @@ -520,19 +514,13 @@ void V4L2Device::listControls()\n> > > > > void V4L2Device::updateControls(ControlList *ctrls,\n> > > > > Span v4l2Ctrls)\n> > > > > {\n> > > > > - unsigned int i = 0;\n> > > > > - for (auto &ctrl : *ctrls) {\n> > > > > - if (i == v4l2Ctrls.size())\n> > > > > - break;\n> > > > > + for (const v4l2_ext_control &v4l2Ctrl : v4l2Ctrls) {\n> > > > > + const unsigned int id = v4l2Ctrl.id;\n> > > > >\n> > > > > - const struct v4l2_ext_control *v4l2Ctrl =\n> > &v4l2Ctrls[i];\n> > > > > - unsigned int id = ctrl.first;\n> > > > > - ControlValue &value = ctrl.second;\n> > > > > -\n> > > > > - const auto iter = controls_.find(id);\n> > > > > - switch (iter->first->type()) {\n> > > > > + ControlValue value = ctrls->get(id);\n> > > > > + switch (value.type()) {\n> > > > > case ControlTypeInteger64:\n> > > > > - value.set(v4l2Ctrl->value64);\n> > > > > + value.set(v4l2Ctrl.value64);\n> > > > > break;\n> > > > >\n> > > > > case ControlTypeByte:\n> > > > > @@ -547,11 +535,11 @@ void V4L2Device::updateControls(ControlList\n> > *ctrls,\n> > > > > * \\todo To be changed when support for string\n> > controls\n> > > > > * will be added.\n> > > > > */\n> > > > > - value.set(v4l2Ctrl->value);\n> > > > > + value.set(v4l2Ctrl.value);\n> > > > > break;\n> > > > > }\n> > > > >\n> > > > > - i++;\n> > > > > + ctrls->set(id, value);\n> > > > > }\n> > > > > }\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 F3624C3202\n\tfor ;\n\tTue, 25 May 2021 09:13:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95F5D68924;\n\tTue, 25 May 2021 11:13:11 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BDDA3602AF\n\tfor ;\n\tTue, 25 May 2021 11:13:09 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 59CB8880;\n\tTue, 25 May 2021 11:13:09 +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=\"J6dgUER3\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1621933989;\n\tbh=fApC0Od39+yTwLosnTv5PMmkwG0lQcitKNypKnt+oUo=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=J6dgUER3GPeZF2jzCgU0+zQKW+1ISSq9EXpIjU0t53VXxsnk1ZrZ8CKTK0VvNB6gJ\n\tDcusvpFxHZwvmnL7YxA/eOAkZvrrcyoCdnihoTNtQBUvoEpyqd18lXL8merE1kOKWL\n\t54qJtWGovb9ZWPPeeaCbfCblLy8fHXn9tOwPACsc=","Date":"Tue, 25 May 2021 12:13:04 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210427012150.5338-1-hiroh@chromium.org>\n\t\n\t\n\t\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH] libcamera: V4L2Device: Remove the\n\tcontrols order assumption in updateControls()","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","Cc":"libcamera devel ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]