[{"id":3061,"web_url":"https://patchwork.libcamera.org/comment/3061/","msgid":"<20191118171428.GE8072@bigcity.dyn.berto.se>","date":"2019-11-18T17:14:28","subject":"Re: [libcamera-devel] [PATCH v2 09/24] libcamera: controls: Store\n\treference to the InfoMap","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nThanks for your work.\n\nOn 2019-11-08 22:53:54 +0200, Laurent Pinchart wrote:\n> From: Jacopo Mondi \n> \n> Store a reference to the ControlInfoMap used to create a ControlList and\n> provide an operation to retrieve it. This will be used to implement\n> serialization of ControlList.\n> \n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> include/libcamera/controls.h | 4 ++++\n> src/libcamera/controls.cpp | 16 +++++++++++++---\n> 2 files changed, 17 insertions(+), 3 deletions(-)\n> \n> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> index b35e006bc046..baca684444a7 100644\n> --- a/include/libcamera/controls.h\n> +++ b/include/libcamera/controls.h\n> @@ -232,12 +232,16 @@ public:\n> \tconst ControlValue &get(unsigned int id) const;\n> \tvoid set(unsigned int id, const ControlValue &value);\n> \n> +\tconst ControlInfoMap *infoMap() const { return infoMap_; }\n> +\n> private:\n> \tconst ControlValue *find(unsigned int id) const;\n> \tControlValue *find(unsigned int id);\n> \n> \tControlValidator *validator_;\n> \tconst ControlIdMap *idmap_;\n> +\tconst ControlInfoMap *infoMap_;\n> +\n> \tControlListMap controls_;\n> };\n> \n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 178ce3d99bce..eae0250a92e3 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -595,7 +595,7 @@ void ControlInfoMap::generateIdmap()\n> * be used directly by application.\n> */\n> ControlList::ControlList()\n> -\t: validator_(nullptr), idmap_(nullptr)\n> +\t: validator_(nullptr), idmap_(nullptr), infoMap_(nullptr)\n> {\n> }\n> \n> @@ -609,7 +609,7 @@ ControlList::ControlList()\n> * argument.\n> */\n> ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n> -\t: validator_(validator), idmap_(&idmap)\n> +\t: validator_(validator), idmap_(&idmap), infoMap_(nullptr)\n> {\n> }\n> \n> @@ -619,7 +619,7 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator)\n> * \\param[in] validator The validator (may be null)\n> */\n> ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator)\n> -\t: validator_(validator), idmap_(&info.idmap())\n> +\t: validator_(validator), idmap_(&info.idmap()), infoMap_(&info)\n> {\n> }\n> \n> @@ -769,6 +769,16 @@ void ControlList::set(unsigned int id, const ControlValue &value)\n> \t*val = value;\n> }\n> \n> +/**\n> + * \\fn ControlList::infoMap()\n> + * \\brief Retrieve the ControlInfoMap used to construct the ControlList\n> + *\n> + * \\return The ControlInfoMap used to construct the ControlList. ControlList\n> + * instances constructed with ControlList() or\n> + * ControlList(const ControlIdMap &idmap, ControlValidator *validator) have no\n> + * associated ControlInfoMap, nullptr is returned in that case.\n> + */\n> +\n> const ControlValue *ControlList::find(unsigned int id) const\n> {\n> \tconst auto iter = controls_.find(id);\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 mail-lf1-x141.google.com (mail-lf1-x141.google.com\n\t[IPv6:2a00:1450:4864:20::141])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 38BA260F1C\n\tfor ;\n\tMon, 18 Nov 2019 18:14:30 +0100 (CET)","by mail-lf1-x141.google.com with SMTP id n186so2022596lfd.11\n\tfor ;\n\tMon, 18 Nov 2019 09:14:30 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\tt28sm8662369ljd.47.2019.11.18.09.14.28\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 18 Nov 2019 09:14:28 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=iTJ8jV/heo38INpsISKRrJHx9fZZUzmygEtA/GGsAp4=;\n\tb=zpzB0itz//JMdjm8nRAuS9ZTQOSHjh9FyOR9B8lA8QK+9MHVmtmQ+83Ms1oRLyImzq\n\tZQLjWWWwGoHB4yDxXYYI+EDCKWEj/xmpvN1qwbTeCVEAg7PoutNlZvqF2gHe9NVx43o/\n\tYFnXvQp4ihL7DfDCbZgZNC8l2QNEfa7clbVfG8AUUGCDkBrUKU1FGaB/ahJm3+hJGVtz\n\toVdP+dQ//+ZVQAuIK71KNRMrYacQLx6MzZSR5AElyZ4W+Ko/DS830yCg2Oi8XF1cxdf7\n\t1WMa/B1Db119H4rzi/KA6+gPvhNVINqTda6gE9j2dWGckEagsFr13dmdXugpo/iMbCeG\n\tln5w==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=iTJ8jV/heo38INpsISKRrJHx9fZZUzmygEtA/GGsAp4=;\n\tb=oACS98AbJV8ri5y1cKaFTzUBcTJdWfO8o1fOM0voh/Iy329RiuwcYk2zVF77WaqYjb\n\tSZyyghTTiO4e0lWvUOGNUikHzI4CWTzoKKFFKvomXvI/en8Sel6Mt5sa75f3cXEGsc4O\n\tPtn9T2ulCdocf0KOMDhhAx/XnmgcvcqSlQO76PinmJGjc0iDnx519clQQx+vmp2EZq4x\n\twZdTvh5M0qoEJleIklHERVhA1sLQhfYlwakWSASCsnbiwgqLmiBj4vLoWFBMpPSf/91k\n\tNyCWE6m+qF5RTpBFSARqNntNeFskVbvEdJAwNizLRXMIz0ZjKK7M2Gj1nbfr9NeqXpBy\n\tOH+A==","X-Gm-Message-State":"APjAAAUjZzM6QdQbdTjiioxqSdNek2K9uCmxwhD0EUSqRUC4dM/eWUya\n\tP/soA3Jqr38G2blju6UR4i7JsQ==","X-Google-Smtp-Source":"APXvYqzzxb9uVMfcOqkyK2maKKXYLjZ/B1+IRhEWqvrPMbvSUob95TmvGA3WCe1T+5CaADC8R1V4aQ==","X-Received":"by 2002:ac2:5deb:: with SMTP id z11mr371774lfq.35.1574097269691; \n\tMon, 18 Nov 2019 09:14:29 -0800 (PST)","Date":"Mon, 18 Nov 2019 18:14:28 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191118171428.GE8072@bigcity.dyn.berto.se>","References":"<20191108205409.18845-1-laurent.pinchart@ideasonboard.com>\n\t<20191108205409.18845-10-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20191108205409.18845-10-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH v2 09/24] libcamera: controls: Store\n\treference to the InfoMap","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, 18 Nov 2019 17:14:30 -0000"}}]