[{"id":31766,"web_url":"https://patchwork.libcamera.org/comment/31766/","msgid":"<172908867467.877857.6248052899452646339@ping.linuxembedded.co.uk>","date":"2024-10-16T14:24:34","subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Stefan Klug (2024-10-15 21:38:15)\n> In the python bindings ControlTypePoint is not handled in the\n> corresponding conversion functions. Add that.\n> \n> While at it, sort the listings in the same order as the enum in\n> controls.h.\n> \n\nReviewed-by: Kieran Bingham \n\n> Fixes: 200d535ca85f (\"libcamera: controls: Add ControlTypePoint\")\n> Signed-off-by: Stefan Klug \n> ---\n> src/py/libcamera/py_enums.cpp | 3 ++-\n> src/py/libcamera/py_helpers.cpp | 16 ++++++++++------\n> 2 files changed, 12 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/py/libcamera/py_enums.cpp b/src/py/libcamera/py_enums.cpp\n> index ca6aeb868cbe..9e75ec1a97b3 100644\n> --- a/src/py/libcamera/py_enums.cpp\n> +++ b/src/py/libcamera/py_enums.cpp\n> @@ -32,7 +32,8 @@ void init_py_enums(py::module &m)\n> .value(\"Float\", ControlType::ControlTypeFloat)\n> .value(\"String\", ControlType::ControlTypeString)\n> .value(\"Rectangle\", ControlType::ControlTypeRectangle)\n> - .value(\"Size\", ControlType::ControlTypeSize);\n> + .value(\"Size\", ControlType::ControlTypeSize)\n> + .value(\"Point\", ControlType::ControlTypePoint);\n> \n> py::enum_(m, \"Orientation\")\n> .value(\"Rotate0\", Orientation::Rotate0)\n> diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\n> index 79891ab63862..1ad1d4c1a1cd 100644\n> --- a/src/py/libcamera/py_helpers.cpp\n> +++ b/src/py/libcamera/py_helpers.cpp\n> @@ -34,6 +34,8 @@ static py::object valueOrTuple(const ControlValue &cv)\n> py::object controlValueToPy(const ControlValue &cv)\n> {\n> switch (cv.type()) {\n> + case ControlTypeNone:\n> + return py::none();\n> case ControlTypeBool:\n> return valueOrTuple(cv);\n> case ControlTypeByte:\n> @@ -46,14 +48,14 @@ py::object controlValueToPy(const ControlValue &cv)\n> return valueOrTuple(cv);\n> case ControlTypeString:\n> return py::cast(cv.get());\n> - case ControlTypeRectangle:\n> - return valueOrTuple(cv);\n> case ControlTypeSize: {\n> const Size *v = reinterpret_cast(cv.data().data());\n> return py::cast(v);\n> }\n> - case ControlTypeNone:\n> - return py::none();\n> + case ControlTypeRectangle:\n> + return valueOrTuple(cv);\n> + case ControlTypePoint:\n> + return valueOrTuple(cv);\n> default:\n> throw std::runtime_error(\"Unsupported ControlValue type\");\n> }\n> @@ -73,6 +75,8 @@ static ControlValue controlValueMaybeArray(const py::object &ob)\n> ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> {\n> switch (type) {\n> + case ControlTypeNone:\n> + return ControlValue();\n> case ControlTypeBool:\n> return ControlValue(ob.cast());\n> case ControlTypeByte:\n> @@ -89,8 +93,8 @@ ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> return controlValueMaybeArray(ob);\n> case ControlTypeSize:\n> return ControlValue(ob.cast());\n> - case ControlTypeNone:\n> - return ControlValue();\n> + case ControlTypePoint:\n> + return controlValueMaybeArray(ob);\n> default:\n> throw std::runtime_error(\"Control type not implemented\");\n> }\n> -- \n> 2.43.0\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 95E7AC32FA\n\tfor ;\n\tWed, 16 Oct 2024 14:24:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 53BB265385;\n\tWed, 16 Oct 2024 16:24:39 +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 D37D76537E\n\tfor ;\n\tWed, 16 Oct 2024 16:24:37 +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 903EBA2F;\n\tWed, 16 Oct 2024 16:22:55 +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=\"EEGGetNf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729088575;\n\tbh=k3VYJb1Th8/2jtVVAV2ucDmzjmPbKr2al2TDTeyRqP0=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=EEGGetNfSI30Qk5FyH9p7ABxsKTljiavdyvW6C2PaW7nQqzVxXHBZi1pySQU55AQu\n\ty4EhObfuJ9tiW8qPtqrJF6vj6iINQtLO7Pw8FvVnTKZeaac6IQzj9t6LhRfeko9JSf\n\t7MMlknRCRY5B4XXnKYbtesf3Ys2XImkMWo1jPE0Y=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20241015203820.574326-5-stefan.klug@ideasonboard.com>","References":"<20241015203820.574326-1-stefan.klug@ideasonboard.com>\n\t<20241015203820.574326-5-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","From":"Kieran Bingham ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Wed, 16 Oct 2024 15:24:34 +0100","Message-ID":"<172908867467.877857.6248052899452646339@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":31769,"web_url":"https://patchwork.libcamera.org/comment/31769/","msgid":"<20241016144120.GC30496@pendragon.ideasonboard.com>","date":"2024-10-16T14:41:20","subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Stefan,\n\nThank you for the patch.\n\nOn Tue, Oct 15, 2024 at 10:38:15PM +0200, Stefan Klug wrote:\n> In the python bindings ControlTypePoint is not handled in the\n> corresponding conversion functions. Add that.\n> \n> While at it, sort the listings in the same order as the enum in\n> controls.h.\n> \n> Fixes: 200d535ca85f (\"libcamera: controls: Add ControlTypePoint\")\n> Signed-off-by: Stefan Klug \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> src/py/libcamera/py_enums.cpp | 3 ++-\n> src/py/libcamera/py_helpers.cpp | 16 ++++++++++------\n> 2 files changed, 12 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/py/libcamera/py_enums.cpp b/src/py/libcamera/py_enums.cpp\n> index ca6aeb868cbe..9e75ec1a97b3 100644\n> --- a/src/py/libcamera/py_enums.cpp\n> +++ b/src/py/libcamera/py_enums.cpp\n> @@ -32,7 +32,8 @@ void init_py_enums(py::module &m)\n> \t\t.value(\"Float\", ControlType::ControlTypeFloat)\n> \t\t.value(\"String\", ControlType::ControlTypeString)\n> \t\t.value(\"Rectangle\", ControlType::ControlTypeRectangle)\n> -\t\t.value(\"Size\", ControlType::ControlTypeSize);\n> +\t\t.value(\"Size\", ControlType::ControlTypeSize)\n> +\t\t.value(\"Point\", ControlType::ControlTypePoint);\n> \n> \tpy::enum_(m, \"Orientation\")\n> \t\t.value(\"Rotate0\", Orientation::Rotate0)\n> diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\n> index 79891ab63862..1ad1d4c1a1cd 100644\n> --- a/src/py/libcamera/py_helpers.cpp\n> +++ b/src/py/libcamera/py_helpers.cpp\n> @@ -34,6 +34,8 @@ static py::object valueOrTuple(const ControlValue &cv)\n> py::object controlValueToPy(const ControlValue &cv)\n> {\n> \tswitch (cv.type()) {\n> +\tcase ControlTypeNone:\n> +\t\treturn py::none();\n> \tcase ControlTypeBool:\n> \t\treturn valueOrTuple(cv);\n> \tcase ControlTypeByte:\n> @@ -46,14 +48,14 @@ py::object controlValueToPy(const ControlValue &cv)\n> \t\treturn valueOrTuple(cv);\n> \tcase ControlTypeString:\n> \t\treturn py::cast(cv.get());\n> -\tcase ControlTypeRectangle:\n> -\t\treturn valueOrTuple(cv);\n> \tcase ControlTypeSize: {\n> \t\tconst Size *v = reinterpret_cast(cv.data().data());\n> \t\treturn py::cast(v);\n> \t}\n> -\tcase ControlTypeNone:\n> -\t\treturn py::none();\n> +\tcase ControlTypeRectangle:\n> +\t\treturn valueOrTuple(cv);\n> +\tcase ControlTypePoint:\n> +\t\treturn valueOrTuple(cv);\n> \tdefault:\n> \t\tthrow std::runtime_error(\"Unsupported ControlValue type\");\n> \t}\n> @@ -73,6 +75,8 @@ static ControlValue controlValueMaybeArray(const py::object &ob)\n> ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> {\n> \tswitch (type) {\n> +\tcase ControlTypeNone:\n> +\t\treturn ControlValue();\n> \tcase ControlTypeBool:\n> \t\treturn ControlValue(ob.cast());\n> \tcase ControlTypeByte:\n> @@ -89,8 +93,8 @@ ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> \t\treturn controlValueMaybeArray(ob);\n> \tcase ControlTypeSize:\n> \t\treturn ControlValue(ob.cast());\n> -\tcase ControlTypeNone:\n> -\t\treturn ControlValue();\n> +\tcase ControlTypePoint:\n> +\t\treturn controlValueMaybeArray(ob);\n> \tdefault:\n> \t\tthrow std::runtime_error(\"Control type not implemented\");\n> \t}","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 2EC6DC32FA\n\tfor ;\n\tWed, 16 Oct 2024 14:41:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AFA2465385;\n\tWed, 16 Oct 2024 16:41:25 +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 5E8926537F\n\tfor ;\n\tWed, 16 Oct 2024 16:41:24 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E54CAA2F;\n\tWed, 16 Oct 2024 16:39:41 +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=\"QhCGn0+v\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729089582;\n\tbh=DVUOfuj4GqIfvRvDA8mO/OoDcb8s2ZkH2jcDb1XiRrM=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=QhCGn0+vD5xbt2gHRZiTPG+W+ouVNf/+IHstd8UoyzH/2A3xm9yxGjmeONGuD5qHv\n\tG8oY/I9NhL63FkkQArR0XYFLlYsitJ0hFtesNe6kKKi+OSV5/bl40slIChU2TrgED7\n\toiRzayhxBuNyYHCImp/MdwtUTbGa7oOgCapRUGEY=","Date":"Wed, 16 Oct 2024 17:41:20 +0300","From":"Laurent Pinchart ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","Message-ID":"<20241016144120.GC30496@pendragon.ideasonboard.com>","References":"<20241015203820.574326-1-stefan.klug@ideasonboard.com>\n\t<20241015203820.574326-5-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20241015203820.574326-5-stefan.klug@ideasonboard.com>","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":31780,"web_url":"https://patchwork.libcamera.org/comment/31780/","msgid":"","date":"2024-10-17T01:34:18","subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Tue, Oct 15, 2024 at 10:38:15PM +0200, Stefan Klug wrote:\n> In the python bindings ControlTypePoint is not handled in the\n> corresponding conversion functions. Add that.\n> \n> While at it, sort the listings in the same order as the enum in\n> controls.h.\n> \n> Fixes: 200d535ca85f (\"libcamera: controls: Add ControlTypePoint\")\n> Signed-off-by: Stefan Klug \n\nReviewed-by: Paul Elder \n\n> ---\n> src/py/libcamera/py_enums.cpp | 3 ++-\n> src/py/libcamera/py_helpers.cpp | 16 ++++++++++------\n> 2 files changed, 12 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/py/libcamera/py_enums.cpp b/src/py/libcamera/py_enums.cpp\n> index ca6aeb868cbe..9e75ec1a97b3 100644\n> --- a/src/py/libcamera/py_enums.cpp\n> +++ b/src/py/libcamera/py_enums.cpp\n> @@ -32,7 +32,8 @@ void init_py_enums(py::module &m)\n> \t\t.value(\"Float\", ControlType::ControlTypeFloat)\n> \t\t.value(\"String\", ControlType::ControlTypeString)\n> \t\t.value(\"Rectangle\", ControlType::ControlTypeRectangle)\n> -\t\t.value(\"Size\", ControlType::ControlTypeSize);\n> +\t\t.value(\"Size\", ControlType::ControlTypeSize)\n> +\t\t.value(\"Point\", ControlType::ControlTypePoint);\n> \n> \tpy::enum_(m, \"Orientation\")\n> \t\t.value(\"Rotate0\", Orientation::Rotate0)\n> diff --git a/src/py/libcamera/py_helpers.cpp b/src/py/libcamera/py_helpers.cpp\n> index 79891ab63862..1ad1d4c1a1cd 100644\n> --- a/src/py/libcamera/py_helpers.cpp\n> +++ b/src/py/libcamera/py_helpers.cpp\n> @@ -34,6 +34,8 @@ static py::object valueOrTuple(const ControlValue &cv)\n> py::object controlValueToPy(const ControlValue &cv)\n> {\n> \tswitch (cv.type()) {\n> +\tcase ControlTypeNone:\n> +\t\treturn py::none();\n> \tcase ControlTypeBool:\n> \t\treturn valueOrTuple(cv);\n> \tcase ControlTypeByte:\n> @@ -46,14 +48,14 @@ py::object controlValueToPy(const ControlValue &cv)\n> \t\treturn valueOrTuple(cv);\n> \tcase ControlTypeString:\n> \t\treturn py::cast(cv.get());\n> -\tcase ControlTypeRectangle:\n> -\t\treturn valueOrTuple(cv);\n> \tcase ControlTypeSize: {\n> \t\tconst Size *v = reinterpret_cast(cv.data().data());\n> \t\treturn py::cast(v);\n> \t}\n> -\tcase ControlTypeNone:\n> -\t\treturn py::none();\n> +\tcase ControlTypeRectangle:\n> +\t\treturn valueOrTuple(cv);\n> +\tcase ControlTypePoint:\n> +\t\treturn valueOrTuple(cv);\n> \tdefault:\n> \t\tthrow std::runtime_error(\"Unsupported ControlValue type\");\n> \t}\n> @@ -73,6 +75,8 @@ static ControlValue controlValueMaybeArray(const py::object &ob)\n> ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> {\n> \tswitch (type) {\n> +\tcase ControlTypeNone:\n> +\t\treturn ControlValue();\n> \tcase ControlTypeBool:\n> \t\treturn ControlValue(ob.cast());\n> \tcase ControlTypeByte:\n> @@ -89,8 +93,8 @@ ControlValue pyToControlValue(const py::object &ob, ControlType type)\n> \t\treturn controlValueMaybeArray(ob);\n> \tcase ControlTypeSize:\n> \t\treturn ControlValue(ob.cast());\n> -\tcase ControlTypeNone:\n> -\t\treturn ControlValue();\n> +\tcase ControlTypePoint:\n> +\t\treturn controlValueMaybeArray(ob);\n> \tdefault:\n> \t\tthrow std::runtime_error(\"Control type not implemented\");\n> \t}\n> -- \n> 2.43.0\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 886BDC326C\n\tfor ;\n\tThu, 17 Oct 2024 01:34:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3CF2665387;\n\tThu, 17 Oct 2024 03:34:27 +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 50F22633C7\n\tfor ;\n\tThu, 17 Oct 2024 03:34:25 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2404:7a81:160:2100:da41:46b1:7eef:1e0d])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7CBB8968;\n\tThu, 17 Oct 2024 03:32:41 +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=\"qHQGx19J\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1729128762;\n\tbh=ZOULNDUxgkCGB9BChrbN3MttLxXA1GJFUyqfK5VQkBw=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=qHQGx19Ju9b7Qupmq35rCin/+P/7ZOjeiWTMURpT2zSFI1ozFVmGlRHc/9b4rAJ3l\n\ttn7FASxZHvr87HiXdJiEFA/Y4gZPwZVE3e6RniryxVTODiYL6TjlZcnNHCHKFtuFxh\n\tJEGoD3jTB4IGBO0DqaXkVy8YDI5xVIyR/m0XoaVY=","Date":"Thu, 17 Oct 2024 10:34:18 +0900","From":"Paul Elder ","To":"Stefan Klug ","Cc":"libcamera-devel@lists.libcamera.org","Subject":"Re: [PATCH v1 4/4] pycamera: Add missing code for ControlTypePoint","Message-ID":"","References":"<20241015203820.574326-1-stefan.klug@ideasonboard.com>\n\t<20241015203820.574326-5-stefan.klug@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20241015203820.574326-5-stefan.klug@ideasonboard.com>","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\" "}}]