{"id":10237,"url":"https://patchwork.libcamera.org/api/patches/10237/?format=json","web_url":"https://patchwork.libcamera.org/patch/10237/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20201025160434.25664-3-jacopo@jmondi.org>","date":"2020-10-25T16:04:22","name":"[libcamera-devel,v5,02/14] libcamera: Support draft controls and properties","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"dc8ffa8b3f96032cf82b9a18cc5c7884229f4b08","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10237/mbox/","series":[{"id":1414,"url":"https://patchwork.libcamera.org/api/series/1414/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1414","date":"2020-10-25T16:04:20","name":"libcamera: Introduce draft controls","version":5,"mbox":"https://patchwork.libcamera.org/series/1414/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10237/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10237/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 CD45CBDB13\n\tfor ;\n\tSun, 25 Oct 2020 16:04:45 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EF17661E5F;\n\tSun, 25 Oct 2020 17:04:44 +0100 (CET)","from relay10.mail.gandi.net (relay10.mail.gandi.net\n\t[217.70.178.230])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EDDD61D64\n\tfor ;\n\tSun, 25 Oct 2020 17:04:43 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay10.mail.gandi.net (Postfix) with ESMTPSA id 8810F240007;\n\tSun, 25 Oct 2020 16:04:42 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 25 Oct 2020 17:04:22 +0100","Message-Id":"<20201025160434.25664-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201025160434.25664-1-jacopo@jmondi.org>","References":"<20201025160434.25664-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 02/14] libcamera: Support draft\n\tcontrols and 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":"From: Kieran Bingham \n\nExtend 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\nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nSigned-off-by: Kieran Bingham \n[Added missing hunk in control_ids.cpp.in and changed subject]\nSigned-off-by: Jacopo Mondi \n---\n include/libcamera/control_ids.h.in | 6 +++++\n include/libcamera/property_ids.h.in | 6 +++++\n src/libcamera/control_ids.cpp.in | 15 +++++++++++\n src/libcamera/property_ids.cpp.in | 15 +++++++++++\n utils/gen-controls.py | 39 +++++++++++++++++++++++------\n 5 files changed, 73 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/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex cba6258d68dd..056645cfbdfb 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -23,12 +23,27 @@ namespace controls {\n \n ${controls_doc}\n \n+/**\n+ * \\brief Namespace for libcamera draft controls\n+ */\n+namespace draft {\n+\n+${draft_controls_doc}\n+\n+} /* namespace draft */\n+\n #ifndef __DOXYGEN__\n /*\n * Keep the controls 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 #endif\n \n /**\ndiff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\nindex bfdd823f63b0..f917e3349766 100644\n--- a/src/libcamera/property_ids.cpp.in\n+++ b/src/libcamera/property_ids.cpp.in\n@@ -23,12 +23,27 @@ namespace properties {\n \n ${controls_doc}\n \n+/**\n+ * \\brief Namespace for libcamera draft properties\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 #endif\n \n /**\ndiff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex 87c3d52ada6d..93cb3885c3da 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,30 @@ 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 {\n+ 'ids': '\\n'.join(ids),\n+ 'controls': '\\n'.join(ctrls),\n+ 'draft_controls': '\\n'.join(draft_ctrls)\n+ }\n \n \n def fill_template(template, data):\n","prefixes":["libcamera-devel","v5","02/14"]}