[{"id":3946,"web_url":"https://patchwork.libcamera.org/comment/3946/","msgid":"<745a9861-baba-f53a-8ac0-0d8be079c7a0@ideasonboard.com>","date":"2020-03-05T17:29:36","subject":"Re: [libcamera-devel] [PATCH 27/31] libcamera: control_serializer:\n\tAdd support for array controls","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 29/02/2020 16:42, Laurent Pinchart wrote:\n> From: Jacopo Mondi <jacopo@jmondi.org>\n> \n> Add support for serializing and deserializing control values that store\n> arrays of values. The serialized format is extended to explicitly handle\n> arrays.\n\nDoes this need any update in any documentation of the serialization format?\n\n\n> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/libcamera/control_serializer.cpp       | 80 ++++++++++++----------\n>  src/libcamera/include/control_serializer.h |  6 +-\n>  2 files changed, 49 insertions(+), 37 deletions(-)\n> \n> diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\n> index 6cac70739468..31b03e6e6d7c 100644\n> --- a/src/libcamera/control_serializer.cpp\n> +++ b/src/libcamera/control_serializer.cpp\n> @@ -14,6 +14,7 @@\n>  #include <ipa/ipa_controls.h>\n>  #include <libcamera/control_ids.h>\n>  #include <libcamera/controls.h>\n> +#include <libcamera/span.h>\n>  \n>  #include \"byte_stream_buffer.h\"\n>  #include \"log.h\"\n> @@ -279,8 +280,9 @@ int ControlSerializer::serialize(const ControlList &list,\n>  \n>  \t\tstruct ipa_control_value_entry entry;\n>  \t\tentry.id = id;\n> -\t\tentry.count = 1;\n>  \t\tentry.type = value.type();\n> +\t\tentry.is_array = value.isArray();\n> +\t\tentry.count = value.numElements();\n>  \t\tentry.offset = values.offset();\n>  \t\tentries.write(&entry);\n>  \n> @@ -293,52 +295,56 @@ int ControlSerializer::serialize(const ControlList &list,\n>  \treturn 0;\n>  }\n>  \n> -template<>\n> -ControlValue ControlSerializer::load<ControlValue>(ControlType type,\n> -\t\t\t\t\t\t   ByteStreamBuffer &b)\n> +template<typename T>\n> +ControlValue ControlSerializer::loadControlValue(ByteStreamBuffer &buffer,\n> +\t\t\t\t\t\t bool isArray,\n> +\t\t\t\t\t\t unsigned int count)\n> +{\n> +\tControlValue value;\n> +\n> +\tconst T *data = buffer.read<T>(count);\n> +\tif (!data)\n> +\t\treturn value;\n> +\n> +\tif (isArray)\n> +\t\tvalue.set(Span<const T>{ data, count });\n> +\telse\n> +\t\tvalue.set(*data);\n> +\n> +\treturn value;\n> +}\n> +\n> +ControlValue ControlSerializer::loadControlValue(ControlType type,\n> +\t\t\t\t\t\t ByteStreamBuffer &buffer,\n> +\t\t\t\t\t\t bool isArray,\n> +\t\t\t\t\t\t unsigned int count)\n>  {\n>  \tswitch (type) {\n> -\tcase ControlTypeBool: {\n> -\t\tbool value;\n> -\t\tb.read(&value);\n> -\t\treturn ControlValue(value);\n> -\t}\n> +\tcase ControlTypeBool:\n> +\t\treturn loadControlValue<bool>(buffer, isArray, count);\n>  \n> -\tcase ControlTypeInteger8: {\n> -\t\tint8_t value;\n> -\t\tb.read(&value);\n> -\t\treturn ControlValue(value);\n> -\t}\n> +\tcase ControlTypeInteger8:\n> +\t\treturn loadControlValue<int8_t>(buffer, isArray, count);\n>  \n> -\tcase ControlTypeInteger32: {\n> -\t\tint32_t value;\n> -\t\tb.read(&value);\n> -\t\treturn ControlValue(value);\n> -\t}\n> +\tcase ControlTypeInteger32:\n> +\t\treturn loadControlValue<int32_t>(buffer, isArray, count);\n>  \n> -\tcase ControlTypeInteger64: {\n> -\t\tint64_t value;\n> -\t\tb.read(&value);\n> -\t\treturn ControlValue(value);\n> -\t}\n> +\tcase ControlTypeInteger64:\n> +\t\treturn loadControlValue<int64_t>(buffer, isArray, count);\n>  \n> -\tcase ControlTypeFloat: {\n> -\t\tfloat value;\n> -\t\tb.read(&value);\n> -\t\treturn ControlValue(value);\n> -\t}\n> +\tcase ControlTypeFloat:\n> +\t\treturn loadControlValue<float>(buffer, isArray, count);\n>  \n>  \tdefault:\n>  \t\treturn ControlValue();\n>  \t}\n>  }\n>  \n> -template<>\n> -ControlRange ControlSerializer::load<ControlRange>(ControlType type,\n> -\t\t\t\t\t\t   ByteStreamBuffer &b)\n> +ControlRange ControlSerializer::loadControlRange(ControlType type,\n> +\t\t\t\t\t\t ByteStreamBuffer &b)\n>  {\n> -\tControlValue min = load<ControlValue>(type, b);\n> -\tControlValue max = load<ControlValue>(type, b);\n> +\tControlValue min = loadControlValue(type, b);\n> +\tControlValue max = loadControlValue(type, b);\n>  \n>  \treturn ControlRange(min, max);\n>  }\n> @@ -412,7 +418,7 @@ ControlInfoMap ControlSerializer::deserialize<ControlInfoMap>(ByteStreamBuffer &\n>  \n>  \t\t/* Create and store the ControlRange. */\n>  \t\tctrls.emplace(controlIds_.back().get(),\n> -\t\t\t      load<ControlRange>(type, values));\n> +\t\t\t      loadControlRange(type, values));\n>  \t}\n>  \n>  \t/*\n> @@ -500,7 +506,9 @@ ControlList ControlSerializer::deserialize<ControlList>(ByteStreamBuffer &buffer\n>  \t\t}\n>  \n>  \t\tControlType type = static_cast<ControlType>(entry->type);\n> -\t\tctrls.set(entry->id, load<ControlValue>(type, values));\n> +\t\tctrls.set(entry->id,\n> +\t\t\t  loadControlValue(type, values, entry->is_array,\n> +\t\t\t\t\t   entry->count));\n>  \t}\n>  \n>  \treturn ctrls;\n> diff --git a/src/libcamera/include/control_serializer.h b/src/libcamera/include/control_serializer.h\n> index 55259913a2ca..b91d13155f5e 100644\n> --- a/src/libcamera/include/control_serializer.h\n> +++ b/src/libcamera/include/control_serializer.h\n> @@ -41,7 +41,11 @@ private:\n>  \tstatic void store(const ControlRange &range, ByteStreamBuffer &buffer);\n>  \n>  \ttemplate<typename T>\n> -\tT load(ControlType type, ByteStreamBuffer &b);\n> +\tControlValue loadControlValue(ByteStreamBuffer &buffer, bool isArray,\n> +\t\t\t\t      unsigned int count);\n> +\tControlValue loadControlValue(ControlType type, ByteStreamBuffer &buffer,\n> +\t\t\t\t      bool isArray = false, unsigned int count = 1);\n> +\tControlRange loadControlRange(ControlType type, ByteStreamBuffer &buffer);\n>  \n>  \tunsigned int serial_;\n>  \tstd::vector<std::unique_ptr<ControlId>> controlIds_;\n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["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 1D8F960427\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  5 Mar 2020 18:29:44 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7EBCA312;\n\tThu,  5 Mar 2020 18:29:43 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583429383;\n\tbh=ma709ZE9/XM7OL+9K1jpGRUihv6P5xMLgMmq7RlJnc0=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=h8o4+MPQviRFtittW+bBwo/k1y3Cjws+OnJLWIgO/eGSTjytqIUhZOAqp1Q3kmtKF\n\tcJHR6aHX8gDnS5DYKqxsledRa+uyP3aUhXmpcgm1DZHcT552BjK3nO6TCKxea7oWch\n\tHtbGhJ8LI94OrJS5t4sP3NMdOJFaO3cUpTXkizXs=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>\n\t<20200229164254.23604-28-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<745a9861-baba-f53a-8ac0-0d8be079c7a0@ideasonboard.com>","Date":"Thu, 5 Mar 2020 17:29:36 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200229164254.23604-28-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH 27/31] libcamera: control_serializer:\n\tAdd support for array controls","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>","X-List-Received-Date":"Thu, 05 Mar 2020 17:29:44 -0000"}},{"id":3956,"web_url":"https://patchwork.libcamera.org/comment/3956/","msgid":"<20200306150043.GM4878@pendragon.ideasonboard.com>","date":"2020-03-06T15:00:43","subject":"Re: [libcamera-devel] [PATCH 27/31] libcamera: control_serializer:\n\tAdd support for array controls","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, Mar 05, 2020 at 05:29:36PM +0000, Kieran Bingham wrote:\n> On 29/02/2020 16:42, Laurent Pinchart wrote:\n> > From: Jacopo Mondi <jacopo@jmondi.org>\n> > \n> > Add support for serializing and deserializing control values that store\n> > arrays of values. The serialized format is extended to explicitly handle\n> > arrays.\n> \n> Does this need any update in any documentation of the serialization format?\n\nFor once the documentation was a step ahead and already described\nsupport for controls with an array of values :-)\n\n> > Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>\n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> > ---\n> >  src/libcamera/control_serializer.cpp       | 80 ++++++++++++----------\n> >  src/libcamera/include/control_serializer.h |  6 +-\n> >  2 files changed, 49 insertions(+), 37 deletions(-)\n> > \n> > diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp\n> > index 6cac70739468..31b03e6e6d7c 100644\n> > --- a/src/libcamera/control_serializer.cpp\n> > +++ b/src/libcamera/control_serializer.cpp\n> > @@ -14,6 +14,7 @@\n> >  #include <ipa/ipa_controls.h>\n> >  #include <libcamera/control_ids.h>\n> >  #include <libcamera/controls.h>\n> > +#include <libcamera/span.h>\n> >  \n> >  #include \"byte_stream_buffer.h\"\n> >  #include \"log.h\"\n> > @@ -279,8 +280,9 @@ int ControlSerializer::serialize(const ControlList &list,\n> >  \n> >  \t\tstruct ipa_control_value_entry entry;\n> >  \t\tentry.id = id;\n> > -\t\tentry.count = 1;\n> >  \t\tentry.type = value.type();\n> > +\t\tentry.is_array = value.isArray();\n> > +\t\tentry.count = value.numElements();\n> >  \t\tentry.offset = values.offset();\n> >  \t\tentries.write(&entry);\n> >  \n> > @@ -293,52 +295,56 @@ int ControlSerializer::serialize(const ControlList &list,\n> >  \treturn 0;\n> >  }\n> >  \n> > -template<>\n> > -ControlValue ControlSerializer::load<ControlValue>(ControlType type,\n> > -\t\t\t\t\t\t   ByteStreamBuffer &b)\n> > +template<typename T>\n> > +ControlValue ControlSerializer::loadControlValue(ByteStreamBuffer &buffer,\n> > +\t\t\t\t\t\t bool isArray,\n> > +\t\t\t\t\t\t unsigned int count)\n> > +{\n> > +\tControlValue value;\n> > +\n> > +\tconst T *data = buffer.read<T>(count);\n> > +\tif (!data)\n> > +\t\treturn value;\n> > +\n> > +\tif (isArray)\n> > +\t\tvalue.set(Span<const T>{ data, count });\n> > +\telse\n> > +\t\tvalue.set(*data);\n> > +\n> > +\treturn value;\n> > +}\n> > +\n> > +ControlValue ControlSerializer::loadControlValue(ControlType type,\n> > +\t\t\t\t\t\t ByteStreamBuffer &buffer,\n> > +\t\t\t\t\t\t bool isArray,\n> > +\t\t\t\t\t\t unsigned int count)\n> >  {\n> >  \tswitch (type) {\n> > -\tcase ControlTypeBool: {\n> > -\t\tbool value;\n> > -\t\tb.read(&value);\n> > -\t\treturn ControlValue(value);\n> > -\t}\n> > +\tcase ControlTypeBool:\n> > +\t\treturn loadControlValue<bool>(buffer, isArray, count);\n> >  \n> > -\tcase ControlTypeInteger8: {\n> > -\t\tint8_t value;\n> > -\t\tb.read(&value);\n> > -\t\treturn ControlValue(value);\n> > -\t}\n> > +\tcase ControlTypeInteger8:\n> > +\t\treturn loadControlValue<int8_t>(buffer, isArray, count);\n> >  \n> > -\tcase ControlTypeInteger32: {\n> > -\t\tint32_t value;\n> > -\t\tb.read(&value);\n> > -\t\treturn ControlValue(value);\n> > -\t}\n> > +\tcase ControlTypeInteger32:\n> > +\t\treturn loadControlValue<int32_t>(buffer, isArray, count);\n> >  \n> > -\tcase ControlTypeInteger64: {\n> > -\t\tint64_t value;\n> > -\t\tb.read(&value);\n> > -\t\treturn ControlValue(value);\n> > -\t}\n> > +\tcase ControlTypeInteger64:\n> > +\t\treturn loadControlValue<int64_t>(buffer, isArray, count);\n> >  \n> > -\tcase ControlTypeFloat: {\n> > -\t\tfloat value;\n> > -\t\tb.read(&value);\n> > -\t\treturn ControlValue(value);\n> > -\t}\n> > +\tcase ControlTypeFloat:\n> > +\t\treturn loadControlValue<float>(buffer, isArray, count);\n> >  \n> >  \tdefault:\n> >  \t\treturn ControlValue();\n> >  \t}\n> >  }\n> >  \n> > -template<>\n> > -ControlRange ControlSerializer::load<ControlRange>(ControlType type,\n> > -\t\t\t\t\t\t   ByteStreamBuffer &b)\n> > +ControlRange ControlSerializer::loadControlRange(ControlType type,\n> > +\t\t\t\t\t\t ByteStreamBuffer &b)\n> >  {\n> > -\tControlValue min = load<ControlValue>(type, b);\n> > -\tControlValue max = load<ControlValue>(type, b);\n> > +\tControlValue min = loadControlValue(type, b);\n> > +\tControlValue max = loadControlValue(type, b);\n> >  \n> >  \treturn ControlRange(min, max);\n> >  }\n> > @@ -412,7 +418,7 @@ ControlInfoMap ControlSerializer::deserialize<ControlInfoMap>(ByteStreamBuffer &\n> >  \n> >  \t\t/* Create and store the ControlRange. */\n> >  \t\tctrls.emplace(controlIds_.back().get(),\n> > -\t\t\t      load<ControlRange>(type, values));\n> > +\t\t\t      loadControlRange(type, values));\n> >  \t}\n> >  \n> >  \t/*\n> > @@ -500,7 +506,9 @@ ControlList ControlSerializer::deserialize<ControlList>(ByteStreamBuffer &buffer\n> >  \t\t}\n> >  \n> >  \t\tControlType type = static_cast<ControlType>(entry->type);\n> > -\t\tctrls.set(entry->id, load<ControlValue>(type, values));\n> > +\t\tctrls.set(entry->id,\n> > +\t\t\t  loadControlValue(type, values, entry->is_array,\n> > +\t\t\t\t\t   entry->count));\n> >  \t}\n> >  \n> >  \treturn ctrls;\n> > diff --git a/src/libcamera/include/control_serializer.h b/src/libcamera/include/control_serializer.h\n> > index 55259913a2ca..b91d13155f5e 100644\n> > --- a/src/libcamera/include/control_serializer.h\n> > +++ b/src/libcamera/include/control_serializer.h\n> > @@ -41,7 +41,11 @@ private:\n> >  \tstatic void store(const ControlRange &range, ByteStreamBuffer &buffer);\n> >  \n> >  \ttemplate<typename T>\n> > -\tT load(ControlType type, ByteStreamBuffer &b);\n> > +\tControlValue loadControlValue(ByteStreamBuffer &buffer, bool isArray,\n> > +\t\t\t\t      unsigned int count);\n> > +\tControlValue loadControlValue(ControlType type, ByteStreamBuffer &buffer,\n> > +\t\t\t\t      bool isArray = false, unsigned int count = 1);\n> > +\tControlRange loadControlRange(ControlType type, ByteStreamBuffer &buffer);\n> >  \n> >  \tunsigned int serial_;\n> >  \tstd::vector<std::unique_ptr<ControlId>> controlIds_;","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 024F160424\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  6 Mar 2020 16:00:47 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1CDDB24B;\n\tFri,  6 Mar 2020 16:00:46 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583506847;\n\tbh=IS69S2pt8iScdeKwV/IhfEl8kDC+tgptYFgLJCKeLfQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=sR8f7b2e29cI5y/VpimeqRdEWLqbnMBFF8rNWwrnRWXVAGdOLP8tKeTieXjEJTTsB\n\tmxEbDT3B0nM+3nLIDO/VGxbQKJivyBUNGL/IRChfBAfxpHfoS2sBXr2y8fm8xnLA59\n\tGGYHuEvB4qwSYpOuncJYzLTXOOO6+viktiyH0BMA=","Date":"Fri, 6 Mar 2020 17:00:43 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200306150043.GM4878@pendragon.ideasonboard.com>","References":"<20200229164254.23604-1-laurent.pinchart@ideasonboard.com>\n\t<20200229164254.23604-28-laurent.pinchart@ideasonboard.com>\n\t<745a9861-baba-f53a-8ac0-0d8be079c7a0@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<745a9861-baba-f53a-8ac0-0d8be079c7a0@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 27/31] libcamera: control_serializer:\n\tAdd support for array controls","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>","X-List-Received-Date":"Fri, 06 Mar 2020 15:00:48 -0000"}}]