[v2,2/3] apps: cam: Print control vendor information when listing controls
diff mbox series

Message ID 20241016111943.1411372-3-paul.elder@ideasonboard.com
State Accepted
Commit b777d8272af030f66b1a3636d6ffc9b41be58e24
Headers show
Series
  • libcamera: controls: Add namespace to ControlId
Related show

Commit Message

Paul Elder Oct. 16, 2024, 11:19 a.m. UTC 
Now that the vendor of the control can be queried, print it in
--list-controls.

Example output:
$ cam -c 1 --list-controls
Using camera platform/vimc.0 Sensor B as cam0
Control: libcamera::Brightness: [-1.000000..1.000000]
Control: libcamera::Contrast: [0.000000..2.000000]
Control: libcamera::Saturation: [0.000000..2.000000]

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

---
No change in v2
---
 src/apps/cam/camera_session.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Kieran Bingham Oct. 19, 2024, 10:07 p.m. UTC | #1 
Quoting Paul Elder (2024-10-16 12:19:42)
> Now that the vendor of the control can be queried, print it in
> --list-controls.
> 
> Example output:
> $ cam -c 1 --list-controls
> Using camera platform/vimc.0 Sensor B as cam0
> Control: libcamera::Brightness: [-1.000000..1.000000]
> Control: libcamera::Contrast: [0.000000..2.000000]
> Control: libcamera::Saturation: [0.000000..2.000000]
> 
> Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> 
> ---
> No change in v2
> ---
>  src/apps/cam/camera_session.cpp | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
> index edc49b875450..6e9890ccfda1 100644
> --- a/src/apps/cam/camera_session.cpp
> +++ b/src/apps/cam/camera_session.cpp
> @@ -160,10 +160,13 @@ void CameraSession::listControls() const
>  {
>         for (const auto &[id, info] : camera_->controls()) {
>                 if (info.values().empty()) {
> -                       std::cout << "Control: " << id->name() << ": "
> +                       std::cout << "Control: "
> +                                 << id->vendor() << "::" << id->name() << ": "
>                                   << info.toString() << std::endl;
>                 } else {
> -                       std::cout << "Control: " << id->name() << ":" << std::endl;
> +                       std::cout << "Control: "
> +                                 << id->vendor() << "::" << id->name() << ":"
> +                                 << std::endl;
>                         for (const auto &value : info.values()) {
>                                 int32_t val = value.get<int32_t>();
>                                 const auto &it = id->enumerators().find(val);
> -- 
> 2.39.2
>

Patch
diff mbox series 

diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp
index edc49b875450..6e9890ccfda1 100644
--- a/src/apps/cam/camera_session.cpp
+++ b/src/apps/cam/camera_session.cpp
@@ -160,10 +160,13 @@  void CameraSession::listControls() const
 {
 	for (const auto &[id, info] : camera_->controls()) {
 		if (info.values().empty()) {
-			std::cout << "Control: " << id->name() << ": "
+			std::cout << "Control: "
+				  << id->vendor() << "::" << id->name() << ": "
 				  << info.toString() << std::endl;
 		} else {
-			std::cout << "Control: " << id->name() << ":" << std::endl;
+			std::cout << "Control: "
+				  << id->vendor() << "::" << id->name() << ":"
+				  << std::endl;
 			for (const auto &value : info.values()) {
 				int32_t val = value.get<int32_t>();
 				const auto &it = id->enumerators().find(val);