[{"id":16265,"web_url":"https://patchwork.libcamera.org/comment/16265/","msgid":"","date":"2021-04-14T08:20:01","subject":"Re: [libcamera-devel] [RFC PATCH v2 2/5] libcamera: V4L2Device:\n\tSupport v4l2 menu control","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Hiro,\n\nOn 13/04/2021 08:50, Hirokazu Honda wrote:\n> This adds a support of v4l2 menu.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> include/libcamera/internal/v4l2_controls.h | 1 +\n> include/libcamera/internal/v4l2_device.h | 3 +\n> src/libcamera/v4l2_controls.cpp | 10 +-\n> src/libcamera/v4l2_device.cpp | 104 ++++++++++++++++++++-\n> 4 files changed, 112 insertions(+), 6 deletions(-)\n> \n> diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h\n> index 0851b8dd..c42f2529 100644\n> --- a/include/libcamera/internal/v4l2_controls.h\n> +++ b/include/libcamera/internal/v4l2_controls.h\n> @@ -24,6 +24,7 @@ class V4L2ControlInfo : public ControlInfo\n> {\n> public:\n> \tV4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl);\n> +\tV4L2ControlInfo(const ControlInfo &ctrl);\n> };\n> \n> } /* namespace libcamera */\n> diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\n> index 4cce3840..2436a83c 100644\n> --- a/include/libcamera/internal/v4l2_device.h\n> +++ b/include/libcamera/internal/v4l2_device.h\n> @@ -53,6 +53,9 @@ protected:\n> \tint fd() const { return fd_; }\n> \n> private:\n> +\tbool createV4L2ControlInfoForMenu(const v4l2_query_ext_ctrl &ctrl,\n> +\t\t\t\t\t V4L2ControlInfo &v4l2CtrlInfo);\n> +\n> \tvoid listControls();\n> \tvoid updateControls(ControlList *ctrls,\n> \t\t\t const std::vector &v4l2Ctrls);\n> diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp\n> index 3f8ec6ca..2c965cfa 100644\n> --- a/src/libcamera/v4l2_controls.cpp\n> +++ b/src/libcamera/v4l2_controls.cpp\n> @@ -73,9 +73,12 @@ ControlType v4l2_ctrl_type(const struct v4l2_query_ext_ctrl &ctrl)\n> \t\treturn ControlTypeInteger64;\n> \n> \tcase V4L2_CTRL_TYPE_MENU:\n> +\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n> +\t\treturn ControlTypeMenu;\n> +\n> \tcase V4L2_CTRL_TYPE_BUTTON:\n> \tcase V4L2_CTRL_TYPE_BITMASK:\n> -\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n> +\n> \t\t/*\n> \t\t * More precise types may be needed, for now use a 32-bit\n> \t\t * integer type.\n> @@ -148,4 +151,9 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)\n> \t}\n> }\n> \n> +V4L2ControlInfo::V4L2ControlInfo(const ControlInfo &ctrl)\n> +\t: ControlInfo(ctrl)\n> +{\n> +}\n> +\n> } /* namespace libcamera */\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 8f29cd7f..7fbca8b1 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -10,6 +10,7 @@\n> #include \n> #include \n> #include \n> +#include \n\n\nThe V4L2 device should not be IPU3 specific in any way.\n\n\n> #include \n> #include \n> #include \n> @@ -459,6 +460,60 @@ int V4L2Device::ioctl(unsigned long request, void *argp)\n> * \\return The device node path\n> */\n> \n> +bool V4L2Device::createV4L2ControlInfoForMenu(const v4l2_query_ext_ctrl &ctrl,\n> +\t\t\t\t\t V4L2ControlInfo &v4l2CtrlInfo)\n> +{\n> +\tASSERT(ctrl.type == V4L2_CTRL_TYPE_MENU ||\n> +\t ctrl.type == V4L2_CTRL_TYPE_INTEGER_MENU);\n> +\tbool isName = false;\n> +\tswitch (ctrl.id) {\n> +\tcase V4L2_CID_TEST_PATTERN:\n> +\tcase V4L2_CID_INTEL_IPU3_MODE:\n> +\t\tisName = true;\n> +\t\tbreak;\n\nWhich means processing like this can't be here.\n\nIs there a way to do this generically from the information you have in\nthe v4l2_query_ext_ctrl ?\n\n\n\n> +\tcase V4L2_CID_LINK_FREQ:\n> +\t\tisName = false;\n> +\t\tbreak;\n> +\tdefault:\n> +\t\tLOG(V4L2, Error) << \"Unsupported menu: \" << ctrl.name\n> +\t\t\t\t << \" (\" << utils::hex(ctrl.id) << \")\";\n> +\t\treturn false;\n> +\t}\n> +\n> +\tstd::vector values;\n> +\tv4l2_querymenu menu;\n> +\tmemset(&menu, 0, sizeof(menu));\n> +\tmenu.id = ctrl.id;\n> +\tfor (menu.index = ctrl.minimum;\n> +\t static_cast(menu.index) <= ctrl.maximum; menu.index++) {\n> +\t\tif (ioctl(VIDIOC_QUERYMENU, &menu) != 0)\n> +\t\t\tcontinue;\n> +\t\tControlMenu ctrlMenu;\n> +\t\tctrlMenu.index = static_cast(menu.index);\n> +\t\tctrlMenu.isName = isName;\n> +\t\tif (isName) {\n> +\t\t\tstrcpy(ctrlMenu.name,\n> +\t\t\t reinterpret_cast(menu.name));\n> +\t\t} else {\n> +\t\t\tctrlMenu.value = menu.value;\n> +\t\t}\n> +\n> +\t\tvalues.push_back(ControlValue(ctrlMenu));\n> +\t}\n> +\n> +\tif (values.empty()) {\n> +\t\tLOG(V4L2, Error)\n> +\t\t\t<< \"No applicable value: \" << utils::hex(ctrl.id);\n> +\t\treturn false;\n> +\t}\n> +\n> +\tv4l2CtrlInfo = V4L2ControlInfo(\n> +\t\tControlInfo(libcamera::Span(\n> +\t\t\tvalues.data(), values.size())));\n> +\n> +\treturn true;\n> +}\n> +\n> /**\n> * \\fn V4L2Device::fd()\n> * \\brief Retrieve the V4L2 device file descriptor\n> @@ -474,7 +529,6 @@ void V4L2Device::listControls()\n> \tControlInfoMap::Map ctrls;\n> \tstruct v4l2_query_ext_ctrl ctrl = {};\n> \n> -\t/* \\todo Add support for menu controls. */\n> \twhile (1) {\n> \t\tctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL |\n> \t\t\t V4L2_CTRL_FLAG_NEXT_COMPOUND;\n> @@ -485,15 +539,20 @@ void V4L2Device::listControls()\n> \t\t ctrl.flags & V4L2_CTRL_FLAG_DISABLED)\n> \t\t\tcontinue;\n> \n> +\t\tV4L2ControlInfo v4l2CtrlInfo(ControlInfo(0));\n> \t\tswitch (ctrl.type) {\n> \t\tcase V4L2_CTRL_TYPE_INTEGER:\n> \t\tcase V4L2_CTRL_TYPE_BOOLEAN:\n> -\t\tcase V4L2_CTRL_TYPE_MENU:\n> \t\tcase V4L2_CTRL_TYPE_BUTTON:\n> \t\tcase V4L2_CTRL_TYPE_INTEGER64:\n> \t\tcase V4L2_CTRL_TYPE_BITMASK:\n> -\t\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n> \t\tcase V4L2_CTRL_TYPE_U8:\n> +\t\t\tv4l2CtrlInfo = V4L2ControlInfo(ctrl);\n> +\t\t\tbreak;\n> +\t\tcase V4L2_CTRL_TYPE_MENU:\n> +\t\tcase V4L2_CTRL_TYPE_INTEGER_MENU:\n> +\t\t\tif (!createV4L2ControlInfoForMenu(ctrl, v4l2CtrlInfo))\n> +\t\t\t\tcontinue;\n> \t\t\tbreak;\n> \t\t/* \\todo Support other control types. */\n> \t\tdefault:\n> @@ -503,10 +562,13 @@ void V4L2Device::listControls()\n> \t\t\tcontinue;\n> \t\t}\n> \n> +\t\tLOG(V4L2, Debug) << \"Control: \" << ctrl.name\n> +\t\t\t\t << \" (\" << utils::hex(ctrl.id) << \")\";\n> +\n> \t\tcontrolIds_.emplace_back(std::make_unique(ctrl));\n> \t\tcontrolInfo_.emplace(ctrl.id, ctrl);\n> \n> -\t\tctrls.emplace(controlIds_.back().get(), V4L2ControlInfo(ctrl));\n> +\t\tctrls.emplace(controlIds_.back().get(), std::move(v4l2CtrlInfo));\n> \t}\n> \n> \tcontrols_ = std::move(ctrls);\n> @@ -539,7 +601,39 @@ void V4L2Device::updateControls(ControlList *ctrls,\n> \t\tcase ControlTypeInteger64:\n> \t\t\tnewValue.set(v4l2Ctrl.value64);\n> \t\t\tbreak;\n> -\n> +\t\tcase ControlTypeMenu:\n> +\t\t\tswitch (v4l2Ctrl.id) {\n> +\t\t\tcase V4L2_CID_TEST_PATTERN: {\n> +\t\t\t\tControlMenu menu;\n> +\t\t\t\tmenu.index = v4l2Ctrl.value;\n> +\t\t\t\tmenu.isName = true;\n> +\n> +\t\t\t\tbool found = false;\n> +\t\t\t\tfor (const ControlValue &validValue : it->second.values()) {\n> +\t\t\t\t\tconst auto &ctrlMenu = validValue.get();\n> +\t\t\t\t\tif (!ctrlMenu.isName)\n> +\t\t\t\t\t\tcontinue;\n> +\t\t\t\t\tif (menu.index == ctrlMenu.index) {\n> +\t\t\t\t\t\tstrcpy(menu.name, ctrlMenu.name);\n> +\t\t\t\t\t\tfound = true;\n> +\t\t\t\t\t\tbreak;\n> +\t\t\t\t\t}\n> +\t\t\t\t}\n> +\n> +\t\t\t\tif (!found) {\n> +\t\t\t\t\tLOG(V4L2, Error)\n> +\t\t\t\t\t\t<< \"Matched value is not found\"\n> +\t\t\t\t\t\t<< \", index=\" << menu.index;\n> +\t\t\t\t\tcontinue;\n> +\t\t\t\t}\n> +\n> +\t\t\t\tnewValue.set(menu);\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> +\t\t\tdefault:\n> +\t\t\t\tLOG(V4L2, Error) << \"Unknown id: \" << v4l2Ctrl.id;\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> \t\tcase ControlTypeByte:\n> \t\t\t/*\n> \t\t\t * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl\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 12A9BBD224\n\tfor ;\n\tWed, 14 Apr 2021 08:20:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7DAA868805;\n\tWed, 14 Apr 2021 10:20:05 +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 A0FE0687EF\n\tfor ;\n\tWed, 14 Apr 2021 10:20:04 +0200 (CEST)","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 EB77E6F2;\n\tWed, 14 Apr 2021 10:20:03 +0200 (CEST)"],"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=\"W8hvjUZ/\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618388404;\n\tbh=ra+ttrBafFGQsJ8sc4VLHSYV1KWC820lmc7WH9mHVMU=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=W8hvjUZ/O2PI02i1WBeQJvbQaUgg8Os0t/yhvTYWnH4J9DBMWMMgfic2dMeHOfQsh\n\taM+h0NnlT98Q8wksuwaFRXCLV1ZmLL3yw0JkZvPLYIXaVvKP0rKsjZWLjwALSaAbYC\n\tOgg/vKSMkJGuFbnNsUVe2Rlmsi5MPuMEJedfXmCM=","To":"Hirokazu Honda , libcamera-devel@lists.libcamera.org","References":"<20210413075013.3069213-1-hiroh@chromium.org>\n\t<20210413075013.3069213-3-hiroh@chromium.org>","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":"","Date":"Wed, 14 Apr 2021 09:20:01 +0100","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":"<20210413075013.3069213-3-hiroh@chromium.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [RFC PATCH v2 2/5] libcamera: V4L2Device:\n\tSupport v4l2 menu control","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","Cc":"jmondi@jacopo.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16297,"web_url":"https://patchwork.libcamera.org/comment/16297/","msgid":"","date":"2021-04-15T10:48:17","subject":"Re: [libcamera-devel] [RFC PATCH v2 2/5] libcamera: V4L2Device:\n\tSupport v4l2 menu control","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"HI Kieran, Thanks for the comment.\n\nOn Wed, Apr 14, 2021 at 5:20 PM Kieran Bingham\n wrote:\n>\n> Hi Hiro,\n>\n> On 13/04/2021 08:50, Hirokazu Honda wrote:\n> > This adds a support of v4l2 menu.\n> >\n> > Signed-off-by: Hirokazu Honda \n> > ---\n> > include/libcamera/internal/v4l2_controls.h | 1 +\n> > include/libcamera/internal/v4l2_device.h | 3 +\n> > src/libcamera/v4l2_controls.cpp | 10 +-\n> > src/libcamera/v4l2_device.cpp | 104 ++++++++++++++++++++-\n> > 4 files changed, 112 insertions(+), 6 deletions(-)\n> >\n> > diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h\n> > index 0851b8dd..c42f2529 100644\n> > --- a/include/libcamera/internal/v4l2_controls.h\n> > +++ b/include/libcamera/internal/v4l2_controls.h\n> > @@ -24,6 +24,7 @@ class V4L2ControlInfo : public ControlInfo\n> > {\n> > public:\n> > V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl);\n> > + V4L2ControlInfo(const ControlInfo &ctrl);\n> > };\n> >\n> > } /* namespace libcamera */\n> > diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h\n> > index 4cce3840..2436a83c 100644\n> > --- a/include/libcamera/internal/v4l2_device.h\n> > +++ b/include/libcamera/internal/v4l2_device.h\n> > @@ -53,6 +53,9 @@ protected:\n> > int fd() const { return fd_; }\n> >\n> > private:\n> > + bool createV4L2ControlInfoForMenu(const v4l2_query_ext_ctrl &ctrl,\n> > + V4L2ControlInfo &v4l2CtrlInfo);\n> > +\n> > void listControls();\n> > void updateControls(ControlList *ctrls,\n> > const std::vector &v4l2Ctrls);\n> > diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp\n> > index 3f8ec6ca..2c965cfa 100644\n> > --- a/src/libcamera/v4l2_controls.cpp\n> > +++ b/src/libcamera/v4l2_controls.cpp\n> > @@ -73,9 +73,12 @@ ControlType v4l2_ctrl_type(const struct v4l2_query_ext_ctrl &ctrl)\n> > return ControlTypeInteger64;\n> >\n> > case V4L2_CTRL_TYPE_MENU:\n> > + case V4L2_CTRL_TYPE_INTEGER_MENU:\n> > + return ControlTypeMenu;\n> > +\n> > case V4L2_CTRL_TYPE_BUTTON:\n> > case V4L2_CTRL_TYPE_BITMASK:\n> > - case V4L2_CTRL_TYPE_INTEGER_MENU:\n> > +\n> > /*\n> > * More precise types may be needed, for now use a 32-bit\n> > * integer type.\n> > @@ -148,4 +151,9 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)\n> > }\n> > }\n> >\n> > +V4L2ControlInfo::V4L2ControlInfo(const ControlInfo &ctrl)\n> > + : ControlInfo(ctrl)\n> > +{\n> > +}\n> > +\n> > } /* namespace libcamera */\n> > diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> > index 8f29cd7f..7fbca8b1 100644\n> > --- a/src/libcamera/v4l2_device.cpp\n> > +++ b/src/libcamera/v4l2_device.cpp\n> > @@ -10,6 +10,7 @@\n> > #include \n> > #include \n> > #include \n> > +#include \n>\n>\n> The V4L2 device should not be IPU3 specific in any way.\n>\n>\n> > #include \n> > #include \n> > #include \n> > @@ -459,6 +460,60 @@ int V4L2Device::ioctl(unsigned long request, void *argp)\n> > * \\return The device node path\n> > */\n> >\n> > +bool V4L2Device::createV4L2ControlInfoForMenu(const v4l2_query_ext_ctrl &ctrl,\n> > + V4L2ControlInfo &v4l2CtrlInfo)\n> > +{\n> > + ASSERT(ctrl.type == V4L2_CTRL_TYPE_MENU ||\n> > + ctrl.type == V4L2_CTRL_TYPE_INTEGER_MENU);\n> > + bool isName = false;\n> > + switch (ctrl.id) {\n> > + case V4L2_CID_TEST_PATTERN:\n> > + case V4L2_CID_INTEL_IPU3_MODE:\n> > + isName = true;\n> > + break;\n>\n> Which means processing like this can't be here.\n>\n> Is there a way to do this generically from the information you have in\n> the v4l2_query_ext_ctrl ?\n>\n>\n\nOkay, I think this should be\nisName = ctrl.type == V4L2_CTRL_TYPE_MENU;\nThen we removed this.\nI would do it in the next patch series.\n\nThanks,\n-Hiro\n\n>\n> > + case V4L2_CID_LINK_FREQ:\n> > + isName = false;\n> > + break;\n> > + default:\n> > + LOG(V4L2, Error) << \"Unsupported menu: \" << ctrl.name\n> > + << \" (\" << utils::hex(ctrl.id) << \")\";\n> > + return false;\n> > + }\n> > +\n> > + std::vector values;\n> > + v4l2_querymenu menu;\n> > + memset(&menu, 0, sizeof(menu));\n> > + menu.id = ctrl.id;\n> > + for (menu.index = ctrl.minimum;\n> > + static_cast(menu.index) <= ctrl.maximum; menu.index++) {\n> > + if (ioctl(VIDIOC_QUERYMENU, &menu) != 0)\n> > + continue;\n> > + ControlMenu ctrlMenu;\n> > + ctrlMenu.index = static_cast(menu.index);\n> > + ctrlMenu.isName = isName;\n> > + if (isName) {\n> > + strcpy(ctrlMenu.name,\n> > + reinterpret_cast(menu.name));\n> > + } else {\n> > + ctrlMenu.value = menu.value;\n> > + }\n> > +\n> > + values.push_back(ControlValue(ctrlMenu));\n> > + }\n> > +\n> > + if (values.empty()) {\n> > + LOG(V4L2, Error)\n> > + << \"No applicable value: \" << utils::hex(ctrl.id);\n> > + return false;\n> > + }\n> > +\n> > + v4l2CtrlInfo = V4L2ControlInfo(\n> > + ControlInfo(libcamera::Span(\n> > + values.data(), values.size())));\n> > +\n> > + return true;\n> > +}\n> > +\n> > /**\n> > * \\fn V4L2Device::fd()\n> > * \\brief Retrieve the V4L2 device file descriptor\n> > @@ -474,7 +529,6 @@ void V4L2Device::listControls()\n> > ControlInfoMap::Map ctrls;\n> > struct v4l2_query_ext_ctrl ctrl = {};\n> >\n> > - /* \\todo Add support for menu controls. */\n> > while (1) {\n> > ctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL |\n> > V4L2_CTRL_FLAG_NEXT_COMPOUND;\n> > @@ -485,15 +539,20 @@ void V4L2Device::listControls()\n> > ctrl.flags & V4L2_CTRL_FLAG_DISABLED)\n> > continue;\n> >\n> > + V4L2ControlInfo v4l2CtrlInfo(ControlInfo(0));\n> > switch (ctrl.type) {\n> > case V4L2_CTRL_TYPE_INTEGER:\n> > case V4L2_CTRL_TYPE_BOOLEAN:\n> > - case V4L2_CTRL_TYPE_MENU:\n> > case V4L2_CTRL_TYPE_BUTTON:\n> > case V4L2_CTRL_TYPE_INTEGER64:\n> > case V4L2_CTRL_TYPE_BITMASK:\n> > - case V4L2_CTRL_TYPE_INTEGER_MENU:\n> > case V4L2_CTRL_TYPE_U8:\n> > + v4l2CtrlInfo = V4L2ControlInfo(ctrl);\n> > + break;\n> > + case V4L2_CTRL_TYPE_MENU:\n> > + case V4L2_CTRL_TYPE_INTEGER_MENU:\n> > + if (!createV4L2ControlInfoForMenu(ctrl, v4l2CtrlInfo))\n> > + continue;\n> > break;\n> > /* \\todo Support other control types. */\n> > default:\n> > @@ -503,10 +562,13 @@ void V4L2Device::listControls()\n> > continue;\n> > }\n> >\n> > + LOG(V4L2, Debug) << \"Control: \" << ctrl.name\n> > + << \" (\" << utils::hex(ctrl.id) << \")\";\n> > +\n> > controlIds_.emplace_back(std::make_unique(ctrl));\n> > controlInfo_.emplace(ctrl.id, ctrl);\n> >\n> > - ctrls.emplace(controlIds_.back().get(), V4L2ControlInfo(ctrl));\n> > + ctrls.emplace(controlIds_.back().get(), std::move(v4l2CtrlInfo));\n> > }\n> >\n> > controls_ = std::move(ctrls);\n> > @@ -539,7 +601,39 @@ void V4L2Device::updateControls(ControlList *ctrls,\n> > case ControlTypeInteger64:\n> > newValue.set(v4l2Ctrl.value64);\n> > break;\n> > -\n> > + case ControlTypeMenu:\n> > + switch (v4l2Ctrl.id) {\n> > + case V4L2_CID_TEST_PATTERN: {\n> > + ControlMenu menu;\n> > + menu.index = v4l2Ctrl.value;\n> > + menu.isName = true;\n> > +\n> > + bool found = false;\n> > + for (const ControlValue &validValue : it->second.values()) {\n> > + const auto &ctrlMenu = validValue.get();\n> > + if (!ctrlMenu.isName)\n> > + continue;\n> > + if (menu.index == ctrlMenu.index) {\n> > + strcpy(menu.name, ctrlMenu.name);\n> > + found = true;\n> > + break;\n> > + }\n> > + }\n> > +\n> > + if (!found) {\n> > + LOG(V4L2, Error)\n> > + << \"Matched value is not found\"\n> > + << \", index=\" << menu.index;\n> > + continue;\n> > + }\n> > +\n> > + newValue.set(menu);\n> > + break;\n> > + }\n> > + default:\n> > + LOG(V4L2, Error) << \"Unknown id: \" << v4l2Ctrl.id;\n> > + break;\n> > + }\n> > case ControlTypeByte:\n> > /*\n> > * No action required, the VIDIOC_[GS]_EXT_CTRLS ioctl\n> >\n>\n> --\n> Regards\n> --\n> Kieran","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 871BFBD1F6\n\tfor ;\n\tThu, 15 Apr 2021 10:48:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3C43D687F3;\n\tThu, 15 Apr 2021 12:48:31 +0200 (CEST)","from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com\n\t[IPv6:2a00:1450:4864:20::52b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 19D9A605AE\n\tfor ;\n\tThu, 15 Apr 2021 12:48:29 +0200 (CEST)","by mail-ed1-x52b.google.com with SMTP id d21so7354059edv.9\n\tfor ;\n\tThu, 15 Apr 2021 03:48:29 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"H5BcQ8K8\"; 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=1lpUYMXbvAtqy8XkxXimLehGuoXEsCnL4YpZfP2sskg=;\n\tb=H5BcQ8K8y7v8z28maZWDlBLMv1uRrJD9zrOEatHCJ8sFNcUzbfyfCzT+T8//wA4Quh\n\t3i8SXuDWuMTHiqwzNvL4+xjDAdC/9MV62cGq0t7QBZjInXcBT1fjRYXn6JXcqxQDvqpF\n\t0BAi2oV4Jo0pGJ4wVCAfdu4CCIMJWmGser4sE=","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=1lpUYMXbvAtqy8XkxXimLehGuoXEsCnL4YpZfP2sskg=;\n\tb=BPUMAX0cLWF6epWrRh5bXF73PYWqD8mQihqu22SHqTAH+mUctLK920xhkSTOC9Viay\n\tXZ8YNUtsjM8W2PoMRi/mJmFmBQHUsAQVViMn9pekyviE4szdJdeGNgrydc2YgAjp7vdn\n\ts0q70Y+vu/vHSLtTUNmZUb6a8tJq6wZeVHSEIKExdtm1dpyUwywzcRYZ4caiw47JqdxZ\n\tLnSpc0FeBOak2RS/etGRinYBUG3w0veaFQSLboSVhag/XuUkx20AaT8cCbmQcPNJopsh\n\tbwpOOwdCuhlxQYWCFaZBrIAtT61GR6cxJ9mW+EnrHf2j8Go+vZfi8b+QjRpAvfih1NUy\n\tQ0wg==","X-Gm-Message-State":"AOAM5321EdwFMWDgHCPcOh75roxBpx1z3ruer1F+8T4CD7d8pnzTaKSO\n\tpkfjhYaTuGu8xNyyXHz4YmC9hWMJhLbIZCRvi9KlIg==","X-Google-Smtp-Source":"ABdhPJymHkO0Tl9h2qZTmad8UxA1VZcrW/pS/23nZxoppeUrZXz8AIT8wwdUv48wUi1QFC2c7VYK/zKOpDYSNTYPOgA=","X-Received":"by 2002:a05:6402:176c:: with SMTP id\n\tda12mr3264960edb.325.1618483708714; \n\tThu, 15 Apr 2021 03:48:28 -0700 (PDT)","MIME-Version":"1.0","References":"<20210413075013.3069213-1-hiroh@chromium.org>\n\t<20210413075013.3069213-3-hiroh@chromium.org>\n\t","In-Reply-To":"","From":"Hirokazu Honda ","Date":"Thu, 15 Apr 2021 19:48:17 +0900","Message-ID":"","To":"Kieran Bingham ","Subject":"Re: [libcamera-devel] [RFC PATCH v2 2/5] libcamera: V4L2Device:\n\tSupport v4l2 menu control","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":"jmondi@jacopo.org, libcamera devel ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]