PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Remove transform from V4L2SubdeviceFormat

Browse Source 
Commit 6f6e1bf704 ("libcamera: camera_sensor: Apply flips at
setFormat()") extended the CameraSensor::setFormat() function
to apply vertical/horizontal flips on the sensor based on the
supplied Transform. To pass the Transform to the function the
V4L2SubdeviceFormat structure has been augmented with a Transform
member.

However as the newly added Transform is not used at all in the
V4L2Subdevice class, it should not be part of V4L2SubdeviceFormat.

Fix that by removing the transform field from V4L2SubdeviceFormat
and pass it as an explicit parameter to CameraSensor::setFormat().

Fixes: 6f6e1bf704 ("libcamera: camera_sensor: Apply flips at setFormat())
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Jacopo Mondi
2023-02-06 19:21:32 +01:00
parent 3aa42f36c0
commit 85befa816e
7 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View File

@@ -832,13 +832,14 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
}
}
/* First calculate the best sensor mode we can use based on the user request. */
/*
* Calculate the best sensor mode we can use based on the user's
* request, and apply it to the sensor with the cached transform, if
* any.
*/
V4L2SubdeviceFormat sensorFormat = findBestFormat(data->sensorFormats_, rawStream ? sensorSize : maxSize, bitDepth);
/* Apply any cached transform. */
const RPiCameraConfiguration *rpiConfig = static_cast<const RPiCameraConfiguration *>(config);
sensorFormat.transform = rpiConfig->combinedTransform_;
/* Finally apply the format on the sensor. */
ret = data->sensor_->setFormat(&sensorFormat);
ret = data->sensor_->setFormat(&sensorFormat, rpiConfig->combinedTransform_);
if (ret)
return ret;