summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-02-09 11:49:56 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-03-15 13:00:58 +0200
commit9b1a2a8c8b89b2c56afc155c67c78baefee19d28 (patch)
tree1175423dae473b3bf49fd0f4508414392c2dfe71
parent2a0baf47eb8a336f8378044dbeda9e7873a57d25 (diff)
libcamera: camera_sensor: Drop updateControlInfo() function
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>
-rw-r--r--include/libcamera/internal/camera_sensor.h2
-rw-r--r--src/libcamera/sensor/camera_sensor.cpp20
2 files changed, 2 insertions, 20 deletions
diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
index 60a8b106..b2f077b9 100644
--- a/include/libcamera/internal/camera_sensor.h
+++ b/include/libcamera/internal/camera_sensor.h
@@ -75,8 +75,6 @@ public:
const ControlList &properties() const { return properties_; }
int sensorInfo(IPACameraSensorInfo *info) const;
- void updateControlInfo();
-
CameraLens *focusLens() { return focusLens_.get(); }
Transform computeTransform(Orientation *orientation) const;
diff --git a/src/libcamera/sensor/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp
index af5d97f3..545f89d0 100644
--- a/src/libcamera/sensor/camera_sensor.cpp
+++ b/src/libcamera/sensor/camera_sensor.cpp
@@ -814,7 +814,7 @@ int CameraSensor::setFormat(V4L2SubdeviceFormat *format, Transform transform)
if (ret)
return ret;
- updateControlInfo();
+ subdev_->updateControlInfo();
return 0;
}
@@ -924,9 +924,7 @@ int CameraSensor::applyConfiguration(const SensorConfiguration &config,
*
* Control information is updated automatically to reflect the current sensor
* configuration when the setFormat() function is called, without invalidating
- * any iterator on the ControlInfoMap. A manual update can also be forced by
- * calling the updateControlInfo() function for pipeline handlers that change
- * the sensor configuration wihtout using setFormat().
+ * any iterator on the ControlInfoMap.
*
* \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, 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
*/
int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const
@@ -1095,16 +1089,6 @@ int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const
}
/**
- * \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()
* \brief Retrieve the focus lens controller
*