{"id":21273,"url":"https://patchwork.libcamera.org/api/1.1/patches/21273/?format=json","web_url":"https://patchwork.libcamera.org/patch/21273/","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":"<20240915232420.2106705-3-paul.elder@ideasonboard.com>","date":"2024-09-15T23:24:19","name":"[v4,2/3] apps: cam: Print control enum values more nicely","commit_ref":"ab48009a81c929d37d236554ca0914b9a8994a4a","pull_url":null,"state":"accepted","archived":false,"hash":"7819e8dedcae05c826f4d4ff098353207b3a69ea","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21273/mbox/","series":[{"id":4598,"url":"https://patchwork.libcamera.org/api/1.1/series/4598/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4598","date":"2024-09-15T23:24:17","name":"libcamera: controls: Add enum information to ControlId","version":4,"mbox":"https://patchwork.libcamera.org/series/4598/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21273/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21273/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 7CAA3C324C\n\tfor ;\n\tSun, 15 Sep 2024 23:24:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 85CCD63505;\n\tMon, 16 Sep 2024 01:24:39 +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 6865C634FB\n\tfor ;\n\tMon, 16 Sep 2024 01:24:32 +0200 (CEST)","from pyrite.hamster-moth.ts.net (unknown\n\t[IPv6:2001:4bc9:a45:b0af:31d1:7a87:7f90:977b])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7045DD8B;\n\tMon, 16 Sep 2024 01:23:11 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vbGQ02dv\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726442591;\n\tbh=OvlJ5QVCC96KqOp5pULLo0ri03XnBzVKCaNHrCz1L/U=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=vbGQ02dvXw066B2QETFKUKGDU81aLf7EJtceCO2bhmsgD+vAX9vFz9xOj6DRhT2Kf\n\tfuhSdltgKWGv/tNUjvfP3GyPjO9Jpc08PyycHhQYtNAnQYOqrUnaRs6fL/hYpHR9lb\n\t+UQq5mNWQStmr54gw1/MS1iOBdwIm2ia4v/Wb65Q=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder , stefan.klug@ideasonboard.com, \n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tUmang Jain ","Subject":"[PATCH v4 2/3] apps: cam: Print control enum values more nicely","Date":"Mon, 16 Sep 2024 01:24:19 +0200","Message-Id":"<20240915232420.2106705-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20240915232420.2106705-1-paul.elder@ideasonboard.com>","References":"<20240915232420.2106705-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"Now that enum names can be obtained from ControlId, use that information\nto print out the list of supported enum values in --list-controls.\n\nExample output (with a dummy AwbMode ControlInfo added to vimc):\n\n$ cam -c 1 --list-controls\nUsing camera platform/vimc.0 Sensor B as cam0\nControl: AwbMode:\n - AwbTungsten (2)\n - AwbFluorescent (3)\n - AwbDaylight (5)\nControl: Brightness: [-1.000000..1.000000]\nControl: Contrast: [0.000000..2.000000]\nControl: Saturation: [0.000000..2.000000]\n\nSigned-off-by: Paul Elder \nReviewed-by: Umang Jain \n\n---\nChanges in v4:\n- use the newly exposed enumerators() (instead of enumToString())\n- add example output to commit message\n\nChanges in v3:\n- s/enumName/enumToString/\n\nNo change in v2\n---\n src/apps/cam/camera_session.cpp | 19 +++++++++++++++++--\n 1 file changed, 17 insertions(+), 2 deletions(-)","diff":"diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 097dc4792..fc0923801 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -159,8 +159,23 @@ CameraSession::~CameraSession()\n void CameraSession::listControls() const\n {\n \tfor (const auto &[id, info] : camera_->controls()) {\n-\t\tstd::cout << \"Control: \" << id->name() << \": \"\n-\t\t\t << info.toString() << std::endl;\n+\t\tif (info.values().empty()) {\n+\t\t\tstd::cout << \"Control: \" << id->name() << \": \"\n+\t\t\t\t << info.toString() << std::endl;\n+\t\t} else {\n+\t\t\tstd::cout << \"Control: \" << id->name() << \":\" << std::endl;\n+\t\t\tfor (const auto &value : info.values()) {\n+\t\t\t\tint32_t val = value.get();\n+\t\t\t\tconst auto &it = id->enumerators().find(val);\n+\n+\t\t\t\tstd::cout << \" - \";\n+\t\t\t\tif (it == id->enumerators().end())\n+\t\t\t\t\tstd::cout << \"UNKNOWN\";\n+\t\t\t\telse\n+\t\t\t\t\tstd::cout << it->second;\n+\t\t\t\tstd::cout << \" (\" << val << \")\" << std::endl;\n+\t\t\t}\n+\t\t}\n \t}\n }\n \n","prefixes":["v4","2/3"]}