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

libcamera: pipeline: raspberrypi: Revert "Set sensor default orientation before configure()"

Browse Source 
This reverts commit 1e8c91b656.

Now that we shall be implementing application-defined 2D transforms
it's no longer possible to set the sensor orientation so early on. We
have to wait until we have the CameraConfiguration object as that's
where the application puts its choice of transform.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
David Plowman
2020-09-07 08:15:56 +01:00
committed by Kieran Bingham
parent de20d00455
commit 15a98fab79
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+7 -7
View File
@@ -841,13 +841,6 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)
/* Initialize the camera properties. */
data->properties_ = data->sensor_->properties();
/* Configure the H/V flip controls based on the sensor rotation. */
ControlList ctrls(data->unicam_[Unicam::Image].dev()->controls());
int32_t rotation = data->properties_.get(properties::Rotation);
ctrls.set(V4L2_CID_HFLIP, static_cast<int32_t>(!!rotation));
ctrls.set(V4L2_CID_VFLIP, static_cast<int32_t>(!!rotation));
data->unicam_[Unicam::Image].dev()->setControls(&ctrls);
/*
* List the available streams an application may request. At present, we
* do not advertise Unicam Embedded and ISP Statistics streams, as there
@@ -1046,6 +1039,13 @@ int RPiCameraData::configureIPA()
{ V4L2_CID_EXPOSURE, result.data[resultIdx++] } });
sensorMetadata_ = result.data[resultIdx++];
}
/* Configure the H/V flip controls based on the sensor rotation. */
ControlList ctrls(unicam_[Unicam::Image].dev()->controls());
int32_t rotation = sensor_->properties().get(properties::Rotation);
ctrls.set(V4L2_CID_HFLIP, static_cast<int32_t>(!!rotation));
ctrls.set(V4L2_CID_VFLIP, static_cast<int32_t>(!!rotation));
unicam_[Unicam::Image].dev()->setControls(&ctrls);
}
if (result.operation & RPI_IPA_CONFIG_SENSOR) {