NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: camera_sensor: Register static properties

Browse source 
Register static properties in the CameraSensor class by inspecting the
camera sensor properties database.

Static properties are overridden by properties retrieved from
the kernel interface at run-time if any overlap between the two
sets occurs.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2020-12-18 11:47:52 +01:00
parent a58a94e4c2
commit cdfcb05bed
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/libcamera/internal/camera_sensor.h
View file

@ -77,6 +77,7 @@ private:
int generateId();
int validateSensorDriver();
void initVimcDefaultProperties();
void initStaticProperties();
int initProperties();
const MediaEntity *entity_;

16
src/libcamera/camera_sensor.cpp
View file

@ -19,6 +19,7 @@
#include <libcamera/property_ids.h>
#include "libcamera/internal/bayer_format.h"
#include "libcamera/internal/camera_sensor_properties.h"
#include "libcamera/internal/formats.h"
#include "libcamera/internal/sysfs.h"
#include "libcamera/internal/utils.h"
@ -407,6 +408,16 @@ void CameraSensor::initVimcDefaultProperties()
activeArea_ = Rectangle(pixelArraySize_);
}
void CameraSensor::initStaticProperties()
{
const CameraSensorProperties *props = CameraSensorProperties::get(model_);
if (!props)
return;
/* Register the properties retrieved from the sensor database. */
properties_.set(properties::UnitCellSize, props->unitCellSize);
}
int CameraSensor::initProperties()
{
/*
@ -444,7 +455,10 @@ int CameraSensor::initProperties()
if (ret)
return ret;
/* Retrieve and store the camera sensor properties. */
/* Initialize the static properties from the sensor database. */
initStaticProperties();
/* Retrieve and register properties from the kernel interface. */
const ControlInfoMap &controls = subdev_->controls();
int32_t propertyValue;