{"id":3234,"url":"https://patchwork.libcamera.org/api/1.1/patches/3234/?format=json","web_url":"https://patchwork.libcamera.org/patch/3234/","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":"<20200321003640.2156-7-laurent.pinchart@ideasonboard.com>","date":"2020-03-21T00:36:39","name":"[libcamera-devel,v2,6/7] libcamera: v4l2_device: Enable enumeration of U8 controls","commit_ref":"9b838b87c75f1825f73df05d30cd71926d11f079","pull_url":null,"state":"accepted","archived":false,"hash":"846e986746054a4774b4d88ac03c98f71db0583a","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3234/mbox/","series":[{"id":754,"url":"https://patchwork.libcamera.org/api/1.1/series/754/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=754","date":"2020-03-21T00:36:33","name":"Add support for V4L2 array controls","version":2,"mbox":"https://patchwork.libcamera.org/series/754/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3234/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3234/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EEE7C60417\n\tfor ;\n\tSat, 21 Mar 2020 01:36:52 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7FAEBA54;\n\tSat, 21 Mar 2020 01:36:52 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584751012;\n\tbh=wHcC7cWqXvwgldOyvO5EGAqqYYZ0qOeXWPOK7SkEouM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ETU7wEVNwqV65fOIup7FYnoPceC5tHI1gpk6jvg6N/4dovKzAh5aTVo+Jm12Yjc8u\n\t+XfqvP5NJwH/oQHAUayoToDBZobESVnX4AVmqpAVRuq+XImWpmTmEq63gK4+rzbI2q\n\tp8dFMI6w8zStY0uFrfPOKJTDFVoxJlj9PBywpnyA=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 21 Mar 2020 02:36:39 +0200","Message-Id":"<20200321003640.2156-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200321003640.2156-1-laurent.pinchart@ideasonboard.com>","References":"<20200321003640.2156-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 6/7] libcamera: v4l2_device: Enable\n\tenumeration of U8 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","X-List-Received-Date":"Sat, 21 Mar 2020 00:36:53 -0000"},"content":"From: Jacopo Mondi \n\nEnable the enumeration of V4L2 array controls with V4L2_CTRL_TYPE_U8\ntype.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/v4l2_device.cpp | 13 ++++---------\n 1 file changed, 4 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 3c91eb3f9f97..03e305165096 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -386,7 +386,8 @@ void V4L2Device::listControls()\n \n \t/* \\todo Add support for menu and compound controls. */\n \twhile (1) {\n-\t\tctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;\n+\t\tctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL |\n+\t\t\t V4L2_CTRL_FLAG_NEXT_COMPOUND;\n \t\tif (ioctl(VIDIOC_QUERY_EXT_CTRL, &ctrl))\n \t\t\tbreak;\n \n@@ -394,13 +395,6 @@ void V4L2Device::listControls()\n \t\t ctrl.flags & V4L2_CTRL_FLAG_DISABLED)\n \t\t\tcontinue;\n \n-\t\tif (ctrl.elems != 1 || ctrl.nr_of_dims) {\n-\t\t\tLOG(V4L2, Debug)\n-\t\t\t\t<< \"Array control \" << utils::hex(ctrl.id)\n-\t\t\t\t<< \" not supported\";\n-\t\t\tcontinue;\n-\t\t}\n-\n \t\tswitch (ctrl.type) {\n \t\tcase V4L2_CTRL_TYPE_INTEGER:\n \t\tcase V4L2_CTRL_TYPE_BOOLEAN:\n@@ -409,8 +403,9 @@ void V4L2Device::listControls()\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\tbreak;\n-\t\t/* \\todo Support compound controls. */\n+\t\t/* \\todo Support other control types. */\n \t\tdefault:\n \t\t\tLOG(V4L2, Debug)\n \t\t\t\t<< \"Control \" << utils::hex(ctrl.id)\n","prefixes":["libcamera-devel","v2","6/7"]}