[{"id":31914,"web_url":"https://patchwork.libcamera.org/comment/31914/","msgid":"<172981086691.2721096.11840388435847361813@ping.linuxembedded.co.uk>","date":"2024-10-24T23:01:06","subject":"Re: [PATCH v2 2/2] libcamera: Add Unsigned 16-bits Control Type","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Harvey Yang (2024-10-22 10:56:05)\n> From: Yudhistira Erlandinata \n> \n> Some camera metadata is of length 16-bits,\n> for example JPEG metadata headers.\n> \n\nCommit message could be improved, but it's probably useful to still say\nthat you need this type for supporting JPEG headers from V4L2...\n\n\n\n> Signed-off-by: Yudhistira Erlandinata \n> Co-developed-by: Harvey Yang \n> Signed-off-by: Harvey Yang \n> ---\n> include/libcamera/controls.h | 7 +++++++\n> src/libcamera/controls.cpp | 8 ++++++++\n> src/libcamera/v4l2_device.cpp | 9 +++++++++\n\nAlso lacking the corresponding tests in test/controls/control_value.cpp\n\nBut once that's added, I'd look forward to merging this.\n--\nKieran\n\n> 3 files changed, 24 insertions(+)\n> \n> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> index 6da8ad2c3..162115bb5 100644\n> --- a/include/libcamera/controls.h\n> +++ b/include/libcamera/controls.h\n> @@ -29,6 +29,7 @@ enum ControlType {\n> ControlTypeNone,\n> ControlTypeBool,\n> ControlTypeByte,\n> + ControlTypeUnsigned16,\n> ControlTypeUnsigned32,\n> ControlTypeInteger32,\n> ControlTypeInteger64,\n> @@ -63,6 +64,12 @@ struct control_type {\n> static constexpr std::size_t size = 0;\n> };\n> \n> +template<>\n> +struct control_type {\n> + static constexpr ControlType value = ControlTypeUnsigned16;\n> + static constexpr std::size_t size = 0;\n> +};\n> +\n> template<>\n> struct control_type {\n> static constexpr ControlType value = ControlTypeUnsigned32;\n> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> index 8ae295191..3a840bb22 100644\n> --- a/src/libcamera/controls.cpp\n> +++ b/src/libcamera/controls.cpp\n> @@ -54,6 +54,7 @@ static constexpr size_t ControlValueSize[] = {\n> [ControlTypeNone] = 0,\n> [ControlTypeBool] = sizeof(bool),\n> [ControlTypeByte] = sizeof(uint8_t),\n> + [ControlTypeUnsigned16] = sizeof(uint16_t),\n> [ControlTypeUnsigned32] = sizeof(uint32_t),\n> [ControlTypeInteger32] = sizeof(int32_t),\n> [ControlTypeInteger64] = sizeof(int64_t),\n> @@ -75,6 +76,8 @@ static constexpr size_t ControlValueSize[] = {\n> * The control stores a boolean value\n> * \\var ControlTypeByte\n> * The control stores a byte value as an unsigned 8-bit integer\n> + * \\var ControlTypeUnsigned16\n> + * The control stores an unsigned 16-bit integer value\n> * \\var ControlTypeUnsigned32\n> * The control stores an unsigned 32-bit integer value\n> * \\var ControlTypeInteger32\n> @@ -233,6 +236,11 @@ std::string ControlValue::toString() const\n> str += std::to_string(*value);\n> break;\n> }\n> + case ControlTypeUnsigned16: {\n> + const uint16_t *value = reinterpret_cast(data);\n> + str += std::to_string(*value);\n> + break;\n> + }\n> case ControlTypeUnsigned32: {\n> const uint32_t *value = reinterpret_cast(data);\n> str += std::to_string(*value);\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 0ba8dcfa0..f1b5a25a0 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -492,6 +492,9 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType)\n> case V4L2_CTRL_TYPE_BOOLEAN:\n> return ControlTypeBool;\n> \n> + case V4L2_CTRL_TYPE_U16:\n> + return ControlTypeUnsigned16;\n> +\n> case V4L2_CTRL_TYPE_U32:\n> return ControlTypeUnsigned32;\n> \n> @@ -543,6 +546,11 @@ std::optional V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl\n> static_cast(ctrl.maximum),\n> static_cast(ctrl.default_value));\n> \n> + case V4L2_CTRL_TYPE_U16:\n> + return ControlInfo(static_cast(ctrl.minimum),\n> + static_cast(ctrl.maximum),\n> + static_cast(ctrl.default_value));\n> +\n> case V4L2_CTRL_TYPE_U32:\n> return ControlInfo(static_cast(ctrl.minimum),\n> static_cast(ctrl.maximum),\n> @@ -634,6 +642,7 @@ void V4L2Device::listControls()\n> case V4L2_CTRL_TYPE_BITMASK:\n> case V4L2_CTRL_TYPE_INTEGER_MENU:\n> case V4L2_CTRL_TYPE_U8:\n> + case V4L2_CTRL_TYPE_U16:\n> case V4L2_CTRL_TYPE_U32:\n> break;\n> /* \\todo Support other control types. */\n> -- \n> 2.47.0.105.g07ac214952-goog\n>","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 92BC6C3220\n\tfor ;\n\tThu, 24 Oct 2024 23:01:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 85FF465393;\n\tFri, 25 Oct 2024 01:01:12 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DCC2E6537E\n\tfor ;\n\tFri, 25 Oct 2024 01:01:09 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 84753D21;\n\tFri, 25 Oct 2024 00:59:21 +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=\"RjkIu81m\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729810761;\n\tbh=NGhpCmexBQNHfgJbXRCLd5mlCB9CkeptVNvD53/iumA=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=RjkIu81mDLun+U/G5wywjZ1N35eNBhYRtsQpluYFfFKSUKLdbuvMYK5uQ6CPpgDq3\n\tanVNhLdCjsBnGc97k0D8N+xxEMEWlg6tQ4IuPrfCv1NooKGEDETtT+8rWU1os8xHc3\n\tyna069ne2o84NC3CuMUZPQ7T1rlwKd3SR96pm/CY=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20241022095737.4127210-3-chenghaoyang@chromium.org>","References":"<20241022095737.4127210-1-chenghaoyang@chromium.org>\n\t<20241022095737.4127210-3-chenghaoyang@chromium.org>","Subject":"Re: [PATCH v2 2/2] libcamera: Add Unsigned 16-bits Control Type","From":"Kieran Bingham ","Cc":"Yudhistira Erlandinata ,\n\tHarvey Yang ","To":"Harvey Yang ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 25 Oct 2024 00:01:06 +0100","Message-ID":"<172981086691.2721096.11840388435847361813@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":31917,"web_url":"https://patchwork.libcamera.org/comment/31917/","msgid":"","date":"2024-10-25T05:33:19","subject":"Re: [PATCH v2 2/2] libcamera: Add Unsigned 16-bits Control Type","submitter":{"id":117,"url":"https://patchwork.libcamera.org/api/people/117/","name":"Cheng-Hao Yang","email":"chenghaoyang@chromium.org"},"content":"Hi Kieran,\n\nOn Fri, Oct 25, 2024 at 7:01 AM Kieran Bingham\n wrote:\n>\n> Quoting Harvey Yang (2024-10-22 10:56:05)\n> > From: Yudhistira Erlandinata \n> >\n> > Some camera metadata is of length 16-bits,\n> > for example JPEG metadata headers.\n> >\n>\n> Commit message could be improved, but it's probably useful to still say\n> that you need this type for supporting JPEG headers from V4L2...\n\nUpdated.\n\n>\n>\n>\n> > Signed-off-by: Yudhistira Erlandinata \n> > Co-developed-by: Harvey Yang \n> > Signed-off-by: Harvey Yang \n> > ---\n> > include/libcamera/controls.h | 7 +++++++\n> > src/libcamera/controls.cpp | 8 ++++++++\n> > src/libcamera/v4l2_device.cpp | 9 +++++++++\n>\n> Also lacking the corresponding tests in test/controls/control_value.cpp\n>\n> But once that's added, I'd look forward to merging this.\n\nAdded and tested.\n\nBR,\nHarvey\n\n> --\n> Kieran\n>\n> > 3 files changed, 24 insertions(+)\n> >\n> > diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\n> > index 6da8ad2c3..162115bb5 100644\n> > --- a/include/libcamera/controls.h\n> > +++ b/include/libcamera/controls.h\n> > @@ -29,6 +29,7 @@ enum ControlType {\n> > ControlTypeNone,\n> > ControlTypeBool,\n> > ControlTypeByte,\n> > + ControlTypeUnsigned16,\n> > ControlTypeUnsigned32,\n> > ControlTypeInteger32,\n> > ControlTypeInteger64,\n> > @@ -63,6 +64,12 @@ struct control_type {\n> > static constexpr std::size_t size = 0;\n> > };\n> >\n> > +template<>\n> > +struct control_type {\n> > + static constexpr ControlType value = ControlTypeUnsigned16;\n> > + static constexpr std::size_t size = 0;\n> > +};\n> > +\n> > template<>\n> > struct control_type {\n> > static constexpr ControlType value = ControlTypeUnsigned32;\n> > diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\n> > index 8ae295191..3a840bb22 100644\n> > --- a/src/libcamera/controls.cpp\n> > +++ b/src/libcamera/controls.cpp\n> > @@ -54,6 +54,7 @@ static constexpr size_t ControlValueSize[] = {\n> > [ControlTypeNone] = 0,\n> > [ControlTypeBool] = sizeof(bool),\n> > [ControlTypeByte] = sizeof(uint8_t),\n> > + [ControlTypeUnsigned16] = sizeof(uint16_t),\n> > [ControlTypeUnsigned32] = sizeof(uint32_t),\n> > [ControlTypeInteger32] = sizeof(int32_t),\n> > [ControlTypeInteger64] = sizeof(int64_t),\n> > @@ -75,6 +76,8 @@ static constexpr size_t ControlValueSize[] = {\n> > * The control stores a boolean value\n> > * \\var ControlTypeByte\n> > * The control stores a byte value as an unsigned 8-bit integer\n> > + * \\var ControlTypeUnsigned16\n> > + * The control stores an unsigned 16-bit integer value\n> > * \\var ControlTypeUnsigned32\n> > * The control stores an unsigned 32-bit integer value\n> > * \\var ControlTypeInteger32\n> > @@ -233,6 +236,11 @@ std::string ControlValue::toString() const\n> > str += std::to_string(*value);\n> > break;\n> > }\n> > + case ControlTypeUnsigned16: {\n> > + const uint16_t *value = reinterpret_cast(data);\n> > + str += std::to_string(*value);\n> > + break;\n> > + }\n> > case ControlTypeUnsigned32: {\n> > const uint32_t *value = reinterpret_cast(data);\n> > str += std::to_string(*value);\n> > diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> > index 0ba8dcfa0..f1b5a25a0 100644\n> > --- a/src/libcamera/v4l2_device.cpp\n> > +++ b/src/libcamera/v4l2_device.cpp\n> > @@ -492,6 +492,9 @@ ControlType V4L2Device::v4l2CtrlType(uint32_t ctrlType)\n> > case V4L2_CTRL_TYPE_BOOLEAN:\n> > return ControlTypeBool;\n> >\n> > + case V4L2_CTRL_TYPE_U16:\n> > + return ControlTypeUnsigned16;\n> > +\n> > case V4L2_CTRL_TYPE_U32:\n> > return ControlTypeUnsigned32;\n> >\n> > @@ -543,6 +546,11 @@ std::optional V4L2Device::v4l2ControlInfo(const v4l2_query_ext_ctrl\n> > static_cast(ctrl.maximum),\n> > static_cast(ctrl.default_value));\n> >\n> > + case V4L2_CTRL_TYPE_U16:\n> > + return ControlInfo(static_cast(ctrl.minimum),\n> > + static_cast(ctrl.maximum),\n> > + static_cast(ctrl.default_value));\n> > +\n> > case V4L2_CTRL_TYPE_U32:\n> > return ControlInfo(static_cast(ctrl.minimum),\n> > static_cast(ctrl.maximum),\n> > @@ -634,6 +642,7 @@ void V4L2Device::listControls()\n> > case V4L2_CTRL_TYPE_BITMASK:\n> > case V4L2_CTRL_TYPE_INTEGER_MENU:\n> > case V4L2_CTRL_TYPE_U8:\n> > + case V4L2_CTRL_TYPE_U16:\n> > case V4L2_CTRL_TYPE_U32:\n> > break;\n> > /* \\todo Support other control types. */\n> > --\n> > 2.47.0.105.g07ac214952-goog\n> >","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 64EB9C3213\n\tfor ;\n\tFri, 25 Oct 2024 05:33:32 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1C81A65395;\n\tFri, 25 Oct 2024 07:33:32 +0200 (CEST)","from mail-lj1-x231.google.com (mail-lj1-x231.google.com\n\t[IPv6:2a00:1450:4864:20::231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B883B60366\n\tfor ;\n\tFri, 25 Oct 2024 07:33:30 +0200 (CEST)","by mail-lj1-x231.google.com with SMTP id\n\t38308e7fff4ca-2f75c56f16aso15791831fa.0\n\tfor ;\n\tThu, 24 Oct 2024 22:33:30 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"OkR6HOjz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1729834410; x=1730439210;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Zd/D6PBtbCcfAz2QPJcrob2069CLZPpadxawsxkwjWo=;\n\tb=OkR6HOjzlD/ZHtfK+dQ8aCXDXdwMZLCYljuEFF/mtRGrY0/bO319f011JCiJQWdjY7\n\tYYadq2auJfWTLbnZdwlrLZh6YGnoRVE7z0nokttKi9f+t03itHO9j2pGc8/pSiL8120B\n\tb0jAQo0bIcn6BEZlHIBQZdeb1VYUN4NC7A1Rs=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1729834410; x=1730439210;\n\th=content-transfer-encoding:cc:to:subject:message-id:date:from\n\t:in-reply-to:references:mime-version:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=Zd/D6PBtbCcfAz2QPJcrob2069CLZPpadxawsxkwjWo=;\n\tb=YCVgmjU8BkZYay9LQ+NUpdNabdeTMYKGjwljyoWcL/sB3ylA2QFDVx8Sz+uUC5zPR2\n\t/W0Lbr64kwh0ImPzcxpj5/zKPeQqNJlcWmjiTJfFEDPjbwXTkbjw9ZI3cQBmowCrV6lU\n\taDZHxck4aYgpcOadIffBKQxgBfMeIx1qAWeVFUVUOI53v5wb6yQHh0AZtj/W8texwpUj\n\tGxgLuxDNu1akRYEX35EMMBml1vRHkLC9309AC9Wm25jEbqqr/DbF9qKyRJ4gt00qI+j3\n\tCXBQNEDqk4xfIS3/YEIXTjUZQ4mvj0f7r+++ajIGHfEdcEiRB85FWwyHaUYA2t62IhnB\n\t41BA==","X-Gm-Message-State":"AOJu0YxJN76re1PQtI5vBSIvt7CK7lQ9r7bX4jIPso4AxzB9izJSe6Wl\n\t897L7kwXg/EahmlhN6ENgSFfBU8HAyGGimXF4tNl1uFvlmEhPQ/cwBuwwh6XPkKg1SCt2/WQgwL\n\tk+02snoBhjEaa2qK/s1XTyrPqT8V5awe53Y3f","X-Google-Smtp-Source":"AGHT+IEssDrsd4jHVMNl3sp4LB8LxNzKo4rT9O4K1eTw0ibx0uinA4kBrAbaTEWsXBN8B3AaOh3uhetlLnzgOZwF6ws=","X-Received":"by 2002:a05:651c:1546:b0:2fb:357a:be41 with SMTP id\n\t38308e7fff4ca-2fc9d2de48bmr46352571fa.5.1729834409903;\n\tThu, 24 Oct 2024 22:33:29 -0700 (PDT)","MIME-Version":"1.0","References":"<20241022095737.4127210-1-chenghaoyang@chromium.org>\n\t<20241022095737.4127210-3-chenghaoyang@chromium.org>\n\t<172981086691.2721096.11840388435847361813@ping.linuxembedded.co.uk>","In-Reply-To":"<172981086691.2721096.11840388435847361813@ping.linuxembedded.co.uk>","From":"Cheng-Hao Yang ","Date":"Fri, 25 Oct 2024 13:33:19 +0800","Message-ID":"","Subject":"Re: [PATCH v2 2/2] libcamera: Add Unsigned 16-bits Control Type","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org, \n\tYudhistira Erlandinata ","Content-Type":"text/plain; charset=\"UTF-8\"","Content-Transfer-Encoding":"quoted-printable","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]