{"id":15740,"url":"https://patchwork.libcamera.org/api/1.1/patches/15740/?format=json","web_url":"https://patchwork.libcamera.org/patch/15740/","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":"<20220427223004.115381-4-Rauch.Christian@gmx.de>","date":"2022-04-27T22:30:03","name":"[libcamera-devel,v4,3/4] generate fixed- and variable-sized Span Controls","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e9cbc895d2a50e978afebbdb8545736153ffb9af","submitter":{"id":111,"url":"https://patchwork.libcamera.org/api/1.1/people/111/?format=json","name":"Christian Rauch","email":"Rauch.Christian@gmx.de"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15740/mbox/","series":[{"id":3080,"url":"https://patchwork.libcamera.org/api/1.1/series/3080/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3080","date":"2022-04-27T22:30:00","name":"generate and use fixed-sized Span Control types","version":4,"mbox":"https://patchwork.libcamera.org/series/3080/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15740/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15740/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 02396C326C\n\tfor ;\n\tWed, 27 Apr 2022 22:30:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3C03E65646;\n\tThu, 28 Apr 2022 00:30:14 +0200 (CEST)","from mout.gmx.net (mout.gmx.net [212.227.17.21])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B71B865640\n\tfor ;\n\tThu, 28 Apr 2022 00:30:08 +0200 (CEST)","from localhost.localdomain ([92.10.251.63]) by mail.gmx.net\n\t(mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id\n\t1M26vB-1nhNCA3jYn-002aDT; Thu, 28 Apr 2022 00:30:08 +0200"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1651098614;\n\tbh=ATeKyqRnHw9iVa0bTgA+UNdA5iARog/YOYpAYY2+Gv0=;\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=BhhAxkLeCrnrYs9uGNkiFPpK7iwFNFIEUP6kuGyh0q3fGLW8+3fA2MmeySUxvHwWJ\n\tMwdghkf0Z0K8gapZeLREr0X2wgNhRHMFu74LcIgfPCeMV9FFXq2ZERR1/P3CXXfxKq\n\tkxkwhP3eubGkcuEowGAvGEKju733+R9UI2ZnUkE7CHUC2q4Sm1w9TO8qjLCbzrsPay\n\tohM2Mg6PQM/5POqaSgzZYBsTmGrMCi5z0F2iEwUjM31kXa5sm6/Z+JMPRf4Cm4lrR7\n\txvk277JeBMobVYaAu48BS/W8pOSLi4A1/ng/i1J070MhMoE3KZ8vxxz0+lYPqm3Xxl\n\t1mBkzASPya9jw==","v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;\n\ts=badeba3b8450; t=1651098608;\n\tbh=ATeKyqRnHw9iVa0bTgA+UNdA5iARog/YOYpAYY2+Gv0=;\n\th=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References;\n\tb=cKLHBH3hrmD70hTOBSfWv6x3nToknYK/IvBXlwP0A1ahfcCrHeJjHZdLy6gGyxRx1\n\t6VrWW3FcHoqPc0ZVpwp3d9/PaAS5ydHtsAM6moiaBccmP9NdlCL6Y7QOTtqzKGy5lL\n\tECqMCzmPZX+WjElJMfpZ7ogf7Bxd2kwDvY9X8aJ8="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=gmx.net header.i=@gmx.net\n\theader.b=\"cKLHBH3h\"; dkim-atps=neutral","X-UI-Sender-Class":"01bb95c1-4bf8-414a-932a-4f6e2808ef9c","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 27 Apr 2022 23:30:03 +0100","Message-Id":"<20220427223004.115381-4-Rauch.Christian@gmx.de>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220427223004.115381-1-Rauch.Christian@gmx.de>","References":"<20220427223004.115381-1-Rauch.Christian@gmx.de>","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","X-Provags-ID":"V03:K1:3vcZya9a+160FgsbefgoiRlIM6tgXwRG6JmcapPdvInDwqXaDcz\n\tdROUVU/HPyLofMjfuGQUJS6vGzqI49w0Pygh8LuD6LXGmyagki070NAqny8SVSlZH3c+T0w\n\tYzUZmC1EPwPH/RPz6Ii6Id/di+hVWOZMDFEkk3jMNQqFCySqr3QEpJ941LDar6JG7KI6O8E\n\t66bD4XVOMuzFcyulT4r0Q==","X-Spam-Flag":"NO","X-UI-Out-Filterresults":"notjunk:1; V03:K0:zauLqDbqV4s=:cr4S0LIwk5yASanFgJNatK\n\tIC81Es+amu8TGiNTysMuofKXHAnGYG7NofIyTb34Y1v+pq0DfbQbrFE1bGGVhNDCZ7oqWdVXA\n\tS1eEus62cu+w1WGWe5phOoO6tNcTf4w4u75LESRr7miLaUyrrl0LQkTZlUe7US+U/xNFA5XhV\n\tccpZu59lZefDXnNTqoHbEoNSgHvwPQ9I2hxuzrMxp28QcXzsocVwFKSrDiZ3wc2TeshXlgAtp\n\tF8JcrJbVRy6RuF2tNW6N01IkZs2akLuPDdFmIGi7ES0izFpSn5VciHcCSiwvwwiPMy9oP2aT7\n\tMwHYr4hXhuyx4X6L7b2Kv8Edp/8ce4zgk/OUo7WKScgWWhmWVz+VToAZxqQR6WJbUe10327mU\n\tQhW5aoDakulyOIJefNGGAs8v3KPBasiw1+ZhfbseDVUjjzl924xMQ+HXUQIfRvRsxP/PZ6aTH\n\t0kau6jXmb5FtskUT9jYZQDViU3ouKUkKA91zGebJORkVgSsk+zE3r9aCiKlbEeF1pEO8MWgiX\n\trK6FmE2Q6tAZ2L6r3B4XVUdHVccaPt4CpIN8hvMPxW2lsAl6zhkcAnpDllpuL2jKzamOWW3Ro\n\t42wJ9hGFC6XNGDYZcAVSBEYdsZKBoDS4YirWUMhYwVx0XNDmf2uzzLDxG7+bozNWW9K3QEJIR\n\tkzFbXqnfIQ90Cwe+rDjmWFMh9WNLGDL2KC/bbSeMhMbpDwCC4UUOqn9D++d6GM6PBZCKDSQ7w\n\tQANN6nhTGXK8P88urFzWZ8TpIGWv3dtOixmzN0sSNjon26xOMj18mG/uCI+CZQLHrc5lhUR3A\n\tdrd0SaW0jil49loUoX63kkrIyoqO99KUtjU99WBgO4bTqmj2ueg5q6SNb2u/fLpJ4YrOrTKP2\n\tJCOehw0FnZPauCln//gCUxOPCzbsaCJDArWTHsKHVXtQnHU6gguGExC+/iVLn1XNdezgsrxsb\n\tdvcs0GnmvmSjxYHJWgodkl1nHVESnCI59BoWkCtu+pr5mBsN8woqmbEoMxmLTZ4PWpgn0n19y\n\tMUBbiZ6c3/qhcKVWepV3gGFUIf6Pii5rAFOHL32z8kM8X4mtTCu8pX0prcznkju2rcMiVibgG\n\tcJS1HI4+fpI/BA=","Subject":"[libcamera-devel] [PATCH v4 3/4] generate fixed- and variable-sized\n\tSpan Controls","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","From":"Christian Rauch via libcamera-devel\n\t","Reply-To":"Christian Rauch ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This defines Controls with a 'size' as either variable-sized Span or as\nfixed-sized Span.\n\nSigned-off-by: Christian Rauch \n---\n utils/gen-controls.py | 32 ++++++++++++++++++++++----------\n 1 file changed, 22 insertions(+), 10 deletions(-)\n\n--\n2.34.1","diff":"diff --git a/utils/gen-controls.py b/utils/gen-controls.py\nindex 3f99b5e2..c9e79a22 100755\n--- a/utils/gen-controls.py\n+++ b/utils/gen-controls.py\n@@ -7,6 +7,7 @@\n # gen-controls.py - Generate control definitions from YAML\n\n import argparse\n+import math\n import string\n import sys\n import yaml\n@@ -22,6 +23,25 @@ def format_description(description):\n return '\\n'.join([(line and ' * ' or ' *') + line for line in description])\n\n\n+def get_ctrl_type(ctrl):\n+ ctrl_type = ctrl['type']\n+ ctrl_size_arr = ctrl.get('size')\n+ ctrl_is_span = ctrl_size_arr is not None\n+\n+ if ctrl_type == 'string':\n+ return 'std::string'\n+ elif ctrl_is_span:\n+ ctrl_span_size = math.prod(ctrl_size_arr) if len(ctrl_size_arr) > 0 else None\n+ if ctrl_span_size:\n+ # fixed-sized Span\n+ return f\"Span\"\n+ else:\n+ # variable-sized Span\n+ return f\"Span\"\n+ else:\n+ return ctrl_type\n+\n+\n def generate_cpp(controls):\n enum_doc_start_template = string.Template('''/**\n * \\\\enum ${name}Enum\n@@ -50,11 +70,7 @@ ${description}\n name, ctrl = ctrl.popitem()\n id_name = snake_case(name).upper()\n\n- ctrl_type = ctrl['type']\n- if ctrl_type == 'string':\n- ctrl_type = 'std::string'\n- elif ctrl.get('size'):\n- ctrl_type = 'Span' % ctrl_type\n+ ctrl_type = get_ctrl_type(ctrl)\n\n info = {\n 'name': name,\n@@ -135,11 +151,7 @@ def generate_h(controls):\n\n ids.append('\\t' + id_name + ' = ' + str(id_value) + ',')\n\n- ctrl_type = ctrl['type']\n- if ctrl_type == 'string':\n- ctrl_type = 'std::string'\n- elif ctrl.get('size'):\n- ctrl_type = 'Span' % ctrl_type\n+ ctrl_type = get_ctrl_type(ctrl)\n\n info = {\n 'name': name,\n","prefixes":["libcamera-devel","v4","3/4"]}