[libcamera-devel,v5,5/7] libcamera: pipeline: uvcvideo: Set sensor model property

Message ID 20200925150743.1822226-6-niklas.soderlund@ragnatech.se
State Accepted
Headers show
Series
  • libcamera: Allow for user-friendly names in applications
Related show

Commit Message

Niklas Söderlund Sept. 25, 2020, 3:07 p.m. UTC
Set the sensor model property from the model reported in the media
graph.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
* Changes since v1
- Ensure model string only contains ASCII characters.
---
 src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 1 +
 1 file changed, 1 insertion(+)

Comments

Laurent Pinchart Sept. 28, 2020, 4:58 p.m. UTC | #1
Hi Niklas,

Thank you for the patch.

On Fri, Sep 25, 2020 at 05:07:41PM +0200, Niklas Söderlund wrote:
> Set the sensor model property from the model reported in the media
> graph.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Provided this will still be applicable once we agree on 1/7,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> * Changes since v1
> - Ensure model string only contains ASCII characters.
> ---
>  src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
> index bf12189d1044cdfc..335f0efcc1eb31c9 100644
> --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
> +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
> @@ -506,6 +506,7 @@ int UVCCameraData::init(MediaDevice *media)
>  	 * Until then, treat all UVC cameras as external.
>  	 */
>  	properties_.set(properties::Location, properties::CameraLocationExternal);
> +	properties_.set(properties::Model, utils::toAscii(media->model()));
>  
>  	/* Initialise the supported controls. */
>  	ControlInfoMap::Map ctrls;

Patch

diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
index bf12189d1044cdfc..335f0efcc1eb31c9 100644
--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
@@ -506,6 +506,7 @@  int UVCCameraData::init(MediaDevice *media)
 	 * Until then, treat all UVC cameras as external.
 	 */
 	properties_.set(properties::Location, properties::CameraLocationExternal);
+	properties_.set(properties::Model, utils::toAscii(media->model()));
 
 	/* Initialise the supported controls. */
 	ControlInfoMap::Map ctrls;