[{"id":2724,"web_url":"https://patchwork.libcamera.org/comment/2724/","msgid":"<20190929100234.eecita6hh5adavvk@uno.localdomain>","date":"2019-09-29T10:02:34","subject":"Re: [libcamera-devel] [PATCH 06/12] libcamera: controls: Remove\n\tControlInfo::id","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n knowing this will help unifying with V4L2ControlInfo:\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\nOn Sat, Sep 28, 2019 at 06:22:32PM +0300, Laurent Pinchart wrote:\n> The ControlInfo id member is only used in the toString() method of the\n> class, and nowhere else externally. The same way that ControlValue\n> doesn't store a ControlId, ControlInfo shouldn't. Remove it.\n>\n> Signed-off-by: Laurent Pinchart \n> ---\n> include/libcamera/controls.h | 4 +---\n> src/libcamera/controls.cpp | 13 +++----------\n> src/libcamera/pipeline/uvcvideo.cpp | 2 +-\n> src/libcamera/pipeline/vimc.cpp | 2 +-\n> test/controls/control_info.cpp | 18 ++----------------\n> 5 files changed, 8 insertions(+), 31 deletions(-)\n>\n> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> index d4a74ada1b6a..854ea3b84267 100644\n> --- a/include/libcamera/controls.h\n> +++ b/include/libcamera/controls.h\n> @@ -98,17 +98,15 @@ private:\n> class ControlInfo\n> {\n> public:\n> -\texplicit ControlInfo(const ControlId &id, const ControlValue &min = 0,\n> +\texplicit ControlInfo(const ControlValue &min = 0,\n> \t\t\t const ControlValue &max = 0);\n>\n> -\tconst ControlId &id() const { return id_; }\n> \tconst ControlValue &min() const { return min_; }\n> \tconst ControlValue &max() const { return max_; }\n>\n> \tstd::string toString() const;\n>\n> private:\n> -\tconst ControlId &id_;\n> \tControlValue min_;\n> \tControlValue max_;\n> };\n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 62cb2ff822bb..6a3bb353792d 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -323,22 +323,15 @@ Control::Control(unsigned int id, const char *name)\n>\n> /**\n> * \\brief Construct a ControlInfo with minimum and maximum range parameters\n> - * \\param[in] id The control ID\n> * \\param[in] min The control minimum value\n> * \\param[in] max The control maximum value\n> */\n> -ControlInfo::ControlInfo(const ControlId &id, const ControlValue &min,\n> +ControlInfo::ControlInfo(const ControlValue &min,\n> \t\t\t const ControlValue &max)\n> -\t: id_(id), min_(min), max_(max)\n> +\t: min_(min), max_(max)\n> {\n> }\n>\n> -/**\n> - * \\fn ControlInfo::id()\n> - * \\brief Retrieve the control ID\n> - * \\return The control ID\n> - */\n> -\n> /**\n> * \\fn ControlInfo::min()\n> * \\brief Retrieve the minimum value of the control\n> @@ -358,7 +351,7 @@ std::string ControlInfo::toString() const\n> {\n> \tstd::stringstream ss;\n>\n> -\tss << id_.name() << \"[\" << min_.toString() << \"..\" << max_.toString() << \"]\";\n> +\tss << \"[\" << min_.toString() << \"..\" << max_.toString() << \"]\";\n>\n> \treturn ss.str();\n> }\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index 44e19f40f1b9..3635ea83a7b1 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -364,7 +364,7 @@ int UVCCameraData::init(MediaEntity *entity)\n>\n> \t\tcontrolInfo_.emplace(std::piecewise_construct,\n> \t\t\t\t std::forward_as_tuple(id),\n> -\t\t\t\t std::forward_as_tuple(*id, info.min(), info.max()));\n> +\t\t\t\t std::forward_as_tuple(info.min(), info.max()));\n> \t}\n>\n> \treturn 0;\n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index a48febf2172e..d9dd031e173c 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -437,7 +437,7 @@ int VimcCameraData::init(MediaDevice *media)\n>\n> \t\tcontrolInfo_.emplace(std::piecewise_construct,\n> \t\t\t\t std::forward_as_tuple(id),\n> -\t\t\t\t std::forward_as_tuple(*id, info.min(), info.max()));\n> +\t\t\t\t std::forward_as_tuple(info.min(), info.max()));\n> \t}\n>\n> \treturn 0;\n> diff --git a/test/controls/control_info.cpp b/test/controls/control_info.cpp\n> index dbc43df8e3d3..9cf59185e459 100644\n> --- a/test/controls/control_info.cpp\n> +++ b/test/controls/control_info.cpp\n> @@ -24,14 +24,7 @@ protected:\n> \t\t * Test information retrieval from a control with no minimum\n> \t\t * and maximum.\n> \t\t */\n> -\t\tControlInfo brightness(controls::Brightness);\n> -\n> -\t\tif (brightness.id() != controls::Brightness ||\n> -\t\t brightness.id().type() != ControlTypeInteger32 ||\n> -\t\t brightness.id().name() != std::string(\"Brightness\")) {\n> -\t\t\tcout << \"Invalid control identification for Brightness\" << endl;\n> -\t\t\treturn TestFail;\n> -\t\t}\n> +\t\tControlInfo brightness;\n>\n> \t\tif (brightness.min().get() != 0 ||\n> \t\t brightness.max().get() != 0) {\n> @@ -43,14 +36,7 @@ protected:\n> \t\t * Test information retrieval from a control with a minimum and\n> \t\t * a maximum value.\n> \t\t */\n> -\t\tControlInfo contrast(controls::Contrast, 10, 200);\n> -\n> -\t\tif (contrast.id() != controls::Contrast ||\n> -\t\t contrast.id().type() != ControlTypeInteger32 ||\n> -\t\t contrast.id().name() != std::string(\"Contrast\")) {\n> -\t\t\tcout << \"Invalid control identification for Contrast\" << endl;\n> -\t\t\treturn TestFail;\n> -\t\t}\n> +\t\tControlInfo contrast(10, 200);\n>\n> \t\tif (contrast.min().get() != 10 ||\n> \t\t contrast.max().get() != 200) {\n> --\n> Regards,\n>\n> Laurent Pinchart\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 07B3261654\n\tfor ;\n\tSun, 29 Sep 2019 12:00:53 +0200 (CEST)","from uno.localdomain\n\t(host7-199-dynamic.171-212-r.retail.telecomitalia.it [212.171.199.7])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 1698D240007;\n\tSun, 29 Sep 2019 10:00:51 +0000 (UTC)"],"Date":"Sun, 29 Sep 2019 12:02:34 +0200","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190929100234.eecita6hh5adavvk@uno.localdomain>","References":"<20190928152238.23752-1-laurent.pinchart@ideasonboard.com>\n\t<20190928152238.23752-7-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"j4n2zvmhhjozah5l\"","Content-Disposition":"inline","In-Reply-To":"<20190928152238.23752-7-laurent.pinchart@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH 06/12] libcamera: controls: Remove\n\tControlInfo::id","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":"Sun, 29 Sep 2019 10:00:53 -0000"}}]