[{"id":13125,"web_url":"https://patchwork.libcamera.org/comment/13125/","msgid":"<62d60276-941e-fd1f-ef0d-5a21a39d7c6c@ideasonboard.com>","date":"2020-10-09T12:20:44","subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Jacopo,\n\nOn 09/10/2020 13:20, Jacopo Mondi wrote:\n> From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> Extend the control and property framework to support exposing draft\n> controls and properties in a scoped namespace.\n> \n> The controls/properties themselves will retain the same ordering in the\n> relevant enum/id maps - but the access to any draft control will require\n> explicitly referencing through its' draft:: namespace prefix.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> # Added missing hunk in control_ids.cpp.in and changed subject\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n\nAdditions are fine to me, some trivial white space - but that can be\nchanged if desired before pushing.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  include/libcamera/control_ids.h.in  |  6 +++++\n>  include/libcamera/property_ids.h.in |  6 +++++\n>  src/libcamera/control_ids.cpp.in    | 13 +++++++++++\n>  src/libcamera/property_ids.cpp.in   | 13 +++++++++++\n>  utils/gen-controls.py               | 36 ++++++++++++++++++++++-------\n>  5 files changed, 66 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\n> index 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 */\n> diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\n> index 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 */\n> diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\n> index cba6258d68dd..d31c1f5011b9 100644\n> --- a/src/libcamera/control_ids.cpp.in\n> +++ b/src/libcamera/control_ids.cpp.in\n> @@ -23,14 +23,27 @@ namespace controls {\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 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\nproperty_ids.cpp.in has a newline here ... either add here, or remove\nthere - just to make them the same I think ;)\n\n>  #endif\n> \n> +\n\nSpurious new line crept in? or intentional?\n\n\n>  /**\n>   * \\brief List of all supported libcamera controls\n>   *\n> diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\n> index 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>  /**\n> diff --git a/utils/gen-controls.py b/utils/gen-controls.py\n> index 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> --\n> 2.28.0\n>","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 69D0EBEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  9 Oct 2020 12:20:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DE74E60725;\n\tFri,  9 Oct 2020 14:20:48 +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 1FB7360358\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  9 Oct 2020 14:20:48 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 817C3539;\n\tFri,  9 Oct 2020 14:20:47 +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=\"BgyLcBRg\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602246047;\n\tbh=H9RxDlkKJFe6Y1Lgr+3SYPlCeoHuwXJOh5C9jjVUPjw=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=BgyLcBRg7oHcVZIdtLPD6IJFzHyzCbBrSr4YomrxB7DtvNz0RpRA8YdIw0ZL/MR0x\n\t3YVBPk3EkN0pj6osMy9jyc65eU6B8X7mv24I6nqvTIW4uGbpPr9N9wkMVeJ0SWyFPP\n\tABAM72R4THSTj6nNeDgsmxtgmG90eXw94hI03ECw=","To":"Jacopo Mondi <jacopo@jmondi.org>, libcamera-devel@lists.libcamera.org","References":"<20201009122101.73858-1-jacopo@jmondi.org>\n\t<20201009122101.73858-2-jacopo@jmondi.org>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<62d60276-941e-fd1f-ef0d-5a21a39d7c6c@ideasonboard.com>","Date":"Fri, 9 Oct 2020 13:20:44 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201009122101.73858-2-jacopo@jmondi.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","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>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":13129,"web_url":"https://patchwork.libcamera.org/comment/13129/","msgid":"<20201009124033.hi6bokx47qtl3tpx@uno.localdomain>","date":"2020-10-09T12:40:33","subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran\n\nOn Fri, Oct 09, 2020 at 01:20:44PM +0100, Kieran Bingham wrote:\n> Hi Jacopo,\n>\n> On 09/10/2020 13:20, Jacopo Mondi wrote:\n> > From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> >\n> > Extend the control and property framework to support exposing draft\n> > controls and properties in a scoped namespace.\n> >\n> > The controls/properties themselves will retain the same ordering in the\n> > relevant enum/id maps - but the access to any draft control will require\n> > explicitly referencing through its' draft:: namespace prefix.\n> >\n> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > # Added missing hunk in control_ids.cpp.in and changed subject\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n>\n> Additions are fine to me, some trivial white space - but that can be\n> changed if desired before pushing.\n\nUps, I thought I fixed them, as I did notice the same as well.\nSorry for being sloppy, I'll fix when applying.\n\n>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n>\n\nThanks\n  j\n\n> > ---\n> >  include/libcamera/control_ids.h.in  |  6 +++++\n> >  include/libcamera/property_ids.h.in |  6 +++++\n> >  src/libcamera/control_ids.cpp.in    | 13 +++++++++++\n> >  src/libcamera/property_ids.cpp.in   | 13 +++++++++++\n> >  utils/gen-controls.py               | 36 ++++++++++++++++++++++-------\n> >  5 files changed, 66 insertions(+), 8 deletions(-)\n> >\n> > diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\n> > index 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 */\n> > diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\n> > index 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 */\n> > diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\n> > index cba6258d68dd..d31c1f5011b9 100644\n> > --- a/src/libcamera/control_ids.cpp.in\n> > +++ b/src/libcamera/control_ids.cpp.in\n> > @@ -23,14 +23,27 @@ namespace controls {\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 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>\n> property_ids.cpp.in has a newline here ... either add here, or remove\n> there - just to make them the same I think ;)\n>\n> >  #endif\n> >\n> > +\n>\n> Spurious new line crept in? or intentional?\n>\n>\n> >  /**\n> >   * \\brief List of all supported libcamera controls\n> >   *\n> > diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\n> > index 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> >  /**\n> > diff --git a/utils/gen-controls.py b/utils/gen-controls.py\n> > index 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> > --\n> > 2.28.0\n> >\n>\n> --\n> Regards\n> --\n> Kieran","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 37838BEEE0\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  9 Oct 2020 12:36:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CC5C060359;\n\tFri,  9 Oct 2020 14:36:35 +0200 (CEST)","from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B07260358\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  9 Oct 2020 14:36:34 +0200 (CEST)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id E96C260010;\n\tFri,  9 Oct 2020 12:36:33 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Fri, 9 Oct 2020 14:40:33 +0200","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Message-ID":"<20201009124033.hi6bokx47qtl3tpx@uno.localdomain>","References":"<20201009122101.73858-1-jacopo@jmondi.org>\n\t<20201009122101.73858-2-jacopo@jmondi.org>\n\t<62d60276-941e-fd1f-ef0d-5a21a39d7c6c@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<62d60276-941e-fd1f-ef0d-5a21a39d7c6c@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":13167,"web_url":"https://patchwork.libcamera.org/comment/13167/","msgid":"<20201012000103.GK3944@pendragon.ideasonboard.com>","date":"2020-10-12T00:01:03","subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Jacopo and Kieran,\n\nThank you for the patch.\n\nOn Fri, Oct 09, 2020 at 02:20:52PM +0200, Jacopo Mondi wrote:\n> From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> Extend the control and property framework to support exposing draft\n> controls and properties in a scoped namespace.\n> \n> The controls/properties themselves will retain the same ordering in the\n> relevant enum/id maps - but the access to any draft control will require\n> explicitly referencing through its' draft:: namespace prefix.\n> \n> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> # Added missing hunk in control_ids.cpp.in and changed subject\n\nIsn't the usual syntax\n\n[Added missing hunk in control_ids.cpp.in and changed subject]\n\n? Or is that kernel-only ?\n\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> ---\n>  include/libcamera/control_ids.h.in  |  6 +++++\n>  include/libcamera/property_ids.h.in |  6 +++++\n>  src/libcamera/control_ids.cpp.in    | 13 +++++++++++\n>  src/libcamera/property_ids.cpp.in   | 13 +++++++++++\n>  utils/gen-controls.py               | 36 ++++++++++++++++++++++-------\n>  5 files changed, 66 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\n> index 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 */\n> diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\n> index 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 */\n> diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\n> index cba6258d68dd..d31c1f5011b9 100644\n> --- a/src/libcamera/control_ids.cpp.in\n> +++ b/src/libcamera/control_ids.cpp.in\n> @@ -23,14 +23,27 @@ namespace controls {\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 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> +\n\nExtra blank line.\n\n>  /**\n>   * \\brief List of all supported libcamera controls\n>   *\n> diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\n> index 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\nThis one isn't needed either.\n\n>  #endif\n> \n>  /**\n> diff --git a/utils/gen-controls.py b/utils/gen-controls.py\n> index 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\nYou could format this as\n\n    return {\n    \t'ids': '\\n'.join(ids),\n\t'controls': '\\n'.join(ctrls),\n        'draft_controls': '\\n'.join(draft_ctrls),\n    }\n\nto make it a bit more readable.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> \n> \n>  def fill_template(template, data):","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 9FE4EBEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 12 Oct 2020 00:01:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 30D8D60730;\n\tMon, 12 Oct 2020 02:01:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4BDBB60357\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Oct 2020 02:01:49 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id AFF01308;\n\tMon, 12 Oct 2020 02:01:48 +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=\"uDK2R0BL\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602460908;\n\tbh=pO+Ej2QnKpQanPb6NFg6dlJgh8yoRnWQQpCsWxmEII4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=uDK2R0BLmKFUIanPKszHF+nqAaDmwOAV4R/LBjndi3ZFQU4RKfjYLfPGNJZZJko7D\n\thbWQDbt3yNR/IfHuQo+66vHt+zcMzWg1YyoQjD5EU4VQ3DNTTd1iJQpx85fOxLv4Mr\n\tDgmyOKfaKisiFjtwnd61HwvS+7uJ/LYsreEiFeio=","Date":"Mon, 12 Oct 2020 03:01:03 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20201012000103.GK3944@pendragon.ideasonboard.com>","References":"<20201009122101.73858-1-jacopo@jmondi.org>\n\t<20201009122101.73858-2-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201009122101.73858-2-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":13171,"web_url":"https://patchwork.libcamera.org/comment/13171/","msgid":"<20201012010344.GA25974@pendragon.ideasonboard.com>","date":"2020-10-12T01:03:44","subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hello,\n\nOne more thing.\n\nOn Mon, Oct 12, 2020 at 03:01:03AM +0300, Laurent Pinchart wrote:\n> Hi Jacopo and Kieran,\n> \n> Thank you for the patch.\n> \n> On Fri, Oct 09, 2020 at 02:20:52PM +0200, Jacopo Mondi wrote:\n> > From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > \n> > Extend the control and property framework to support exposing draft\n> > controls and properties in a scoped namespace.\n> > \n> > The controls/properties themselves will retain the same ordering in the\n> > relevant enum/id maps - but the access to any draft control will require\n> > explicitly referencing through its' draft:: namespace prefix.\n> > \n> > Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> > # Added missing hunk in control_ids.cpp.in and changed subject\n> \n> Isn't the usual syntax\n> \n> [Added missing hunk in control_ids.cpp.in and changed subject]\n> \n> ? Or is that kernel-only ?\n> \n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > ---\n> >  include/libcamera/control_ids.h.in  |  6 +++++\n> >  include/libcamera/property_ids.h.in |  6 +++++\n> >  src/libcamera/control_ids.cpp.in    | 13 +++++++++++\n> >  src/libcamera/property_ids.cpp.in   | 13 +++++++++++\n> >  utils/gen-controls.py               | 36 ++++++++++++++++++++++-------\n> >  5 files changed, 66 insertions(+), 8 deletions(-)\n> > \n> > diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in\n> > index 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 */\n> > diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in\n> > index 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 */\n> > diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in\n> > index cba6258d68dd..d31c1f5011b9 100644\n> > --- a/src/libcamera/control_ids.cpp.in\n> > +++ b/src/libcamera/control_ids.cpp.in\n> > @@ -23,14 +23,27 @@ namespace controls {\n> > \n> >  ${controls_doc}\n> > \n\nThis requires\n\n/**\n * \\brief Namespace for libcamera draft controls\n */\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> > +\n> \n> Extra blank line.\n> \n> >  /**\n> >   * \\brief List of all supported libcamera controls\n> >   *\n> > diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in\n> > index 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\nAnd here\n\n/**\n * \\brief Namespace for libcamera draft properties\n */\n\nOtherwise documentation isn't properly generated. Could you double-check\nthe documentation output ?\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> \n> This one isn't needed either.\n> \n> >  #endif\n> > \n> >  /**\n> > diff --git a/utils/gen-controls.py b/utils/gen-controls.py\n> > index 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> You could format this as\n> \n>     return {\n>     \t'ids': '\\n'.join(ids),\n> \t'controls': '\\n'.join(ctrls),\n>         'draft_controls': '\\n'.join(draft_ctrls),\n>     }\n> \n> to make it a bit more readable.\n> \n> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> > \n> > \n> >  def fill_template(template, data):","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 42FEFBEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 12 Oct 2020 01:04:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7A78460D53;\n\tMon, 12 Oct 2020 03:04:30 +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 969D860CE4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Oct 2020 03:04:29 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2191E308;\n\tMon, 12 Oct 2020 03:04:29 +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=\"avASgBww\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602464669;\n\tbh=lc/HyJ66+QHMLiYYybYOj9J/qfXuAlxldgTypgtUk/M=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=avASgBwwcfZTWc+zu8dSCxhwnlrwxxfd0m/WgRFoB8yxzobnlp2CHneUqJ76eXKtk\n\tkFE2Q5nKVVjJlGU+B1nD+EFK5zXZt4LxyiNyixbUoWr3M3opaimVIu7zLn25StzLHa\n\tHC/ucv8apYDRUg7norXrX4eE1rxYOYWK2lGul+DU=","Date":"Mon, 12 Oct 2020 04:03:44 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Jacopo Mondi <jacopo@jmondi.org>","Message-ID":"<20201012010344.GA25974@pendragon.ideasonboard.com>","References":"<20201009122101.73858-1-jacopo@jmondi.org>\n\t<20201009122101.73858-2-jacopo@jmondi.org>\n\t<20201012000103.GK3944@pendragon.ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201012000103.GK3944@pendragon.ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 01/10] libcamera: Support draft\n\tcontrols and properties","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]