Patch Detail
Show a patch.
GET /api/1.1/patches/19194/?format=api
{ "id": 19194, "url": "https://patchwork.libcamera.org/api/1.1/patches/19194/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19194/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20231110110002.21381-2-naush@raspberrypi.com>", "date": "2023-11-10T10:59:58", "name": "[libcamera-devel,v1,1/5] controls: Add vendor control/property support to generation scripts", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c0a4344f534ae68a2c211747581471c04644425c", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/1.1/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19194/mbox/", "series": [ { "id": 4068, "url": "https://patchwork.libcamera.org/api/1.1/series/4068/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4068", "date": "2023-11-10T10:59:57", "name": "Vendor controls and properties", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4068/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19194/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19194/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 D3AB0C3285\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 10 Nov 2023 11:00:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 51F60629C8;\n\tFri, 10 Nov 2023 12:00:01 +0100 (CET)", "from mail-lj1-x235.google.com (mail-lj1-x235.google.com\n\t[IPv6:2a00:1450:4864:20::235])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D35D6629BD\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Nov 2023 11:59:58 +0100 (CET)", "by mail-lj1-x235.google.com with SMTP id\n\t38308e7fff4ca-2c503dbe50dso25258391fa.1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 10 Nov 2023 02:59:58 -0800 (PST)", "from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tr15-20020a05600c35cf00b0040531f5c51asm4883156wmq.5.2023.11.10.02.59.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 10 Nov 2023 02:59:56 -0800 (PST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1699614001;\n\tbh=dlfiNxQIcLROOxPnUDt9+UpfHMH7B8/7kT1KXwIba+0=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=1DkthgIxL2GzZQE8irmaYNjRRI+XeKeAl1OmY8YteAgcqhFhquyFvCl4muv6caaox\n\tKr7bmsnvN5f0gRpa4jqaS+7IIZU93S7eE3lEirbwkch4FJeI2BPfknyWrOAVbV2TWP\n\tiSaXoxROIbOLy5qgTjIrT+FlyNuAuKKeQ5UntEick0D1elYe2WX+pwNgAkM6zcc2cK\n\tkuvdpVosYBKaf0ksdYxtkh6UZab8ahEeikzk8R9mtfMGv8QosAOExRsmPvbowYn0ic\n\tbr6cf3GS7nPxgsAHCbdBZECSmfvUd0HCi3NUMFgDWU/7mMyyPSCZj5Y4NWZhcl9zQ2\n\tIaLzEJBHMbQIg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1699613997; x=1700218797;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=ng52OPkZn77AerY9h5LP2IbzTh0qdlf5lJORgUvbVBo=;\n\tb=c6HfCTb3zMSmhVh/izo7SpL1yz7TYprHN3nVsxlMR4XhOWI0DCR7xSdrDYOlBsYeil\n\t7H1g1bXeYhmS/oOyvpauHccJbS6dHmZAUGsGoUh6tcm1t/qxB3P13Xs47Y69QNHqgbob\n\tRSuhm/DSuNlxCGdKHQTmqlfXBCHNKiHe8p28Y6fofZZdQve0Y2ZVCVGmmHb+eN+D+hIc\n\tnJHpqcRdm+fQIVLQnVFYblAHZISsTYyR7FQAXtFUJUcAGj1dGndXYTgC6eVHZtmaAVLa\n\tDOQohwKcv0g2xSaJn7qnUjAHbgHMgtrCoNH/Lg3x4uQvvhTWlF4ZFeBqlY23epSV/NOI\n\tUWyg==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"c6HfCTb3\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1699613997; x=1700218797;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=ng52OPkZn77AerY9h5LP2IbzTh0qdlf5lJORgUvbVBo=;\n\tb=l2r9XXgA+gWWxdC5t8KXb0VJiGMytf4d3dRfx2b9ihmCJl26kgNosGvBhUIzAZpxSc\n\tG82Hanp99n/rGDCG36FjGKuMaFMM7VlHW2r9BR8O+r+ocfphKlCL5VYT5VrtiRV0U/0E\n\to3V6l3jLaWCIqVl7EpKeB7xS0wn1G7+VpZUFNCTrJijmwvtOFKa4aKCKWrM6juZF8Vx8\n\tMqcy8rvvJemjraUB3PS6U67erkRNSfq/a7CGYbjy6U9gQo3tb/15659LLke0mxNWpQZD\n\tyCMg8EDTfvDLzS4Yn6OQBXGGjcLmVyNai1pcP9YsTeKk19FPl+iLCv6nqmWfu+M3koin\n\tcjJw==", "X-Gm-Message-State": "AOJu0YwugqSGXryaHLjOw4H4VnzJYoIyQadpbghc4TE1pyVoizQujadO\n\tihOFJLmBXRZeJ8tsMqlFVde5wuvQw4mA/KmVjUOKeg==", "X-Google-Smtp-Source": "AGHT+IGEresNeNY3Wzi7hJF7Ngv6mvkNc10+EZ/c9mvMv/Rp9m6WvoSbHlJ5NjlnCzWfSv2TMPR6Hg==", "X-Received": "by 2002:a2e:9185:0:b0:2c6:e5f8:451e with SMTP id\n\tf5-20020a2e9185000000b002c6e5f8451emr5966751ljg.5.1699613997342; \n\tFri, 10 Nov 2023 02:59:57 -0800 (PST)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 10 Nov 2023 10:59:58 +0000", "Message-Id": "<20231110110002.21381-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20231110110002.21381-1-naush@raspberrypi.com>", "References": "<20231110110002.21381-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v1 1/5] controls: Add vendor\n\tcontrol/property support to generation scripts", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add support for vendor specific controls and properties to libcamera.\nThe controls/properties are defined by a \"vendor\" tag in the YAML\ncontrol description, for example:\n\n - RpiVendorControlExample:\n type: string\n vendor: rpi\n description: |\n Test for libcamera vendor specific controls.\n\nThis will now generate a control id in the libcamera::controls::vendor::rpi\nnamespace, ensuring no id conflict between different vendors, core or\ndraft libcamera controls. Similarly, a ControlIdMap control is generated\nin the libcamera::controls::rpi namespace.\n\nA #define LIBCAMERA_RPI_VENDOR_CONTROLS is also generated to allow\napplications to conditionally compile code if the specific vendor\ncontrols are present. For the python bindings, the control is available\nwith libcamera.controls.rpi.RpiVendorControlExample. The above controls\nexample applies similarly to properties.\n\nA new --mode flag is added to gen-controls.py to specify the mode of\noperation, either 'controls' or 'properties' to allow the code generator\nto correctly set the #define string.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n include/libcamera/control_ids.h.in | 2 +\n include/libcamera/meson.build | 13 +-\n include/libcamera/property_ids.h.in | 2 +\n src/libcamera/control_ids.cpp.in | 6 +\n src/libcamera/meson.build | 5 +-\n src/libcamera/property_ids.cpp.in | 6 +\n src/py/libcamera/gen-py-controls.py | 16 +-\n src/py/libcamera/py_controls_generated.cpp.in | 3 +\n .../libcamera/py_properties_generated.cpp.in | 3 +\n utils/gen-controls.py | 144 ++++++++++++++----\n 10 files changed, 162 insertions(+), 38 deletions(-)", "diff": "diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\nindex 0718a8886f6c..c97b09a82450 100644\n--- a/include/libcamera/control_ids.h.in\n+++ b/include/libcamera/control_ids.h.in\n@@ -32,6 +32,8 @@ ${draft_controls}\n \n } /* namespace draft */\n \n+${vendor_controls}\n+\n } /* namespace controls */\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex a24c50d66a82..f736cca07228 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -33,19 +33,20 @@ install_headers(libcamera_public_headers,\n libcamera_headers_install_dir = get_option('includedir') / libcamera_include_dir\n \n # control_ids.h and property_ids.h\n-control_source_files = [\n- 'control_ids',\n- 'property_ids',\n-]\n+control_source_files = {\n+ 'control_ids': 'controls',\n+ 'property_ids': 'properties',\n+}\n \n control_headers = []\n \n-foreach header : control_source_files\n+foreach header, mode : control_source_files\n input_files = files('../../src/libcamera/' + header +'.yaml', header + '.h.in')\n control_headers += custom_target(header + '_h',\n input : input_files,\n output : header + '.h',\n- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],\n+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@',\n+ '--mode', mode],\n install : true,\n install_dir : libcamera_headers_install_dir)\n endforeach\ndiff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\nindex ff0194083af0..47c5d6bf2e28 100644\n--- a/include/libcamera/property_ids.h.in\n+++ b/include/libcamera/property_ids.h.in\n@@ -31,6 +31,8 @@ ${draft_controls}\n \n extern const ControlIdMap properties;\n \n+${vendor_controls}\n+\n } /* namespace properties */\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\nindex 5fb1c2c30558..d26eb930b30c 100644\n--- a/src/libcamera/control_ids.cpp.in\n+++ b/src/libcamera/control_ids.cpp.in\n@@ -33,6 +33,8 @@ ${draft_controls_doc}\n \n } /* namespace draft */\n \n+${vendor_controls_doc}\n+\n #ifndef __DOXYGEN__\n /*\n * Keep the controls definitions hidden from doxygen as it incorrectly parses\n@@ -45,6 +47,8 @@ namespace draft {\n ${draft_controls_def}\n \n } /* namespace draft */\n+\n+${vendor_controls_def}\n #endif\n \n /**\n@@ -57,6 +61,8 @@ extern const ControlIdMap controls {\n ${controls_map}\n };\n \n+${vendor_controls_map}\n+\n } /* namespace controls */\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex d0e26f6b4141..e49bf850b355 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -127,12 +127,13 @@ endif\n \n control_sources = []\n \n-foreach source : control_source_files\n+foreach source, mode : control_source_files\n input_files = files(source +'.yaml', source + '.cpp.in')\n control_sources += custom_target(source + '_cpp',\n input : input_files,\n output : source + '.cpp',\n- command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n+ command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@',\n+ '--mode', mode])\n endforeach\n \n libcamera_sources += control_sources\ndiff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\nindex f917e3349766..ddbe714c3f00 100644\n--- a/src/libcamera/property_ids.cpp.in\n+++ b/src/libcamera/property_ids.cpp.in\n@@ -32,6 +32,8 @@ ${draft_controls_doc}\n \n } /* namespace draft */\n \n+${vendor_controls_doc}\n+\n #ifndef __DOXYGEN__\n /*\n * Keep the properties definitions hidden from doxygen as it incorrectly parses\n@@ -44,6 +46,8 @@ namespace draft {\n ${draft_controls_def}\n \n } /* namespace draft */\n+\n+${vendor_controls_def}\n #endif\n \n /**\n@@ -53,6 +57,8 @@ extern const ControlIdMap properties {\n ${controls_map}\n };\n \n+${vendor_controls_map}\n+\n } /* namespace properties */\n \n } /* namespace libcamera */\ndiff --git a/src/py/libcamera/gen-py-controls.py b/src/py/libcamera/gen-py-controls.py\nindex 9948c41e42b1..e89de674966a 100755\n--- a/src/py/libcamera/gen-py-controls.py\n+++ b/src/py/libcamera/gen-py-controls.py\n@@ -24,12 +24,24 @@ def find_common_prefix(strings):\n def generate_py(controls, mode):\n out = ''\n \n+ vendors_class_def = []\n+ vendor_defs = []\n+ vendors = []\n for ctrl in controls:\n name, ctrl = ctrl.popitem()\n \n+ vendor = ctrl.get('vendor')\n+ if vendor and vendor not in vendors:\n+ vendors_class_def.append('class Py{}Controls\\n{{\\n}};\\n'.format(vendor))\n+ vendor_defs.append('\\tauto {} = py::class_<Py{}Controls>(controls, \\\"{}\\\");'.format(vendor, vendor, vendor))\n+ vendors.append(vendor)\n+\n if ctrl.get('draft'):\n ns = 'libcamera::{}::draft::'.format(mode)\n container = 'draft'\n+ elif vendor:\n+ ns = 'libcamera::{}::{}::'.format(mode, vendor)\n+ container = vendor\n else:\n ns = 'libcamera::{}::'.format(mode)\n container = 'controls'\n@@ -62,7 +74,9 @@ def generate_py(controls, mode):\n \n out += '\\t;\\n\\n'\n \n- return {'controls': out}\n+ return {'controls': out,\n+ 'vendors_class_def': '\\n'.join(vendors_class_def),\n+ 'vendors_defs': '\\n'.join(vendor_defs)}\n \n \n def fill_template(template, data):\ndiff --git a/src/py/libcamera/py_controls_generated.cpp.in b/src/py/libcamera/py_controls_generated.cpp.in\nindex 18fa57d948ea..ec4b55ef2011 100644\n--- a/src/py/libcamera/py_controls_generated.cpp.in\n+++ b/src/py/libcamera/py_controls_generated.cpp.in\n@@ -21,10 +21,13 @@ class PyDraftControls\n {\n };\n \n+${vendors_class_def}\n+\n void init_py_controls_generated(py::module& m)\n {\n \tauto controls = py::class_<PyControls>(m, \"controls\");\n \tauto draft = py::class_<PyDraftControls>(controls, \"draft\");\n+${vendors_defs}\n \n ${controls}\n }\ndiff --git a/src/py/libcamera/py_properties_generated.cpp.in b/src/py/libcamera/py_properties_generated.cpp.in\nindex e49b6e91bb83..87bc5e5d937e 100644\n--- a/src/py/libcamera/py_properties_generated.cpp.in\n+++ b/src/py/libcamera/py_properties_generated.cpp.in\n@@ -21,10 +21,13 @@ class PyDraftProperties\n {\n };\n \n+${vendors_class_def}\n+\n void init_py_properties_generated(py::module& m)\n {\n \tauto controls = py::class_<PyProperties>(m, \"properties\");\n \tauto draft = py::class_<PyDraftProperties>(controls, \"draft\");\n+${vendors_defs}\t\n \n ${controls}\n }\ndiff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex 1075ae302ce1..dd55753e792c 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -89,6 +89,11 @@ class Control(object):\n \"\"\"Is the control a draft control\"\"\"\n return self.__data.get('draft') is not None\n \n+ @property\n+ def vendor(self):\n+ \"\"\"The vendor string, or None\"\"\"\n+ return self.__data.get('vendor') if 'vendor' in self.__data else None\n+\n @property\n def name(self):\n \"\"\"The control name (CamelCase)\"\"\"\n@@ -145,15 +150,22 @@ ${description}\n enum_values_start = string.Template('''extern const std::array<const ControlValue, ${size}> ${name}Values = {''')\n enum_values_values = string.Template('''\\tstatic_cast<int32_t>(${name}),''')\n \n- ctrls_doc = []\n- ctrls_def = []\n- draft_ctrls_doc = []\n- draft_ctrls_def = []\n- ctrls_map = []\n+ ctrls_doc = {}\n+ ctrls_def = {}\n+ ctrls_map = {}\n \n for ctrl in controls:\n id_name = snake_case(ctrl.name).upper()\n \n+ vendor = ctrl.vendor\n+ if vendor is None:\n+ vendor = 'draft' if ctrl.is_draft else 'libcamera'\n+\n+ if vendor not in ctrls_doc:\n+ ctrls_doc[vendor] = []\n+ ctrls_def[vendor] = []\n+ ctrls_map[vendor] = []\n+\n info = {\n 'name': ctrl.name,\n 'type': ctrl.type,\n@@ -161,11 +173,9 @@ ${description}\n 'id_name': id_name,\n }\n \n- target_doc = ctrls_doc\n- target_def = ctrls_def\n- if ctrl.is_draft:\n- target_doc = draft_ctrls_doc\n- target_def = draft_ctrls_def\n+ target_doc = ctrls_doc[vendor]\n+ target_def = ctrls_def[vendor]\n+ target_ctrls_map = ctrls_map[vendor]\n \n if ctrl.is_enum:\n enum_doc = []\n@@ -201,41 +211,90 @@ ${description}\n target_doc.append(doc_template.substitute(info))\n target_def.append(def_template.substitute(info))\n \n- ctrls_map.append('\\t{ ' + id_name + ', &' + ctrl.q_name + ' },')\n+ target_ctrls_map.append('\\t{ ' + id_name + ', &' + ctrl.q_name + ' },')\n+\n+ vendor_ctrl_doc_sub = []\n+ vendor_ctrl_template = string.Template('''\n+namespace ${vendor} {\n+\n+${vendor_controls_str}\n+\n+} /* namespace ${vendor} */''')\n+\n+ for vendor in [v for v in ctrls_map.keys() if v not in ['libcamera', 'draft']]:\n+ vendor_ctrl_doc_sub.append(vendor_ctrl_template.substitute({'vendor': vendor, 'vendor_controls_str': '\\n\\n'.join(ctrls_doc[vendor])}))\n+\n+ vendor_ctrl_def_sub = []\n+ for vendor in [v for v in ctrls_map.keys() if v not in ['libcamera', 'draft']]:\n+ vendor_ctrl_def_sub.append(vendor_ctrl_template.substitute({'vendor': vendor, 'vendor_controls_str': '\\n'.join(ctrls_def[vendor])}))\n+\n+ vendor_ctrl_map_sub = []\n+ vendor_ctrl_template = string.Template('''namespace ${vendor} {\n+/**\n+ * \\\\brief List of all supported ${vendor} vendor controls\n+ *\n+ * Unless otherwise stated, all controls are bi-directional, i.e. they can be\n+ * set through Request::controls() and returned out through Request::metadata().\n+ */\n+extern const ControlIdMap controls {\n+${vendor_controls_map}\n+};\n+\n+} /* namespace ${vendor} */\n+''')\n+\n+ for vendor in [v for v in ctrls_map.keys() if v not in ['libcamera', 'draft']]:\n+ vendor_ctrl_map_sub.append(vendor_ctrl_template.substitute({'vendor': vendor,\n+ 'vendor_controls_map': '\\n'.join(ctrls_map[vendor])}))\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+ 'controls_doc': '\\n\\n'.join(ctrls_doc['libcamera']),\n+ 'controls_def': '\\n'.join(ctrls_def['libcamera']),\n+ 'draft_controls_doc': '\\n\\n'.join(ctrls_doc['draft']),\n+ 'draft_controls_def': '\\n\\n'.join(ctrls_def['draft']),\n+ 'controls_map': '\\n'.join(ctrls_map['libcamera'] + ctrls_map['draft']),\n+ 'vendor_controls_doc': '\\n'.join(vendor_ctrl_doc_sub),\n+ 'vendor_controls_def': '\\n'.join(vendor_ctrl_def_sub),\n+ 'vendor_controls_map': '\\n'.join(vendor_ctrl_map_sub),\n }\n \n \n-def generate_h(controls):\n+def generate_h(controls, mode):\n enum_template_start = string.Template('''enum ${name}Enum {''')\n enum_value_template = string.Template('''\\t${name} = ${value},''')\n enum_values_template = string.Template('''extern const std::array<const ControlValue, ${size}> ${name}Values;''')\n template = string.Template('''extern const Control<${type}> ${name};''')\n \n- ctrls = []\n- draft_ctrls = []\n- ids = []\n- id_value = 1\n+ ctrls = {}\n+ ids = {}\n+ id_value = {}\n \n for ctrl in controls:\n id_name = snake_case(ctrl.name).upper()\n \n- ids.append('\\t' + id_name + ' = ' + str(id_value) + ',')\n+ vendor = ctrl.vendor\n+ if vendor is None:\n+ vendor = 'draft' if ctrl.is_draft else 'libcamera'\n+\n+ if vendor not in ctrls:\n+ ids[vendor] = []\n+ id_value[vendor] = 1\n+ ctrls[vendor] = []\n+\n+ # Core and draft controls use the same ID value\n+ target_ids = ids['libcamera'] if vendor in ['libcamera', 'draft'] else ids[vendor]\n+ target_ids.append('\\t' + id_name + ' = ' + str(id_value[vendor]) + ',')\n \n info = {\n 'name': ctrl.name,\n 'type': ctrl.type,\n }\n \n- target_ctrls = ctrls\n+ target_ctrls = ctrls['libcamera']\n if ctrl.is_draft:\n- target_ctrls = draft_ctrls\n+ target_ctrls = ctrls['draft']\n+ elif vendor != 'libcamera':\n+ target_ctrls = ctrls[vendor]\n \n if ctrl.is_enum:\n target_ctrls.append(enum_template_start.substitute(info))\n@@ -257,12 +316,37 @@ def generate_h(controls):\n target_ctrls.append(enum_values_template.substitute(values_info))\n \n target_ctrls.append(template.substitute(info))\n- id_value += 1\n+ id_value[vendor] += 1\n+\n+ vendor_template = string.Template('''\n+namespace ${vendor} {\n+\n+#define LIBCAMERA_${vendor_def}_VENDOR_${mode}\n+\n+enum {\n+${vendor_enums}\n+};\n+\n+extern const ControlIdMap controls;\n+\n+${vendor_controls}\n+\n+} /* namespace ${vendor} */\n+''')\n+\n+ vendor_sub = []\n+ for vendor in [v for v in ctrls.keys() if v not in ['libcamera', 'draft']]:\n+ vendor_sub.append(vendor_template.substitute({'mode': mode.upper(),\n+ 'vendor': vendor,\n+ 'vendor_def': vendor.upper(),\n+ 'vendor_enums': '\\n'.join(ids[vendor]),\n+ 'vendor_controls': '\\n'.join(ctrls[vendor])}))\n \n return {\n- 'ids': '\\n'.join(ids),\n- 'controls': '\\n'.join(ctrls),\n- 'draft_controls': '\\n'.join(draft_ctrls)\n+ 'ids': '\\n'.join(ids['libcamera']),\n+ 'controls': '\\n'.join(ctrls['libcamera']),\n+ 'draft_controls': '\\n'.join(ctrls['draft']),\n+ 'vendor_controls': '\\n'.join(vendor_sub)\n }\n \n \n@@ -284,6 +368,8 @@ def main(argv):\n help='Input file name.')\n parser.add_argument('template', type=str,\n help='Template file name.')\n+ parser.add_argument('--mode', type=str, required=True, choices=['controls', 'properties'],\n+ help='Mode of operation')\n args = parser.parse_args(argv[1:])\n \n data = open(args.input, 'rb').read()\n@@ -293,7 +379,7 @@ def main(argv):\n if args.template.endswith('.cpp.in'):\n data = generate_cpp(controls)\n elif args.template.endswith('.h.in'):\n- data = generate_h(controls)\n+ data = generate_h(controls, args.mode)\n else:\n raise RuntimeError('Unknown template type')\n \n", "prefixes": [ "libcamera-devel", "v1", "1/5" ] }