{"id":10018,"url":"https://patchwork.libcamera.org/api/1.1/patches/10018/?format=json","web_url":"https://patchwork.libcamera.org/patch/10018/","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":"<20201007185719.3208272-2-kieran.bingham@ideasonboard.com>","date":"2020-10-07T18:57:18","name":"[libcamera-devel,1/2] properties: Support draft controls and properties","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"29bdbdf7e1e1b6570cc5757fd43c06fa26348dd2","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10018/mbox/","series":[{"id":1365,"url":"https://patchwork.libcamera.org/api/1.1/series/1365/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1365","date":"2020-10-07T18:57:17","name":"draft controls and properties support","version":1,"mbox":"https://patchwork.libcamera.org/series/1365/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10018/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10018/checks/","tags":{},"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 4590CBEEDF\n\tfor ;\n\tWed, 7 Oct 2020 18:57:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AB09E605C6;\n\tWed, 7 Oct 2020 20:57:27 +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 DD18B605A8\n\tfor ;\n\tWed, 7 Oct 2020 20:57:25 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 66EC19E7;\n\tWed, 7 Oct 2020 20:57:25 +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=\"rr3jHWcC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602097045;\n\tbh=u2fU2HC4YTkKFi6T2l4TRCZzc/yognLx/0Z4c7D8SGE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rr3jHWcCrhEf29ZPzZfAkJmumRBYhX4deGISVpuPGxPGyrZtMFB+aEgfT6Twy3NoM\n\tpg2XpSS42cm0b44fKREVNVsDpPBaO/iBxmKDIUhDL+/YPXgFD6Nn31Txg2OQWYQlC2\n\tc77x2A0kXXJoY25pYghIXZ1Y2q0de3ju8GpvSq+4=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 7 Oct 2020 19:57:18 +0100","Message-Id":"<20201007185719.3208272-2-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201007185719.3208272-1-kieran.bingham@ideasonboard.com>","References":"<20200911162039.61933-1-jacopo@jmondi.org>\n\t<20201007185719.3208272-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 1/2] properties: Support draft controls\n\tand properties","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Extend the control and property framework to support exposing draft\ncontrols and properties in a scoped namespace.\n\nThe controls/properties themselves will retain the same ordering in the\nrelevant enum/id maps - but the access to any draft control will require\nexplicitly referencing through its' draft:: namespace prefix.\n\nSigned-off-by: Kieran Bingham \n---\n include/libcamera/control_ids.h.in | 6 +++++\n include/libcamera/property_ids.h.in | 6 +++++\n src/libcamera/property_ids.cpp.in | 13 +++++++++++\n utils/gen-controls.py | 36 ++++++++++++++++++++++-------\n 4 files changed, 53 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\nindex 95a7a7f1e260..baadca83b103 100644\n--- a/include/libcamera/control_ids.h.in\n+++ b/include/libcamera/control_ids.h.in\n@@ -26,6 +26,12 @@ ${controls}\n \n extern const ControlIdMap controls;\n \n+namespace draft {\n+\n+${draft_controls}\n+\n+} /* namespace draft */\n+\n } /* namespace controls */\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\nindex e4dea335cd3b..52646c1f78ae 100644\n--- a/include/libcamera/property_ids.h.in\n+++ b/include/libcamera/property_ids.h.in\n@@ -24,6 +24,12 @@ ${ids}\n \n ${controls}\n \n+namespace draft {\n+\n+${draft_controls}\n+\n+} /* namespace draft */\n+\n extern const ControlIdMap properties;\n \n } /* namespace properties */\ndiff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\nindex bfdd823f63b0..275c1caff3ec 100644\n--- a/src/libcamera/property_ids.cpp.in\n+++ b/src/libcamera/property_ids.cpp.in\n@@ -23,12 +23,25 @@ namespace properties {\n \n ${controls_doc}\n \n+namespace draft {\n+\n+${draft_controls_doc}\n+\n+} /* namespace draft */\n+\n #ifndef __DOXYGEN__\n /*\n * Keep the properties definitions hidden from doxygen as it incorrectly parses\n * them as functions.\n */\n ${controls_def}\n+\n+namespace draft {\n+\n+${draft_controls_def}\n+\n+} /* namespace draft */\n+\n #endif\n \n /**\ndiff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex 87c3d52ada6d..f28db27ba19f 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -36,6 +36,8 @@ ${description}\n \n ctrls_doc = []\n ctrls_def = []\n+ draft_ctrls_doc = []\n+ draft_ctrls_def = []\n ctrls_map = []\n \n for ctrl in controls:\n@@ -55,6 +57,12 @@ ${description}\n 'id_name': id_name,\n }\n \n+ target_doc = ctrls_doc\n+ target_def = ctrls_def\n+ if ctrl.get('draft'):\n+ target_doc = draft_ctrls_doc\n+ target_def = draft_ctrls_def\n+\n enum = ctrl.get('enum')\n if enum:\n enum_doc = []\n@@ -70,15 +78,21 @@ ${description}\n \n enum_doc = '\\n *\\n'.join(enum_doc)\n enum_doc += '\\n */'\n- ctrls_doc.append(enum_doc)\n+ target_doc.append(enum_doc)\n+\n+ target_doc.append(doc_template.substitute(info))\n+ target_def.append(def_template.substitute(info))\n+\n+ if ctrl.get('draft'):\n+ name = 'draft::' + name\n \n- ctrls_doc.append(doc_template.substitute(info))\n- ctrls_def.append(def_template.substitute(info))\n ctrls_map.append('\\t{ ' + id_name + ', &' + name + ' },')\n \n return {\n 'controls_doc': '\\n\\n'.join(ctrls_doc),\n 'controls_def': '\\n'.join(ctrls_def),\n+ 'draft_controls_doc': '\\n\\n'.join(draft_ctrls_doc),\n+ 'draft_controls_def': '\\n\\n'.join(draft_ctrls_def),\n 'controls_map': '\\n'.join(ctrls_map),\n }\n \n@@ -89,6 +103,7 @@ def generate_h(controls):\n template = string.Template('''extern const Control<${type}> ${name};''')\n \n ctrls = []\n+ draft_ctrls = []\n ids = []\n id_value = 1\n \n@@ -109,22 +124,27 @@ def generate_h(controls):\n 'type': ctrl_type,\n }\n \n+ target_ctrls = ctrls\n+ if ctrl.get('draft'):\n+ target_ctrls = draft_ctrls\n+\n enum = ctrl.get('enum')\n if enum:\n- ctrls.append(enum_template_start.substitute(info))\n+ target_ctrls.append(enum_template_start.substitute(info))\n \n for entry in enum:\n value_info = {\n 'name': entry['name'],\n 'value': entry['value'],\n }\n- ctrls.append(enum_value_template.substitute(value_info))\n- ctrls.append(\"};\")\n+ target_ctrls.append(enum_value_template.substitute(value_info))\n+ target_ctrls.append(\"};\")\n \n- ctrls.append(template.substitute(info))\n+ target_ctrls.append(template.substitute(info))\n id_value += 1\n \n- return {'ids': '\\n'.join(ids), 'controls': '\\n'.join(ctrls)}\n+ return {'ids': '\\n'.join(ids), 'controls': '\\n'.join(ctrls),\n+ 'draft_controls': '\\n'.join(draft_ctrls)}\n \n \n def fill_template(template, data):\n","prefixes":["libcamera-devel","1/2"]}