[libcamera-devel] [PATCH v3 6/7] cam: Print user-friendly camera names

[Kieran Bingham]

Hi Niklas,

On 13/08/2020 10:57, Niklas Söderlund wrote:
> Instead of only printing the camera ID which is not intended for humans
> to read and parse create a more user friendly string when printing
> camera names. The ID is still printed as it is one option used to select
> camera using the --camera option.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>
> ---
> * Changes since v1
> - Only print user-friendly names when listing cameras.
> - Update format of user-friendly names printed.
> - Update commit message.
> ---
>  src/cam/main.cpp | 33 ++++++++++++++++++++++++++++++++-
>  1 file changed, 32 insertions(+), 1 deletion(-)
> 
> diff --git a/src/cam/main.cpp b/src/cam/main.cpp
> index cc3facd5a5b22092..57f8c79b21090ece 100644
> --- a/src/cam/main.cpp
> +++ b/src/cam/main.cpp
> @@ -21,6 +21,37 @@
>  
>  using namespace libcamera;
>  
> +std::string cameraName(const Camera *camera)
> +{
> +	const ControlList &props = camera->properties();
> +	std::string name;
> +
> +	/* Use camera model as fallback name if available. */
> +	if (props.contains(properties::Model))
> +		name = props.get(properties::Model);
> +	else
> +		name = "Unknown camera";
> +
> +	/* If camera location is available use it as highest priority name. */
> +	if (props.contains(properties::Location)) {
> +		switch (props.get(properties::Location)) {
> +		case properties::CameraLocationFront:
> +			name = "Internal front camera";
> +			break;
> +		case properties::CameraLocationBack:
> +			name = "Internal back camera";
> +			break;
> +		case properties::CameraLocationExternal:
> +			name = "External camera";
> +			break;
> +		}
> +	}


Err, aren't we going to make UVC cameras all marked as
CameraLocationExternal?

I'm not sure I'd use this as the 'highest' priority, more as the lowest
priority if the model property wasn't known but the location was...

Though I don't think we'll ever not have a model would we ?




> +
> +	name += " (" + camera->id() + ")";
> +
> +	return name;
> +}
> +
>  class CamApp
>  {
>  public:
> @@ -340,7 +371,7 @@ int CamApp::run()
>  
>  		unsigned int index = 1;
>  		for (const std::shared_ptr<Camera> &cam : cm_->cameras()) {
> -			std::cout << index << ": " << cam->id() << std::endl;
> +			std::cout << index << ": " << cameraName(cam.get()) << std::endl;
>  			index++;
>  		}
>  	}
> 

-- 
Regards
--
Kieran