{"id":13173,"url":"https://patchwork.libcamera.org/api/1.1/patches/13173/?format=json","web_url":"https://patchwork.libcamera.org/patch/13173/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210730215713.27440-1-laurent.pinchart@ideasonboard.com>","date":"2021-07-30T21:57:13","name":"[libcamera-devel,RFC,18/17] libcamera: pipeline_handler: Drop controls() and properties() functions","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"9c3847d975b9cc4f67e77873aa6b4bc1a712401b","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13173/mbox/","series":[{"id":2270,"url":"https://patchwork.libcamera.org/api/1.1/series/2270/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2270","date":"2021-07-23T04:00:19","name":"libcamera: Replace CameraData with Camera::Private","version":1,"mbox":"https://patchwork.libcamera.org/series/2270/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13173/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13173/checks/","tags":{},"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 DF340C322E\n\tfor ;\n\tFri, 30 Jul 2021 21:57:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 29561687C3;\n\tFri, 30 Jul 2021 23:57:30 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 96EC7687BE\n\tfor ;\n\tFri, 30 Jul 2021 23:57:28 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 20E1B2A3\n\tfor ;\n\tFri, 30 Jul 2021 23:57:28 +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=\"GNZjfydq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1627682248;\n\tbh=gXmYBGkKkthAgkEL9HcBQWLBZ13fAZR27+XeYOmrScw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=GNZjfydq5jeodkAfH7lH4ejgOkewdfNvwLzrO5OadbRfsjS6V0zfX3WI9SJpA+91s\n\tdWaDt9MkfnUW7rh8rMdO46YrQsqAl3QMqmoJ3TAfVGBVgwp9Q7T5Bby6oHH9UGUMDc\n\taDwKcWJYpJ8yWL7BLjulhpXGACKoEJENSkvjb7gQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 31 Jul 2021 00:57:13 +0300","Message-Id":"<20210730215713.27440-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>","References":"<20210723040036.32346-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH 18/17] libcamera: pipeline_handler:\n\tDrop controls() and properties() functions","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\" "},"content":"The PipelineHandler controls() and properties() functions are only used\nby the Camera class. Now that the controls and properties are stored in\nthe Camera::Private class, we can drop those functions and access the\nprivate data directly in Camera::controls() and Camera::properties().\n\nSuggested-by: Jacopo Mondi \nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/internal/pipeline_handler.h | 3 ---\n src/libcamera/camera.cpp | 4 ++--\n src/libcamera/pipeline_handler.cpp | 21 -------------------\n 3 files changed, 2 insertions(+), 26 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex 2f814753f2ae..79e9839fa0de 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -47,9 +47,6 @@ public:\n \tbool lock();\n \tvoid unlock();\n \n-\tconst ControlInfoMap &controls(const Camera *camera) const;\n-\tconst ControlList &properties(const Camera *camera) const;\n-\n \tvirtual CameraConfiguration *generateConfiguration(Camera *camera,\n \t\tconst StreamRoles &roles) = 0;\n \tvirtual int configure(Camera *camera, CameraConfiguration *config) = 0;\ndiff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp\nindex 72a42dbeb3d3..ff9fc92e3344 100644\n--- a/src/libcamera/camera.cpp\n+++ b/src/libcamera/camera.cpp\n@@ -795,7 +795,7 @@ int Camera::release()\n */\n const ControlInfoMap &Camera::controls() const\n {\n-\treturn _d()->pipe_->controls(this);\n+\treturn _d()->controlInfo_;\n }\n \n /**\n@@ -808,7 +808,7 @@ const ControlInfoMap &Camera::controls() const\n */\n const ControlList &Camera::properties() const\n {\n-\treturn _d()->pipe_->properties(this);\n+\treturn _d()->properties_;\n }\n \n /**\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 28e09bc00771..bf238377c67a 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -176,27 +176,6 @@ void PipelineHandler::unlock()\n \t\tmedia->unlock();\n }\n \n-/**\n- * \\brief Retrieve the list of controls for a camera\n- * \\param[in] camera The camera\n- * \\context This function is \\threadsafe.\n- * \\return A ControlInfoMap listing the controls support by \\a camera\n- */\n-const ControlInfoMap &PipelineHandler::controls(const Camera *camera) const\n-{\n-\treturn camera->_d()->controlInfo_;\n-}\n-\n-/**\n- * \\brief Retrieve the list of properties for a camera\n- * \\param[in] camera The camera\n- * \\return A ControlList of properties supported by \\a camera\n- */\n-const ControlList &PipelineHandler::properties(const Camera *camera) const\n-{\n-\treturn camera->_d()->properties_;\n-}\n-\n /**\n * \\fn PipelineHandler::generateConfiguration()\n * \\brief Generate a camera configuration for a specified camera\n","prefixes":["libcamera-devel","RFC","18/17"]}