{"id":3533,"url":"https://patchwork.libcamera.org/api/patches/3533/?format=json","web_url":"https://patchwork.libcamera.org/patch/3533/","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":"<20200424234237.19604-2-laurent.pinchart@ideasonboard.com>","date":"2020-04-24T23:42:37","name":"[libcamera-devel,2/2] cam: Add an option to list camera controls","commit_ref":"175cd1061112992df9dee2c51f641d60a3d1705c","pull_url":null,"state":"accepted","archived":false,"hash":"9b1e95254f6af67fa30de03eb8d8be1ac46e0b2c","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/3533/mbox/","series":[{"id":823,"url":"https://patchwork.libcamera.org/api/series/823/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=823","date":"2020-04-24T23:42:36","name":"[libcamera-devel,1/2] cam: Rename OptProps to OptListProperties","version":1,"mbox":"https://patchwork.libcamera.org/series/823/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3533/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3533/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 43D6562E67\n\tfor ;\n\tSat, 25 Apr 2020 01:42:56 +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 C5D79528\n\tfor ;\n\tSat, 25 Apr 2020 01:42:55 +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=\"CC2t049H\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1587771775;\n\tbh=jyUCf09RAtUkTKbFGBsUykzR71BTvlI4RJ6/g6+jTMk=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=CC2t049HFbfHE8keqedheghhlNRwFgTb9MMGmBYz71AfDFnFKUkm6QynMVqBePIaB\n\tuXhQt72nwMFScopppb7k2fEQ5QT2MumeZOgq09zU0ehFe/vcvGB/J/qtAmsU1/Pr8W\n\tx/nGDIV2XYkaVx9iTM1HLN4uyNhbzBk+n/TJMKto=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 25 Apr 2020 02:42:37 +0300","Message-Id":"<20200424234237.19604-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.25.3","In-Reply-To":"<20200424234237.19604-1-laurent.pinchart@ideasonboard.com>","References":"<20200424234237.19604-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] cam: Add an option to list camera\n\tcontrols","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":"Fri, 24 Apr 2020 23:42:57 -0000"},"content":"Add a new --list-controls option to print information about all the\ncontrols supported by a camera.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/main.cpp | 28 ++++++++++++++++++++++++++++\n src/cam/main.h | 1 +\n 2 files changed, 29 insertions(+)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 340849e74ddd..ced4f567b8f3 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -37,6 +37,7 @@ public:\n private:\n \tint parseOptions(int argc, char *argv[]);\n \tint prepareConfig();\n+\tint listControls();\n \tint listProperties();\n \tint infoConfiguration();\n \tint run();\n@@ -182,6 +183,8 @@ int CamApp::parseOptions(int argc, char *argv[])\n \tparser.addOption(OptInfo, OptionNone,\n \t\t\t \"Display information about stream(s)\", \"info\");\n \tparser.addOption(OptList, OptionNone, \"List all cameras\", \"list\");\n+\tparser.addOption(OptListControls, OptionNone, \"List cameras controls\",\n+\t\t\t \"list-controls\");\n \tparser.addOption(OptListProperties, OptionNone, \"List cameras properties\",\n \t\t\t \"list-properties\");\n \n@@ -276,6 +279,25 @@ int CamApp::prepareConfig()\n \treturn 0;\n }\n \n+int CamApp::listControls()\n+{\n+\tif (!camera_) {\n+\t\tstd::cout << \"Cannot list controls without a camera\"\n+\t\t\t << std::endl;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (const auto &ctrl : camera_->controls()) {\n+\t\tconst ControlId *id = ctrl.first;\n+\t\tconst ControlInfo &info = ctrl.second;\n+\n+\t\tstd::cout << \"Control: \" << id->name() << \": \"\n+\t\t\t << info.toString() << std::endl;\n+\t}\n+\n+\treturn 0;\n+}\n+\n int CamApp::listProperties()\n {\n \tif (!camera_) {\n@@ -339,6 +361,12 @@ int CamApp::run()\n \t\t}\n \t}\n \n+\tif (options_.isSet(OptListControls)) {\n+\t\tret = listControls();\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n \tif (options_.isSet(OptListProperties)) {\n \t\tret = listProperties();\n \t\tif (ret)\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex d23c6dfb202e..4a130d8dd290 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -16,6 +16,7 @@ enum {\n \tOptList = 'l',\n \tOptListProperties = 'p',\n \tOptStream = 's',\n+\tOptListControls = 256,\n };\n \n #endif /* __CAM_MAIN_H__ */\n","prefixes":["libcamera-devel","2/2"]}