{"id":2135,"url":"https://patchwork.libcamera.org/api/1.1/patches/2135/?format=json","web_url":"https://patchwork.libcamera.org/patch/2135/","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":"<20191007224642.6597-8-laurent.pinchart@ideasonboard.com>","date":"2019-10-07T22:46:40","name":"[libcamera-devel,7/9] libcamera: v4l2_device: Replace V4L2ControlList with ControlList","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"02ad4d80b5dbd6947bd9c341246803576d2c0714","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/2135/mbox/","series":[{"id":526,"url":"https://patchwork.libcamera.org/api/1.1/series/526/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=526","date":"2019-10-07T22:46:33","name":"Use ControlList for both libcamera and V4L2 controls","version":1,"mbox":"https://patchwork.libcamera.org/series/526/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2135/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2135/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 8B7656197C\n\tfor ;\n\tTue, 8 Oct 2019 00:46:57 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(modemcable118.64-20-96.mc.videotron.ca [96.20.64.118])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C2CB6B2D\n\tfor ;\n\tTue, 8 Oct 2019 00:46:56 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570488417;\n\tbh=Y1es+fK69192VYzSD/a+Pax3URLNrXz6dXh7MAsJeOY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Fax9S+0SQjr4F+1A9QSPMjDMn2orkOWW5tFAbJkIpNM8gshExJ1jaMjAvkWSje8PS\n\tusR2x+xlnEkfBdnMAc/0Toix6uP65JrucHXPCRnrSBu/mPspOHR0aKciMPhMSPDOJF\n\tavJ3vbvS76yRPqXFUx01nR7laMmUwwH9ZR+dUqbo=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 8 Oct 2019 01:46:40 +0300","Message-Id":"<20191007224642.6597-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20191007224642.6597-1-laurent.pinchart@ideasonboard.com>","References":"<20191007224642.6597-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 7/9] libcamera: v4l2_device: Replace\n\tV4L2ControlList with ControlList","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":"Mon, 07 Oct 2019 22:46:57 -0000"},"content":"The V4L2Device class uses V4L2ControlList as a controls container for\nthe getControls() and setControls() operations. Having a distinct\ncontainer from ControlList will make the IPA API more complex,\nespecially when dealing with serialisation and deserialisation, as it\nwill need to explicitly support transporting both types of lists.\n\nTo simplify the IPA API, replace usage of V4L2ControlList with\nControlList in the V4L2Device (and thus CameraSensor) API. ControlList\nhowever doesn't support accessing controls by numerical ID, which is a\ncommon use case for V4L2 controls in pipeline handlers. To avoid\nrequiring each pipeline handler to map numerical IDs to ControlId\ninstances, turn the existing V4L2ControlList class into a helper derived\nfrom ControlList. This allows easy building of a ControlList for a V4L2\ndevice in pipeline handlers, while generalising the use of ControlList\neverywhere else.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/camera_sensor.cpp | 4 +-\n src/libcamera/include/camera_sensor.h | 5 +-\n src/libcamera/include/v4l2_controls.h | 41 +----\n src/libcamera/include/v4l2_device.h | 8 +-\n src/libcamera/pipeline/ipu3/ipu3.cpp | 9 +-\n src/libcamera/pipeline/uvcvideo.cpp | 24 ++-\n src/libcamera/pipeline/vimc.cpp | 25 ++-\n src/libcamera/v4l2_controls.cpp | 216 +++++++-------------------\n src/libcamera/v4l2_device.cpp | 50 +++---\n 9 files changed, 128 insertions(+), 254 deletions(-)","diff":"diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\nindex a7670b449b31..9e8b44a23850 100644\n--- a/src/libcamera/camera_sensor.cpp\n+++ b/src/libcamera/camera_sensor.cpp\n@@ -279,7 +279,7 @@ const V4L2ControlInfoMap &CameraSensor::controls() const\n * \\retval -EINVAL One of the control is not supported or not accessible\n * \\retval i The index of the control that failed\n */\n-int CameraSensor::getControls(V4L2ControlList *ctrls)\n+int CameraSensor::getControls(ControlList *ctrls)\n {\n \treturn subdev_->getControls(ctrls);\n }\n@@ -309,7 +309,7 @@ int CameraSensor::getControls(V4L2ControlList *ctrls)\n * \\retval -EINVAL One of the control is not supported or not accessible\n * \\retval i The index of the control that failed\n */\n-int CameraSensor::setControls(V4L2ControlList *ctrls)\n+int CameraSensor::setControls(ControlList *ctrls)\n {\n \treturn subdev_->setControls(ctrls);\n }\ndiff --git a/src/libcamera/include/camera_sensor.h b/src/libcamera/include/camera_sensor.h\nindex fe033fb374c1..5ad829232f26 100644\n--- a/src/libcamera/include/camera_sensor.h\n+++ b/src/libcamera/include/camera_sensor.h\n@@ -17,6 +17,7 @@\n \n namespace libcamera {\n \n+class ControlList;\n class MediaEntity;\n class V4L2Subdevice;\n \n@@ -43,8 +44,8 @@ public:\n \tint setFormat(V4L2SubdeviceFormat *format);\n \n \tconst V4L2ControlInfoMap &controls() const;\n-\tint getControls(V4L2ControlList *ctrls);\n-\tint setControls(V4L2ControlList *ctrls);\n+\tint getControls(ControlList *ctrls);\n+\tint setControls(ControlList *ctrls);\n \n protected:\n \tstd::string logPrefix() const;\ndiff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h\nindex 71ce377fe4c5..1d85ecf9864a 100644\n--- a/src/libcamera/include/v4l2_controls.h\n+++ b/src/libcamera/include/v4l2_controls.h\n@@ -13,7 +13,6 @@\n #include \n #include \n \n-#include \n #include \n \n #include \n@@ -47,45 +46,17 @@ private:\n \n using V4L2ControlInfoMap = std::map;\n \n-class V4L2Control\n+class V4L2ControlList : public ControlList\n {\n public:\n-\tV4L2Control(unsigned int id, const ControlValue &value = ControlValue())\n-\t\t: id_(id), value_(value)\n-\t{\n-\t}\n+\tV4L2ControlList(const V4L2ControlInfoMap &controls);\n \n-\tunsigned int id() const { return id_; }\n-\tconst ControlValue &value() const { return value_; }\n-\tControlValue &value() { return value_; }\n+\tbool contains(unsigned int id) const;\n+\tconst ControlValue &get(unsigned int id) const;\n+\tvoid set(unsigned int id, const ControlValue &value);\n \n private:\n-\tunsigned int id_;\n-\tControlValue value_;\n-};\n-\n-class V4L2ControlList\n-{\n-public:\n-\tusing iterator = std::vector::iterator;\n-\tusing const_iterator = std::vector::const_iterator;\n-\n-\titerator begin() { return controls_.begin(); }\n-\tconst_iterator begin() const { return controls_.begin(); }\n-\titerator end() { return controls_.end(); }\n-\tconst_iterator end() const { return controls_.end(); }\n-\n-\tbool empty() const { return controls_.empty(); }\n-\tstd::size_t size() const { return controls_.size(); }\n-\n-\tvoid clear() { controls_.clear(); }\n-\tvoid add(unsigned int id, int64_t value = 0);\n-\n-\tV4L2Control *getByIndex(unsigned int index);\n-\tV4L2Control *operator[](unsigned int id);\n-\n-private:\n-\tstd::vector controls_;\n+\tconst V4L2ControlInfoMap &controls_;\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex 75a52c33d821..0375d3a1cb82 100644\n--- a/src/libcamera/include/v4l2_device.h\n+++ b/src/libcamera/include/v4l2_device.h\n@@ -17,6 +17,8 @@\n \n namespace libcamera {\n \n+class ControlList;\n+\n class V4L2Device : protected Loggable\n {\n public:\n@@ -25,8 +27,8 @@ public:\n \n \tconst V4L2ControlInfoMap &controls() const { return controls_; }\n \n-\tint getControls(V4L2ControlList *ctrls);\n-\tint setControls(V4L2ControlList *ctrls);\n+\tint getControls(ControlList *ctrls);\n+\tint setControls(ControlList *ctrls);\n \n \tconst std::string &deviceNode() const { return deviceNode_; }\n \n@@ -43,7 +45,7 @@ protected:\n \n private:\n \tvoid listControls();\n-\tvoid updateControls(V4L2ControlList *ctrls,\n+\tvoid updateControls(ControlList *ctrls,\n \t\t\t const V4L2ControlInfo **controlInfo,\n \t\t\t const struct v4l2_ext_control *v4l2Ctrls,\n \t\t\t unsigned int count);\ndiff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 827906d5cd2e..9776b36b88cd 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -199,6 +199,7 @@ class PipelineHandlerIPU3 : public PipelineHandler\n {\n public:\n \tstatic constexpr unsigned int V4L2_CID_IPU3_PIPE_MODE = 0x009819c1;\n+\n \tenum IPU3PipeModes {\n \t\tIPU3PipeModeVideo = 0,\n \t\tIPU3PipeModeStillCapture = 1,\n@@ -603,10 +604,10 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)\n \t\treturn ret;\n \n \t/* Apply the \"pipe_mode\" control to the ImgU subdevice. */\n-\tV4L2ControlList ctrls;\n-\tctrls.add(V4L2_CID_IPU3_PIPE_MODE, vfStream->active_ ?\n-\t\t\t\t\t IPU3PipeModeVideo :\n-\t\t\t\t\t IPU3PipeModeStillCapture);\n+\tV4L2ControlList ctrls(imgu->imgu_->controls());\n+\tctrls.set(V4L2_CID_IPU3_PIPE_MODE,\n+\t\t static_cast(vfStream->active_ ? IPU3PipeModeVideo :\n+\t\t\t\t IPU3PipeModeStillCapture));\n \tret = imgu->imgu_->setControls(&ctrls);\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Unable to set pipe_mode control\";\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 88f7fb9bc568..467bd9a9eaff 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -228,31 +228,30 @@ void PipelineHandlerUVC::stop(Camera *camera)\n \n int PipelineHandlerUVC::processControls(UVCCameraData *data, Request *request)\n {\n-\tV4L2ControlList controls;\n+\tV4L2ControlList controls(data->video_->controls());\n \n \tfor (auto it : request->controls()) {\n \t\tconst ControlId &id = *it.first;\n \t\tControlValue &value = it.second;\n \n \t\tif (id == controls::Brightness) {\n-\t\t\tcontrols.add(V4L2_CID_BRIGHTNESS, value.get());\n+\t\t\tcontrols.set(V4L2_CID_BRIGHTNESS, value);\n \t\t} else if (id == controls::Contrast) {\n-\t\t\tcontrols.add(V4L2_CID_CONTRAST, value.get());\n+\t\t\tcontrols.set(V4L2_CID_CONTRAST, value);\n \t\t} else if (id == controls::Saturation) {\n-\t\t\tcontrols.add(V4L2_CID_SATURATION, value.get());\n+\t\t\tcontrols.set(V4L2_CID_SATURATION, value);\n \t\t} else if (id == controls::ManualExposure) {\n-\t\t\tcontrols.add(V4L2_CID_EXPOSURE_AUTO, 1);\n-\t\t\tcontrols.add(V4L2_CID_EXPOSURE_ABSOLUTE, value.get());\n+\t\t\tcontrols.set(V4L2_CID_EXPOSURE_AUTO, 1);\n+\t\t\tcontrols.set(V4L2_CID_EXPOSURE_ABSOLUTE, value);\n \t\t} else if (id == controls::ManualGain) {\n-\t\t\tcontrols.add(V4L2_CID_GAIN, value.get());\n+\t\t\tcontrols.set(V4L2_CID_GAIN, value);\n \t\t}\n \t}\n \n-\tfor (const V4L2Control &ctrl : controls)\n+\tfor (const auto &ctrl : controls)\n \t\tLOG(UVC, Debug)\n-\t\t\t<< \"Setting control 0x\"\n-\t\t\t<< std::hex << std::setw(8) << ctrl.id() << std::dec\n-\t\t\t<< \" to \" << ctrl.value().toString();\n+\t\t\t<< \"Setting control \" << ctrl.first->name()\n+\t\t\t<< \" to \" << ctrl.second.toString();\n \n \tint ret = data->video_->setControls(&controls);\n \tif (ret) {\n@@ -338,11 +337,10 @@ int UVCCameraData::init(MediaEntity *entity)\n \t/* Initialise the supported controls. */\n \tconst V4L2ControlInfoMap &controls = video_->controls();\n \tfor (const auto &ctrl : controls) {\n-\t\tunsigned int v4l2Id = ctrl.first;\n \t\tconst V4L2ControlInfo &info = ctrl.second;\n \t\tconst ControlId *id;\n \n-\t\tswitch (v4l2Id) {\n+\t\tswitch (info.id().id()) {\n \t\tcase V4L2_CID_BRIGHTNESS:\n \t\t\tid = &controls::Brightness;\n \t\t\tbreak;\ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex 26477dccbb8f..600a1154c75e 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -281,26 +281,24 @@ void PipelineHandlerVimc::stop(Camera *camera)\n \n int PipelineHandlerVimc::processControls(VimcCameraData *data, Request *request)\n {\n-\tV4L2ControlList controls;\n+\tV4L2ControlList controls(data->sensor_->controls());\n \n \tfor (auto it : request->controls()) {\n \t\tconst ControlId &id = *it.first;\n \t\tControlValue &value = it.second;\n \n-\t\tif (id == controls::Brightness) {\n-\t\t\tcontrols.add(V4L2_CID_BRIGHTNESS, value.get());\n-\t\t} else if (id == controls::Contrast) {\n-\t\t\tcontrols.add(V4L2_CID_CONTRAST, value.get());\n-\t\t} else if (id == controls::Saturation) {\n-\t\t\tcontrols.add(V4L2_CID_SATURATION, value.get());\n-\t\t}\n+\t\tif (id == controls::Brightness)\n+\t\t\tcontrols.set(V4L2_CID_BRIGHTNESS, value);\n+\t\telse if (id == controls::Contrast)\n+\t\t\tcontrols.set(V4L2_CID_CONTRAST, value);\n+\t\telse if (id == controls::Saturation)\n+\t\t\tcontrols.set(V4L2_CID_SATURATION, value);\n \t}\n \n-\tfor (const V4L2Control &ctrl : controls)\n+\tfor (const auto &ctrl : controls)\n \t\tLOG(VIMC, Debug)\n-\t\t\t<< \"Setting control 0x\"\n-\t\t\t<< std::hex << std::setw(8) << ctrl.id() << std::dec\n-\t\t\t<< \" to \" << ctrl.value().toString();\n+\t\t\t<< \"Setting control \" << ctrl.first->name()\n+\t\t\t<< \" to \" << ctrl.second.toString();\n \n \tint ret = data->sensor_->setControls(&controls);\n \tif (ret) {\n@@ -417,11 +415,10 @@ int VimcCameraData::init(MediaDevice *media)\n \t/* Initialise the supported controls. */\n \tconst V4L2ControlInfoMap &controls = sensor_->controls();\n \tfor (const auto &ctrl : controls) {\n-\t\tunsigned int v4l2Id = ctrl.first;\n \t\tconst V4L2ControlInfo &info = ctrl.second;\n \t\tconst ControlId *id;\n \n-\t\tswitch (v4l2Id) {\n+\t\tswitch (info.id().id()) {\n \t\tcase V4L2_CID_BRIGHTNESS:\n \t\t\tid = &controls::Brightness;\n \t\t\tbreak;\ndiff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp\nindex a630a2583d33..98b2b3fe9d0a 100644\n--- a/src/libcamera/v4l2_controls.cpp\n+++ b/src/libcamera/v4l2_controls.cpp\n@@ -167,191 +167,83 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl)\n * \\brief A map of control ID to V4L2ControlInfo\n */\n \n-/**\n- * \\class V4L2Control\n- * \\brief A V4L2 control value\n- *\n- * The V4L2Control class represent the value of a V4L2 control. The class\n- * stores values that have been read from or will be applied to a V4L2 device.\n- *\n- * The value stored in the class instances does not reflect what is actually\n- * applied to the hardware but is a pure software cache optionally initialized\n- * at control creation time and modified by a control read or write operation.\n- *\n- * The write and read controls the V4L2Control class instances are not meant\n- * to be directly used but are instead intended to be grouped in\n- * V4L2ControlList instances, which are then passed as parameters to\n- * V4L2Device::setControls() and V4L2Device::getControls() operations.\n- */\n-\n-/**\n- * \\fn V4L2Control::V4L2Control\n- * \\brief Construct a V4L2 control with \\a id and \\a value\n- * \\param id The V4L2 control ID\n- * \\param value The control value\n- */\n-\n-/**\n- * \\fn V4L2Control::value() const\n- * \\brief Retrieve the value of the control\n- *\n- * This method is a const version of V4L2Control::value(), returning a const\n- * reference to the value.\n- *\n- * \\return The V4L2 control value\n- */\n-\n-/**\n- * \\fn V4L2Control::value()\n- * \\brief Retrieve the value of the control\n- *\n- * This method returns the cached control value, initially set by\n- * V4L2ControlList::add() and then updated when the controls are read or\n- * written with V4L2Device::getControls() and V4L2Device::setControls().\n- *\n- * \\return The V4L2 control value\n- */\n-\n-/**\n- * \\fn V4L2Control::id()\n- * \\brief Retrieve the control ID this instance refers to\n- * \\return The V4L2Control ID\n- */\n-\n /**\n * \\class V4L2ControlList\n- * \\brief Container of V4L2Control instances\n+ * \\brief A list of controls for a V4L2 device\n *\n- * The V4L2ControlList class works as a container for a list of V4L2Control\n- * instances. The class provides operations to add a new control to the list,\n- * get back a control value, and reset the list of controls it contains.\n+ * This class specialises the ControList class for use with V4L2 devices. It\n+ * offers a convenience API to access controls by numerical ID instead of\n+ * ControlId.\n *\n- * In order to set and get controls, user of the libcamera V4L2 control\n- * framework should operate on instances of the V4L2ControlList class, and use\n- * them as argument for the V4L2Device::setControls() and\n- * V4L2Device::getControls() operations, which write and read a list of\n- * controls to or from a V4L2 device (a video device or a subdevice).\n- *\n- * Controls are added to a V4L2ControlList instance with the add() method, with\n- * or without a value.\n- *\n- * To write controls to a device, the controls of interest shall be added with\n- * an initial value by calling V4L2ControlList::add(unsigned int id, int64_t\n- * value) to prepare for a write operation. Once the values of all controls of\n- * interest have been added, the V4L2ControlList instance is passed to the\n- * V4L2Device::setControls(), which sets the controls on the device.\n- *\n- * To read controls from a device, the desired controls are added with\n- * V4L2ControlList::add(unsigned int id) to prepare for a read operation. The\n- * V4L2ControlList instance is then passed to V4L2Device::getControls(), which\n- * reads the controls from the device and updates the values stored in\n- * V4L2ControlList.\n- *\n- * V4L2ControlList instances can be reset to remove all controls they contain\n- * and prepare to be re-used for a new control write/read sequence.\n- */\n-\n-/**\n- * \\typedef V4L2ControlList::iterator\n- * \\brief Iterator on the V4L2 controls contained in the instance\n- */\n-\n-/**\n- * \\typedef V4L2ControlList::const_iterator\n- * \\brief Const iterator on the V4L2 controls contained in the instance\n+ * V4L2ControlList should as much as possible not be used in place of\n+ * ControlList in APIs, and be used instead solely for the purpose of easily\n+ * constructing a ControlList of V4L2 controls for a device.\n */\n \n /**\n- * \\fn iterator V4L2ControlList::begin()\n- * \\brief Retrieve an iterator to the first V4L2Control in the instance\n- * \\return An iterator to the first V4L2 control\n+ * \\brief Construct a V4L2ControlList associated with a V4L2 device\n+ * \\param[in] controls The V4L2 device control info map\n */\n-\n-/**\n- * \\fn const_iterator V4L2ControlList::begin() const\n- * \\brief Retrieve a constant iterator to the first V4L2Control in the instance\n- * \\return A constant iterator to the first V4L2 control\n- */\n-\n-/**\n- * \\fn iterator V4L2ControlList::end()\n- * \\brief Retrieve an iterator pointing to the past-the-end V4L2Control in the\n- * instance\n- * \\return An iterator to the element following the last V4L2 control in the\n- * instance\n- */\n-\n-/**\n- * \\fn const_iterator V4L2ControlList::end() const\n- * \\brief Retrieve a constant iterator pointing to the past-the-end V4L2Control\n- * in the instance\n- * \\return A constant iterator to the element following the last V4L2 control\n- * in the instance\n- */\n-\n-/**\n- * \\fn V4L2ControlList::empty()\n- * \\brief Verify if the instance does not contain any control\n- * \\return True if the instance does not contain any control, false otherwise\n- */\n-\n-/**\n- * \\fn V4L2ControlList::size()\n- * \\brief Retrieve the number on controls in the instance\n- * \\return The number of V4L2Control stored in the instance\n- */\n-\n-/**\n- * \\fn V4L2ControlList::clear()\n- * \\brief Remove all controls in the instance\n- */\n-\n-/**\n- * \\brief Add control with \\a id and optional \\a value to the instance\n- * \\param id The V4L2 control ID (V4L2_CID_*)\n- * \\param value The V4L2 control value\n- *\n- * This method adds a new V4L2 control to the V4L2ControlList. The newly\n- * inserted control shall not already be present in the control lists, otherwise\n- * this method, and further use of the control list lead to undefined behaviour.\n- */\n-void V4L2ControlList::add(unsigned int id, int64_t value)\n+V4L2ControlList::V4L2ControlList(const V4L2ControlInfoMap &controls)\n+\t: ControlList(nullptr), controls_(controls)\n {\n-\tcontrols_.emplace_back(id, value);\n }\n \n /**\n- * \\brief Retrieve the control at \\a index\n- * \\param[in] index The control index\n- *\n- * Controls are stored in a V4L2ControlList in order of insertion and this\n- * method retrieves the control at \\a index.\n+ * \\brief Check if the list contains a control with the specified \\a id\n+ * \\param[in] id The control ID\n *\n- * \\return A pointer to the V4L2Control at \\a index or nullptr if the\n- * index is larger than the number of controls\n+ * \\return True if the list contains a matching control, false otherwise\n */\n-V4L2Control *V4L2ControlList::getByIndex(unsigned int index)\n+bool V4L2ControlList::contains(unsigned int id) const\n {\n-\tif (index >= controls_.size())\n-\t\treturn nullptr;\n+\tauto ctrl = controls_.find(id);\n+\tif (ctrl == controls_.end())\n+\t\treturn false;\n \n-\treturn &controls_[index];\n+\treturn ControlList::contains(ctrl->second.id());\n }\n \n /**\n- * \\brief Retrieve the control with \\a id\n- * \\param[in] id The V4L2 control ID (V4L2_CID_xx)\n- * \\return A pointer to the V4L2Control with \\a id or nullptr if the\n- * control ID is not part of this instance.\n+ * \\brief Get the value of control \\a id\n+ * \\param[in] id The control ID\n+ *\n+ * The behaviour is undefined if the control \\a id is not present in the list.\n+ * Use v4L2ControlList::contains() to test for the presence of a control in the\n+ * list before retrieving its value.\n+ *\n+ * \\return The control value\n */\n-V4L2Control *V4L2ControlList::operator[](unsigned int id)\n+const ControlValue &V4L2ControlList::get(unsigned int id) const\n {\n-\tfor (V4L2Control &ctrl : controls_) {\n-\t\tif (ctrl.id() == id)\n-\t\t\treturn &ctrl;\n+\tauto ctrl = controls_.find(id);\n+\tif (ctrl == controls_.end()) {\n+\t\tstatic ControlValue zero;\n+\t\treturn zero;\n \t}\n \n-\treturn nullptr;\n+\treturn ControlList::get(ctrl->second.id());\n+}\n+\n+/**\n+ * \\brief Set the value of control \\a id to \\a value\n+ * \\param[in] id The control ID\n+ * \\param[in] value The control value\n+ *\n+ * This method sets the value of a control in the control list. If the control\n+ * is already present in the list, its value is updated, otherwise it is added\n+ * to the list.\n+ *\n+ * The behaviour is undefined if the control \\a ctrl is not supported by the\n+ * V4L2 device that the list refers to.\n+ */\n+void V4L2ControlList::set(unsigned int id, const ControlValue &value)\n+{\n+\tauto ctrl = controls_.find(id);\n+\tif (ctrl == controls_.end())\n+\t\treturn;\n+\n+\tControlList::set(ctrl->second.id(), value);\n }\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 466c3d41f6e3..50616571dcef 100644\n--- a/src/libcamera/v4l2_device.cpp\n+++ b/src/libcamera/v4l2_device.cpp\n@@ -12,6 +12,8 @@\n #include \n #include \n \n+#include \n+\n #include \"log.h\"\n #include \"v4l2_controls.h\"\n \n@@ -163,7 +165,7 @@ void V4L2Device::close()\n * \\retval -EINVAL One of the control is not supported or not accessible\n * \\retval i The index of the control that failed\n */\n-int V4L2Device::getControls(V4L2ControlList *ctrls)\n+int V4L2Device::getControls(ControlList *ctrls)\n {\n \tunsigned int count = ctrls->size();\n \tif (count == 0)\n@@ -173,18 +175,21 @@ int V4L2Device::getControls(V4L2ControlList *ctrls)\n \tstruct v4l2_ext_control v4l2Ctrls[count];\n \tmemset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));\n \n-\tfor (unsigned int i = 0; i < count; ++i) {\n-\t\tconst V4L2Control *ctrl = ctrls->getByIndex(i);\n-\t\tconst auto iter = controls_.find(ctrl->id());\n+\tunsigned int i = 0;\n+\tfor (const auto &ctrl : *ctrls) {\n+\t\tconst ControlId *id = ctrl.first;\n+\t\tconst auto iter = controls_.find(id->id());\n \t\tif (iter == controls_.end()) {\n \t\t\tLOG(V4L2, Error)\n-\t\t\t\t<< \"Control '\" << ctrl->id() << \"' not found\";\n+\t\t\t\t<< \"Control '\" << id->name() << \"' not found\";\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\tconst V4L2ControlInfo *info = &iter->second;\n \t\tcontrolInfo[i] = info;\n-\t\tv4l2Ctrls[i].id = ctrl->id();\n+\t\tv4l2Ctrls[i].id = id->id();\n+\n+\t\ti++;\n \t}\n \n \tstruct v4l2_ext_controls v4l2ExtCtrls = {};\n@@ -238,7 +243,7 @@ int V4L2Device::getControls(V4L2ControlList *ctrls)\n * \\retval -EINVAL One of the control is not supported or not accessible\n * \\retval i The index of the control that failed\n */\n-int V4L2Device::setControls(V4L2ControlList *ctrls)\n+int V4L2Device::setControls(ControlList *ctrls)\n {\n \tunsigned int count = ctrls->size();\n \tif (count == 0)\n@@ -248,32 +253,36 @@ int V4L2Device::setControls(V4L2ControlList *ctrls)\n \tstruct v4l2_ext_control v4l2Ctrls[count];\n \tmemset(v4l2Ctrls, 0, sizeof(v4l2Ctrls));\n \n-\tfor (unsigned int i = 0; i < count; ++i) {\n-\t\tconst V4L2Control *ctrl = ctrls->getByIndex(i);\n-\t\tconst auto iter = controls_.find(ctrl->id());\n+\tunsigned int i = 0;\n+\tfor (const auto &ctrl : *ctrls) {\n+\t\tconst ControlId *id = ctrl.first;\n+\t\tconst auto iter = controls_.find(id->id());\n \t\tif (iter == controls_.end()) {\n \t\t\tLOG(V4L2, Error)\n-\t\t\t\t<< \"Control '\" << ctrl->id() << \"' not found\";\n+\t\t\t\t<< \"Control '\" << id->name() << \"' not found\";\n \t\t\treturn -EINVAL;\n \t\t}\n \n \t\tconst V4L2ControlInfo *info = &iter->second;\n \t\tcontrolInfo[i] = info;\n-\t\tv4l2Ctrls[i].id = ctrl->id();\n+\t\tv4l2Ctrls[i].id = id->id();\n \n \t\t/* Set the v4l2_ext_control value for the write operation. */\n+\t\tconst ControlValue &value = ctrl.second;\n \t\tswitch (info->type()) {\n \t\tcase V4L2_CTRL_TYPE_INTEGER64:\n-\t\t\tv4l2Ctrls[i].value64 = ctrl->value().get();\n+\t\t\tv4l2Ctrls[i].value64 = value.get();\n \t\t\tbreak;\n \t\tdefault:\n \t\t\t/*\n \t\t\t * \\todo To be changed when support for string and\n \t\t\t * compound controls will be added.\n \t\t\t */\n-\t\t\tv4l2Ctrls[i].value = ctrl->value().get();\n+\t\t\tv4l2Ctrls[i].value64 = value.get();\n \t\t\tbreak;\n \t\t}\n+\n+\t\ti++;\n \t}\n \n \tstruct v4l2_ext_controls v4l2ExtCtrls = {};\n@@ -382,28 +391,31 @@ void V4L2Device::listControls()\n * \\param[in] v4l2Ctrls List of V4L2 extended controls as returned by the driver\n * \\param[in] count The number of controls to update\n */\n-void V4L2Device::updateControls(V4L2ControlList *ctrls,\n+void V4L2Device::updateControls(ControlList *ctrls,\n \t\t\t\tconst V4L2ControlInfo **controlInfo,\n \t\t\t\tconst struct v4l2_ext_control *v4l2Ctrls,\n \t\t\t\tunsigned int count)\n {\n-\tfor (unsigned int i = 0; i < count; ++i) {\n+\tunsigned int i = 0;\n+\tfor (auto &ctrl : *ctrls) {\n \t\tconst struct v4l2_ext_control *v4l2Ctrl = &v4l2Ctrls[i];\n \t\tconst V4L2ControlInfo *info = controlInfo[i];\n-\t\tV4L2Control *ctrl = ctrls->getByIndex(i);\n+\t\tControlValue &value = ctrl.second;\n \n \t\tswitch (info->type()) {\n \t\tcase V4L2_CTRL_TYPE_INTEGER64:\n-\t\t\tctrl->value().set(v4l2Ctrl->value64);\n+\t\t\tvalue.set(v4l2Ctrl->value64);\n \t\t\tbreak;\n \t\tdefault:\n \t\t\t/*\n \t\t\t * \\todo To be changed when support for string and\n \t\t\t * compound controls will be added.\n \t\t\t */\n-\t\t\tctrl->value().set(v4l2Ctrl->value);\n+\t\t\tvalue.set(v4l2Ctrl->value);\n \t\t\tbreak;\n \t\t}\n+\n+\t\ti++;\n \t}\n }\n \n","prefixes":["libcamera-devel","7/9"]}