{"id":12837,"url":"https://patchwork.libcamera.org/api/patches/12837/?format=json","web_url":"https://patchwork.libcamera.org/patch/12837/","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":"<20210707021941.20804-25-laurent.pinchart@ideasonboard.com>","date":"2021-07-07T02:19:35","name":"[libcamera-devel,24/30] cam: Move printing of camera information to CameraSession class","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4e3bbf55e6087bfde26f52c0078032e6a2b78f06","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/12837/mbox/","series":[{"id":2213,"url":"https://patchwork.libcamera.org/api/series/2213/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2213","date":"2021-07-07T02:19:12","name":"Multi-camera support in the cam application","version":1,"mbox":"https://patchwork.libcamera.org/series/2213/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12837/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12837/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 07C5FC3227\n\tfor ;\n\tWed, 7 Jul 2021 02:20:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B745A68537;\n\tWed, 7 Jul 2021 04:20:50 +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 9E0DD6853E\n\tfor ;\n\tWed, 7 Jul 2021 04:20:40 +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 3514D2E4\n\tfor ;\n\tWed, 7 Jul 2021 04:20:40 +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=\"jP5T52lJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1625624440;\n\tbh=/B5Y52ldjQiw1RyulD/OXE8yL/ucpbEc6JVIT3xheYY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=jP5T52lJW1dbDmk2BAF4Ur1eC7L0mOBV4CTPTFH5zXlnvICw/qwJRGSQy3b+9DzKe\n\tRT1tEg7Opad3pZ7vrNJgjfrUsZGCXxqAKRa4mI5GJbxW3vIutUvMkTyEwIdy0U3xes\n\tgZ4g0aAxhHSCl+vEEbR7Cey+LLcFikRFpktVJy70=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 7 Jul 2021 05:19:35 +0300","Message-Id":"<20210707021941.20804-25-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>","References":"<20210707021941.20804-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 24/30] cam: Move printing of camera\n\tinformation to CameraSession class","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 three CamApp functions listControls(), listProperties() and\ninfoConfiguration() operate on a camera. They would thus be better\nplaced in the CameraSession class. Move them there. As they now have no\nerror to return anymore, make them void functions.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/camera_session.cpp | 45 +++++++++++++++++\n src/cam/camera_session.h | 4 ++\n src/cam/main.cpp | 101 ++++++++-----------------------------\n 3 files changed, 70 insertions(+), 80 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 10e66446ee67..ceb2c3ab3a92 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -11,6 +11,7 @@\n #include \n \n #include \n+#include \n \n #include \"camera_session.h\"\n #include \"event_loop.h\"\n@@ -89,6 +90,50 @@ CameraSession::~CameraSession()\n \t\tcamera_->release();\n }\n \n+void CameraSession::listControls() const\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+\n+void CameraSession::listProperties() const\n+{\n+\tfor (const auto &prop : camera_->properties()) {\n+\t\tconst ControlId *id = properties::properties.at(prop.first);\n+\t\tconst ControlValue &value = prop.second;\n+\n+\t\tstd::cout << \"Property: \" << id->name() << \" = \"\n+\t\t\t << value.toString() << std::endl;\n+\t}\n+}\n+\n+void CameraSession::infoConfiguration() const\n+{\n+\tunsigned int index = 0;\n+\tfor (const StreamConfiguration &cfg : *config_) {\n+\t\tstd::cout << index << \": \" << cfg.toString() << std::endl;\n+\n+\t\tconst StreamFormats &formats = cfg.formats();\n+\t\tfor (PixelFormat pixelformat : formats.pixelformats()) {\n+\t\t\tstd::cout << \" * Pixelformat: \"\n+\t\t\t\t << pixelformat.toString() << \" \"\n+\t\t\t\t << formats.range(pixelformat).toString()\n+\t\t\t\t << std::endl;\n+\n+\t\t\tfor (const Size &size : formats.sizes(pixelformat))\n+\t\t\t\tstd::cout << \" - \" << size.toString()\n+\t\t\t\t\t << std::endl;\n+\t\t}\n+\n+\t\tindex++;\n+\t}\n+}\n+\n int CameraSession::start(const OptionsParser::Options &options)\n {\n \tint ret;\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 88baf9061629..6221aadadf90 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -35,6 +35,10 @@ public:\n \tlibcamera::Camera *camera() { return camera_.get(); }\n \tlibcamera::CameraConfiguration *config() { return config_.get(); }\n \n+\tvoid listControls() const;\n+\tvoid listProperties() const;\n+\tvoid infoConfiguration() const;\n+\n \tint start(const OptionsParser::Options &options);\n \tvoid stop();\n \ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex cba0793ac39b..4fe0c4c368d1 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -39,9 +39,6 @@ private:\n \tvoid cameraRemoved(std::shared_ptr cam);\n \tvoid captureDone();\n \tint parseOptions(int argc, char *argv[]);\n-\tint listControls();\n-\tint listProperties();\n-\tint infoConfiguration();\n \tint run();\n \n \tstatic std::string cameraName(const Camera *camera);\n@@ -158,74 +155,6 @@ int CamApp::parseOptions(int argc, char *argv[])\n \treturn 0;\n }\n \n-int CamApp::listControls()\n-{\n-\tif (!session_) {\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 : session_->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 (!session_) {\n-\t\tstd::cout << \"Cannot list properties without a camera\"\n-\t\t\t << std::endl;\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tfor (const auto &prop : session_->camera()->properties()) {\n-\t\tconst ControlId *id = properties::properties.at(prop.first);\n-\t\tconst ControlValue &value = prop.second;\n-\n-\t\tstd::cout << \"Property: \" << id->name() << \" = \"\n-\t\t\t << value.toString() << std::endl;\n-\t}\n-\n-\treturn 0;\n-}\n-\n-int CamApp::infoConfiguration()\n-{\n-\tif (!session_) {\n-\t\tstd::cout << \"Cannot print stream information without a camera\"\n-\t\t\t << std::endl;\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tunsigned int index = 0;\n-\tfor (const StreamConfiguration &cfg : *session_->config()) {\n-\t\tstd::cout << index << \": \" << cfg.toString() << std::endl;\n-\n-\t\tconst StreamFormats &formats = cfg.formats();\n-\t\tfor (PixelFormat pixelformat : formats.pixelformats()) {\n-\t\t\tstd::cout << \" * Pixelformat: \"\n-\t\t\t\t << pixelformat.toString() << \" \"\n-\t\t\t\t << formats.range(pixelformat).toString()\n-\t\t\t\t << std::endl;\n-\n-\t\t\tfor (const Size &size : formats.sizes(pixelformat))\n-\t\t\t\tstd::cout << \" - \" << size.toString()\n-\t\t\t\t\t << std::endl;\n-\t\t}\n-\n-\t\tindex++;\n-\t}\n-\n-\treturn 0;\n-}\n-\n void CamApp::cameraAdded(std::shared_ptr cam)\n {\n \tstd::cout << \"Camera Added: \" << cam->id() << std::endl;\n@@ -269,21 +198,33 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptListControls)) {\n-\t\tret = listControls();\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\t\tif (!session_) {\n+\t\t\tstd::cout << \"Cannot list controls without a camera\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tsession_->listControls();\n \t}\n \n \tif (options_.isSet(OptListProperties)) {\n-\t\tret = listProperties();\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\t\tif (!session_) {\n+\t\t\tstd::cout << \"Cannot list properties without a camera\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tsession_->listProperties();\n \t}\n \n \tif (options_.isSet(OptInfo)) {\n-\t\tret = infoConfiguration();\n-\t\tif (ret)\n-\t\t\treturn ret;\n+\t\tif (!session_) {\n+\t\t\tstd::cout << \"Cannot print stream information without a camera\"\n+\t\t\t\t << std::endl;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tsession_->infoConfiguration();\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n","prefixes":["libcamera-devel","24/30"]}