[{"id":31239,"web_url":"https://patchwork.libcamera.org/comment/31239/","msgid":"<172647370697.3421941.13289894277213173497@ping.linuxembedded.co.uk>","date":"2024-09-16T08:01:46","subject":"Re: [PATCH v4 2/3] apps: cam: Print control enum values more nicely","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Paul Elder (2024-09-16 00:24:19)\n> Now that enum names can be obtained from ControlId, use that information\n> to print out the list of supported enum values in --list-controls.\n> \n> Example output (with a dummy AwbMode ControlInfo added to vimc):\n> \n> $ cam -c 1 --list-controls\n> Using camera platform/vimc.0 Sensor B as cam0\n> Control: AwbMode:\n> - AwbTungsten (2)\n> - AwbFluorescent (3)\n> - AwbDaylight (5)\n> Control: Brightness: [-1.000000..1.000000]\n> Control: Contrast: [0.000000..2.000000]\n> Control: Saturation: [0.000000..2.000000]\n> \n> Signed-off-by: Paul Elder \n> Reviewed-by: Umang Jain \n\nReviewed-by: Kieran Bingham \n\n> ---\n> Changes in v4:\n> - use the newly exposed enumerators() (instead of enumToString())\n> - add example output to commit message\n> \n> Changes in v3:\n> - s/enumName/enumToString/\n> \n> No change in v2\n> ---\n> src/apps/cam/camera_session.cpp | 19 +++++++++++++++++--\n> 1 file changed, 17 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\n> index 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> for (const auto &[id, info] : camera_->controls()) {\n> - std::cout << \"Control: \" << id->name() << \": \"\n> - << info.toString() << std::endl;\n> + if (info.values().empty()) {\n> + std::cout << \"Control: \" << id->name() << \": \"\n> + << info.toString() << std::endl;\n> + } else {\n> + std::cout << \"Control: \" << id->name() << \":\" << std::endl;\n> + for (const auto &value : info.values()) {\n> + int32_t val = value.get();\n> + const auto &it = id->enumerators().find(val);\n> +\n> + std::cout << \" - \";\n> + if (it == id->enumerators().end())\n> + std::cout << \"UNKNOWN\";\n> + else\n> + std::cout << it->second;\n> + std::cout << \" (\" << val << \")\" << std::endl;\n> + }\n> + }\n> }\n> }\n> \n> -- \n> 2.39.2\n>","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 BB95BC3257\n\tfor ;\n\tMon, 16 Sep 2024 08:01:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9AF70634FE;\n\tMon, 16 Sep 2024 10:01:52 +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 8033A618F0\n\tfor ;\n\tMon, 16 Sep 2024 10:01:50 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 25955497;\n\tMon, 16 Sep 2024 10:00:29 +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=\"cHQKLgpW\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1726473629;\n\tbh=6+cLElyWb0c1uvixtJyZxCVkWbYmhuqjseu4L05Hme4=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=cHQKLgpWXRDxVwnlcJaQSZq1UftAYAk2aseoarRKDf/RhqwDuStg/Rs0AaTJHrhZ6\n\trFegCGbEGqu7AcKp/34ldrpgXPOecPR1JsMR6UT4xqc01yovHnHU4OJRydqbhzuUHQ\n\tpDa+z+deUXhS9d2lJyWap3cLjPstMdHr/WOJBGL0=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240915232420.2106705-3-paul.elder@ideasonboard.com>","References":"<20240915232420.2106705-1-paul.elder@ideasonboard.com>\n\t<20240915232420.2106705-3-paul.elder@ideasonboard.com>","Subject":"Re: [PATCH v4 2/3] apps: cam: Print control enum values more nicely","From":"Kieran Bingham ","Cc":"Paul Elder , stefan.klug@ideasonboard.com, \n\tLaurent Pinchart ,\n\tUmang Jain ","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Mon, 16 Sep 2024 09:01:46 +0100","Message-ID":"<172647370697.3421941.13289894277213173497@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}},{"id":31363,"web_url":"https://patchwork.libcamera.org/comment/31363/","msgid":"<20240925205343.GB5373@pendragon.ideasonboard.com>","date":"2024-09-25T20:53:43","subject":"Re: [PATCH v4 2/3] apps: cam: Print control enum values more nicely","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Mon, Sep 16, 2024 at 01:24:19AM +0200, Paul Elder wrote:\n> Now that enum names can be obtained from ControlId, use that information\n> to print out the list of supported enum values in --list-controls.\n> \n> Example output (with a dummy AwbMode ControlInfo added to vimc):\n> \n> $ cam -c 1 --list-controls\n> Using camera platform/vimc.0 Sensor B as cam0\n> Control: AwbMode:\n> - AwbTungsten (2)\n> - AwbFluorescent (3)\n> - AwbDaylight (5)\n> Control: Brightness: [-1.000000..1.000000]\n> Control: Contrast: [0.000000..2.000000]\n> Control: Saturation: [0.000000..2.000000]\n> \n> Signed-off-by: Paul Elder \n> Reviewed-by: Umang Jain \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> Changes in v4:\n> - use the newly exposed enumerators() (instead of enumToString())\n> - add example output to commit message\n> \n> Changes in v3:\n> - s/enumName/enumToString/\n> \n> No change in v2\n> ---\n> src/apps/cam/camera_session.cpp | 19 +++++++++++++++++--\n> 1 file changed, 17 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\n> index 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>","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 2FCC3C3257\n\tfor ;\n\tWed, 25 Sep 2024 20:53:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 418B96350E;\n\tWed, 25 Sep 2024 22:53:47 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 50231634F4\n\tfor ;\n\tWed, 25 Sep 2024 22:53:45 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7F900842;\n\tWed, 25 Sep 2024 22:52:17 +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=\"LeTPey+0\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1727297537;\n\tbh=stkJT9ZYbiCFgUrIIYZyi04jczhJE2qBhMuQVzu0YS4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=LeTPey+0hDaCxq7L6lntXdez+0KJyLYrlsdnc9Ny8d5ngPEkGqy7+jtF9vmqhUcUB\n\tJqVKDcxY+lYoY1tGZa41RIMVqbpysSOpFCQRw1cnyljRPh31Ry7erxwDo/7TI80eFT\n\tIkPlVvZaOT8M3H5x7c5uXHURmsg1TRJn6373dbBE=","Date":"Wed, 25 Sep 2024 23:53:43 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org, stefan.klug@ideasonboard.com,\n\tKieran Bingham ,\n\tUmang Jain ","Subject":"Re: [PATCH v4 2/3] apps: cam: Print control enum values more nicely","Message-ID":"<20240925205343.GB5373@pendragon.ideasonboard.com>","References":"<20240915232420.2106705-1-paul.elder@ideasonboard.com>\n\t<20240915232420.2106705-3-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20240915232420.2106705-3-paul.elder@ideasonboard.com>","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\" "}}]