From patchwork Sun Sep 15 23:24:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21273 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7CAA3C324C for ; Sun, 15 Sep 2024 23:24:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 85CCD63505; Mon, 16 Sep 2024 01:24:39 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vbGQ02dv"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6865C634FB for ; Mon, 16 Sep 2024 01:24:32 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (unknown [IPv6:2001:4bc9:a45:b0af:31d1:7a87:7f90:977b]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7045DD8B; Mon, 16 Sep 2024 01:23:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1726442591; bh=OvlJ5QVCC96KqOp5pULLo0ri03XnBzVKCaNHrCz1L/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vbGQ02dvXw066B2QETFKUKGDU81aLf7EJtceCO2bhmsgD+vAX9vFz9xOj6DRhT2Kf fuhSdltgKWGv/tNUjvfP3GyPjO9Jpc08PyycHhQYtNAnQYOqrUnaRs6fL/hYpHR9lb +UQq5mNWQStmr54gw1/MS1iOBdwIm2ia4v/Wb65Q= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , stefan.klug@ideasonboard.com, Kieran Bingham , Laurent Pinchart , Umang 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 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Now that enum names can be obtained from ControlId, use that information to print out the list of supported enum values in --list-controls. Example output (with a dummy AwbMode ControlInfo added to vimc): $ cam -c 1 --list-controls Using camera platform/vimc.0 Sensor B as cam0 Control: AwbMode: - AwbTungsten (2) - AwbFluorescent (3) - AwbDaylight (5) Control: Brightness: [-1.000000..1.000000] Control: Contrast: [0.000000..2.000000] Control: Saturation: [0.000000..2.000000] Signed-off-by: Paul Elder Reviewed-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- Changes in v4: - use the newly exposed enumerators() (instead of enumToString()) - add example output to commit message Changes in v3: - s/enumName/enumToString/ No change in v2 --- src/apps/cam/camera_session.cpp | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 097dc4792..fc0923801 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -159,8 +159,23 @@ CameraSession::~CameraSession() void CameraSession::listControls() const { for (const auto &[id, info] : camera_->controls()) { - std::cout << "Control: " << id->name() << ": " - << info.toString() << std::endl; + if (info.values().empty()) { + std::cout << "Control: " << id->name() << ": " + << info.toString() << std::endl; + } else { + std::cout << "Control: " << id->name() << ":" << std::endl; + for (const auto &value : info.values()) { + int32_t val = value.get(); + const auto &it = id->enumerators().find(val); + + std::cout << " - "; + if (it == id->enumerators().end()) + std::cout << "UNKNOWN"; + else + std::cout << it->second; + std::cout << " (" << val << ")" << std::endl; + } + } } }