{"id":3542,"url":"https://patchwork.libcamera.org/api/patches/3542/?format=json","web_url":"https://patchwork.libcamera.org/patch/3542/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200425205639.30566-1-laurent.pinchart@ideasonboard.com>","date":"2020-04-25T20:56:38","name":"[libcamera-devel,1/2] libcamera: controls: Add rectangle and size control types","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"cb514667a7c718be0f04893ab1f5be91766c3bd3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3542/mbox/","series":[{"id":825,"url":"https://patchwork.libcamera.org/api/series/825/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=825","date":"2020-04-25T20:56:38","name":"[libcamera-devel,1/2] libcamera: controls: Add rectangle and size control types","version":1,"mbox":"https://patchwork.libcamera.org/series/825/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3542/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3542/checks/","tags":{},"headers":{"Return-Path":"","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 7A49C603FC\n\tfor ;\n\tSat, 25 Apr 2020 22:56:59 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CFCCB4F7;\n\tSat, 25 Apr 2020 22:56:58 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"d+WXQzFJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1587848219;\n\tbh=eNgmipggjKuVhGaJWNTiywO3WhssVqjOJ8X2DB4yxlY=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=d+WXQzFJCgmt1Xr4fvYVhq6Doo9SXBojwJlkD4NU0SwEJuXc35Eag1pYbTLm39oE5\n\t7Ag/dnH0UvZ6aaUqn4owhKCKA/OhNs2gjt+/WvaUQyIhomUAkpiV8p3U1ZxDgyNxBf\n\tYRMJ/I/mNSTNuCjcKrQBj45m+a1Ns4r+eNfTdkq0=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 25 Apr 2020 23:56:38 +0300","Message-Id":"<20200425205639.30566-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.25.3","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/2] libcamera: controls: Add rectangle\n\tand size control types","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","X-List-Received-Date":"Sat, 25 Apr 2020 20:56:59 -0000"},"content":"Add two control types to store rectangles and sizes. These will be\nuseful for the properties related to the pixel array.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/controls.h | 13 +++++++++++++\n src/libcamera/controls.cpp | 12 ++++++++++++\n 2 files changed, 25 insertions(+)","diff":"diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h\nindex 4b2e7e9cdd6c..80944efc133a 100644\n--- a/include/libcamera/controls.h\n+++ b/include/libcamera/controls.h\n@@ -13,6 +13,7 @@\n #include \n #include \n \n+#include \n #include \n \n namespace libcamera {\n@@ -27,6 +28,8 @@ enum ControlType {\n \tControlTypeInteger64,\n \tControlTypeFloat,\n \tControlTypeString,\n+\tControlTypeRectangle,\n+\tControlTypeSize,\n };\n \n namespace details {\n@@ -70,6 +73,16 @@ struct control_type {\n \tstatic constexpr ControlType value = ControlTypeString;\n };\n \n+template<>\n+struct control_type {\n+\tstatic constexpr ControlType value = ControlTypeRectangle;\n+};\n+\n+template<>\n+struct control_type {\n+\tstatic constexpr ControlType value = ControlTypeSize;\n+};\n+\n template\n struct control_type> : public control_type> {\n };\ndiff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp\nindex 540cc026417a..08df7f29e938 100644\n--- a/src/libcamera/controls.cpp\n+++ b/src/libcamera/controls.cpp\n@@ -58,6 +58,8 @@ static constexpr size_t ControlValueSize[] = {\n \t[ControlTypeInteger64]\t\t= sizeof(int64_t),\n \t[ControlTypeFloat]\t\t= sizeof(float),\n \t[ControlTypeString]\t\t= sizeof(char),\n+\t[ControlTypeRectangle]\t\t= sizeof(Rectangle),\n+\t[ControlTypeSize]\t\t= sizeof(Size),\n };\n \n } /* namespace */\n@@ -242,6 +244,16 @@ std::string ControlValue::toString() const\n \t\t\tstr += std::to_string(*value);\n \t\t\tbreak;\n \t\t}\n+\t\tcase ControlTypeRectangle: {\n+\t\t\tconst Rectangle *value = reinterpret_cast(data);\n+\t\t\tstr += value->toString();\n+\t\t\tbreak;\n+\t\t}\n+\t\tcase ControlTypeSize: {\n+\t\t\tconst Size *value = reinterpret_cast(data);\n+\t\t\tstr += value->toString();\n+\t\t\tbreak;\n+\t\t}\n \t\tcase ControlTypeNone:\n \t\tcase ControlTypeString:\n \t\t\tbreak;\n","prefixes":["libcamera-devel","1/2"]}