[libcamera-devel] [PATCH 1/2] libcamera: pipeline: vivid: Set camera properties

Kieran Bingham kieran.bingham at ideasonboard.com
Tue Nov 3 16:29:25 CET 2020


Hi Laurent,

On 03/11/2020 13:30, Laurent Pinchart wrote:
> Initialize the CameraData properties with Location and Model.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  src/libcamera/pipeline/vivid/vivid.cpp | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/src/libcamera/pipeline/vivid/vivid.cpp b/src/libcamera/pipeline/vivid/vivid.cpp
> index 67b0d85b6629..bf8f82af981f 100644
> --- a/src/libcamera/pipeline/vivid/vivid.cpp
> +++ b/src/libcamera/pipeline/vivid/vivid.cpp
> @@ -11,6 +11,7 @@
>  #include <libcamera/control_ids.h>
>  #include <libcamera/controls.h>
>  #include <libcamera/formats.h>
> +#include <libcamera/property_ids.h>
>  
>  #include "libcamera/internal/device_enumerator.h"
>  #include "libcamera/internal/log.h"
> @@ -336,7 +337,7 @@ int VividCameraData::init()
>  
>  	video_->bufferReady.connect(this, &VividCameraData::bufferReady);
>  
> -	/* Initialise the supported controls. */
> +	/* Initialise the supported controls and properties. */
>  	const ControlInfoMap &controls = video_->controls();
>  	ControlInfoMap::Map ctrls;
>  
> @@ -366,6 +367,9 @@ int VividCameraData::init()
>  
>  	controlInfo_ = std::move(ctrls);
>  
> +	properties_.set(properties::Location, properties::CameraLocationExternal);

Haha - indeed it's external ;-)
I like that this will differ from Vimc ...

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

I'll add this to my branch.


It may end up squashed down in the future, but if so that will be as
part of updating the pipeline handler guide. Since disallowing unused
variables, the vivid series is no longer individually compilable anyway
(though the breakdown still serves a useful guide in it's own right).

--
Kieran


> +	properties_.set(properties::Model, "Virtual Video Device");
> +
>  	return 0;
>  }
>  
> 

-- 
Regards
--
Kieran


More information about the libcamera-devel mailing list