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

libcamera: camera_sensor: Drop updateControlInfo() function

Browse source 
The CameraSensor::updateControlInfo() function is a wrapper around the
same function of the V4L2Subdevice class. It was meant to be called by
pipeline handlers that modify the sensor configuration directly,
bypassing the CameraSensor::setFormat() function. This never happened,
and the function is called once only, internally to the CameraSensor
class. No external users are foreseen, drop the function and call
V4L2Subdevice::updateControlInfo() directly.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2024-02-09 11:49:56 +02:00
parent 2a0baf47eb
commit 9b1a2a8c8b
2 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,8 +75,6 @@ public:
const ControlList &properties() const { return properties_; } const ControlList &properties() const { return properties_; }
int sensorInfo(IPACameraSensorInfo *info) const; int sensorInfo(IPACameraSensorInfo *info) const;
void updateControlInfo();
CameraLens *focusLens() { return focusLens_.get(); } CameraLens *focusLens() { return focusLens_.get(); }
Transform computeTransform(Orientation *orientation) const; Transform computeTransform(Orientation *orientation) const;

20
src/libcamera/sensor/camera_sensor.cpp
View file

@ -814,7 +814,7 @@ int CameraSensor::setFormat(V4L2SubdeviceFormat *format, Transform transform)
if (ret) if (ret)
return ret; return ret;
updateControlInfo(); subdev_->updateControlInfo();
return 0; return 0;
} }
@ -924,9 +924,7 @@ int CameraSensor::applyConfiguration(const SensorConfiguration &config,
* *
* Control information is updated automatically to reflect the current sensor * Control information is updated automatically to reflect the current sensor
* configuration when the setFormat() function is called, without invalidating * configuration when the setFormat() function is called, without invalidating
* any iterator on the ControlInfoMap. A manual update can also be forced by * any iterator on the ControlInfoMap.
* calling the updateControlInfo() function for pipeline handlers that change
* the sensor configuration wihtout using setFormat().
* *
* \return A map of the V4L2 controls supported by the sensor * \return A map of the V4L2 controls supported by the sensor
*/ */
@ -1013,10 +1011,6 @@ int CameraSensor::setControls(ControlList *ctrls)
* Sensor information is only available for raw sensors. When called for a YUV * Sensor information is only available for raw sensors. When called for a YUV
* sensor, this function returns -EINVAL. * sensor, this function returns -EINVAL.
* *
* Pipeline handlers that do not change the sensor format using the setFormat()
* function may need to call updateControlInfo() beforehand, to ensure all the
* control ranges are up to date.
*
* \return 0 on success, a negative error code otherwise * \return 0 on success, a negative error code otherwise
*/ */
int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const
@ -1094,16 +1088,6 @@ int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const
return 0; return 0;
} }
/**
* \fn void CameraSensor::updateControlInfo()
* \brief Update the sensor's ControlInfoMap in case they have changed
* \sa V4L2Device::updateControlInfo()
*/
void CameraSensor::updateControlInfo()
{
subdev_->updateControlInfo();
}
/** /**
* \fn CameraSensor::focusLens() * \fn CameraSensor::focusLens()
* \brief Retrieve the focus lens controller * \brief Retrieve the focus lens controller