Patch Detail
Show a patch.
GET /api/patches/24275/?format=api
{ "id": 24275, "url": "https://patchwork.libcamera.org/api/patches/24275/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24275/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20250901092320.44615-1-barnabas.pocze@ideasonboard.com>", "date": "2025-09-01T09:23:19", "name": "[v1,1/2] utils: codegen: gen-formats.py: Use jinja", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fdb22ce0ad2f4411e01b2635d4bec3e1c65fa593", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24275/mbox/", "series": [ { "id": 5418, "url": "https://patchwork.libcamera.org/api/series/5418/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5418", "date": "2025-09-01T09:23:19", "name": "[v1,1/2] utils: codegen: gen-formats.py: Use jinja", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5418/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24275/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24275/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 E0A23BEFBE\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 1 Sep 2025 09:23:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D636E6931D;\n\tMon, 1 Sep 2025 11:23:25 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C07EC613AC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 1 Sep 2025 11:23:23 +0200 (CEST)", "from pb-laptop.local (185.221.143.232.nat.pool.zt.hu\n\t[185.221.143.232])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 75A9DEFE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 1 Sep 2025 11:22:16 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"KHi/yhpD\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1756718536;\n\tbh=0rxqnRB5u+DCnovjRE0yZuRESlQ+IIZfqZyRqOKW8+8=;\n\th=From:To:Subject:Date:From;\n\tb=KHi/yhpD387Y79QB+OfLEczHuJQTRedqoCwyN5WzwHhL0Blbi5to7WA2H2fb/cdeq\n\t6Eg0DdRDex/y30Jg2wBzmjuIlK9va/xQa09xJnhwUiEEBgt8SLGn0y00OcEEAZmDq2\n\tmln3Qo2ShW4wI67hwIMOGVaT1ihJrRdvteSOxGcc=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v1 1/2] utils: codegen: gen-formats.py: Use jinja", "Date": "Mon, 1 Sep 2025 11:23:19 +0200", "Message-ID": "<20250901092320.44615-1-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.51.0", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Currently the gen-formats.py script can only be used to generate C++\ncode because it hard-codes part of the template. Use jinja to fully\nremove any such dependency.\n\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n include/libcamera/formats.h.in | 4 +++-\n utils/codegen/gen-formats.py | 34 ++++++++++++----------------------\n 2 files changed, 15 insertions(+), 23 deletions(-)", "diff": "diff --git a/include/libcamera/formats.h.in b/include/libcamera/formats.h.in\nindex 6ae7634fe..5ff9c3bf4 100644\n--- a/include/libcamera/formats.h.in\n+++ b/include/libcamera/formats.h.in\n@@ -35,7 +35,9 @@ constexpr uint64_t __mod(unsigned int vendor, unsigned int mod)\n \n } /* namespace */\n \n-${formats}\n+{% for f in formats %}\n+constexpr PixelFormat {{f.name}}(__fourcc({{f.fourcc}}), __mod({{f.mod}}));\n+{%- endfor %}\n \n } /* namespace formats */\n \ndiff --git a/utils/codegen/gen-formats.py b/utils/codegen/gen-formats.py\nindex 0c0932a5b..872f3fe34 100755\n--- a/utils/codegen/gen-formats.py\n+++ b/utils/codegen/gen-formats.py\n@@ -7,6 +7,7 @@\n # Generate formats definitions from YAML\n \n import argparse\n+import jinja2\n import re\n import string\n import sys\n@@ -52,9 +53,7 @@ class DRMFourCC(object):\n return self.vendors[vendor], value\n \n \n-def generate_h(formats, drm_fourcc):\n- template = string.Template('constexpr PixelFormat ${name}{ __fourcc(${fourcc}), __mod(${mod}) };')\n-\n+def generate_formats(formats, drm_fourcc):\n fmts = []\n \n for format in formats:\n@@ -73,24 +72,17 @@ def generate_h(formats, drm_fourcc):\n if mod:\n data['mod'] = '%u, %u' % drm_fourcc.mod(mod)\n \n- fmts.append(template.substitute(data))\n-\n- return {'formats': '\\n'.join(fmts)}\n-\n-\n-def fill_template(template, data):\n+ fmts.append(data)\n \n- template = open(template, 'rb').read()\n- template = template.decode('utf-8')\n- template = string.Template(template)\n- return template.substitute(data)\n+ return fmts\n \n \n def main(argv):\n \n # Parse command line arguments\n parser = argparse.ArgumentParser()\n- parser.add_argument('-o', dest='output', metavar='file', type=str,\n+ parser.add_argument('-o', dest='output', metavar='file',\n+ type=argparse.FileType('w', encoding='utf-8'), default=sys.stdout,\n help='Output file name. Defaults to standard output if not specified.')\n parser.add_argument('input', type=str,\n help='Input file name.')\n@@ -104,15 +96,13 @@ def main(argv):\n formats = yaml.safe_load(data)['formats']\n drm_fourcc = DRMFourCC(args.drm_fourcc)\n \n- data = generate_h(formats, drm_fourcc)\n- data = fill_template(args.template, data)\n+ env = jinja2.Environment()\n+ template = env.from_string(open(args.template, 'r', encoding='utf-8').read())\n+ string = template.render({\n+ 'formats': generate_formats(formats, drm_fourcc),\n+ })\n \n- if args.output:\n- output = open(args.output, 'wb')\n- output.write(data.encode('utf-8'))\n- output.close()\n- else:\n- sys.stdout.write(data)\n+ args.output.write(string)\n \n return 0\n \n", "prefixes": [ "v1", "1/2" ] }