{"id":9861,"url":"https://patchwork.libcamera.org/api/patches/9861/?format=json","web_url":"https://patchwork.libcamera.org/patch/9861/","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":"<20200929144648.429397-7-niklas.soderlund@ragnatech.se>","date":"2020-09-29T14:46:47","name":"[libcamera-devel,v6,6/7] cam: Print user-friendly camera names","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e8ec588f55302ad28ec57da4e171b4b1d9835f95","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9861/mbox/","series":[{"id":1336,"url":"https://patchwork.libcamera.org/api/series/1336/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1336","date":"2020-09-29T14:46:41","name":"libcamera: Allow for user-friendly names in","version":6,"mbox":"https://patchwork.libcamera.org/series/1336/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9861/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9861/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 44944C3B5C\n\tfor ;\n\tTue, 29 Sep 2020 14:47:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 22A0B621C9;\n\tTue, 29 Sep 2020 16:47:09 +0200 (CEST)","from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net\n\t[195.74.38.227])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D211F621C9\n\tfor ;\n\tTue, 29 Sep 2020 16:47:06 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid a3f5f31d-0262-11eb-9823-005056917f90;\n\tTue, 29 Sep 2020 16:47:05 +0200 (CEST)"],"X-Halon-ID":"a3f5f31d-0262-11eb-9823-005056917f90","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 29 Sep 2020 16:46:47 +0200","Message-Id":"<20200929144648.429397-7-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200929144648.429397-1-niklas.soderlund@ragnatech.se>","References":"<20200929144648.429397-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 6/7] cam: Print user-friendly camera\n\tnames","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Instead of only printing the camera ID which is not intended for humans\nto read and parse create a more user friendly string when printing\ncamera names. The ID is still printed as it is one option used to select\ncamera using the --camera option.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \nReviewed-by: Umang Jain \n---\n* Changes since v5\n- Rework camera name.\n\n* Changes since v4\n- Make cameraName() member of CamApp.\n\n* Changes since v1\n- Only print user-friendly names when listing cameras.\n- Update format of user-friendly names printed.\n- Update commit message.\n---\n src/cam/main.cpp | 28 +++++++++++++++++++++++++++-\n 1 file changed, 27 insertions(+), 1 deletion(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 244720b491f5c462..311df171a21f6152 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -45,6 +45,8 @@ private:\n \tint infoConfiguration();\n \tint run();\n \n+\tstd::string cameraName(const Camera *camera);\n+\n \tstatic CamApp *app_;\n \tOptionsParser::Options options_;\n \tCameraManager *cm_;\n@@ -340,7 +342,7 @@ int CamApp::run()\n \n \t\tunsigned int index = 1;\n \t\tfor (const std::shared_ptr &cam : cm_->cameras()) {\n-\t\t\tstd::cout << index << \": \" << cam->id() << std::endl;\n+\t\t\tstd::cout << index << \": \" << cameraName(cam.get()) << std::endl;\n \t\t\tindex++;\n \t\t}\n \t}\n@@ -378,6 +380,30 @@ int CamApp::run()\n \treturn 0;\n }\n \n+std::string CamApp::cameraName(const Camera *camera)\n+{\n+\tconst ControlList &props = camera->properties();\n+\tstd::string name;\n+\n+\tswitch (props.get(properties::Location)) {\n+\tcase properties::CameraLocationFront:\n+\t\tname = \"Internal front camera\";\n+\t\tbreak;\n+\tcase properties::CameraLocationBack:\n+\t\tname = \"Internal back camera\";\n+\t\tbreak;\n+\tcase properties::CameraLocationExternal:\n+\t\tname = \"External camera\";\n+\t\tif (props.contains(properties::Model))\n+\t\t\tname += \" '\" + props.get(properties::Model) + \"'\";\n+\t\tbreak;\n+\t}\n+\n+\tname += \" (\" + camera->id() + \")\";\n+\n+\treturn name;\n+}\n+\n void signalHandler([[maybe_unused]] int signal)\n {\n \tstd::cout << \"Exiting\" << std::endl;\n","prefixes":["libcamera-devel","v6","6/7"]}