Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-23 16:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipeline: raspberrypi: Sensor flips should be applied unconditionally

Browse source 
The code in pipeline_handler::start() that applies the flips were in a
block that was conditional on the RPi::IPA_CONFIG_STAGGERED_WRITE return
result. This should be applied unconditionally.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2020-10-02 10:08:07 +01:00 • committed by Kieran Bingham
parent 68c55b49c4
commit 0b427b8ecf
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -1172,19 +1172,6 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
{ V4L2_CID_EXPOSURE, result.data[resultIdx++] } }); { V4L2_CID_EXPOSURE, result.data[resultIdx++] } });
sensorMetadata_ = result.data[resultIdx++]; sensorMetadata_ = result.data[resultIdx++];
} }
/*
* Configure the H/V flip controls based on the combination of
* the sensor and user transform.
*/
if (supportsFlips_) {
ControlList ctrls(unicam_[Unicam::Image].dev()->controls());
ctrls.set(V4L2_CID_HFLIP,
static_cast<int32_t>(!!(rpiConfig->combinedTransform_ & Transform::HFlip)));
ctrls.set(V4L2_CID_VFLIP,
static_cast<int32_t>(!!(rpiConfig->combinedTransform_ & Transform::VFlip)));
unicam_[Unicam::Image].dev()->setControls(&ctrls);
}
} }
if (result.operation & RPi::IPA_CONFIG_SENSOR) { if (result.operation & RPi::IPA_CONFIG_SENSOR) {
@ -1198,6 +1185,19 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
dropFrameCount_ = result.data[resultIdx++]; dropFrameCount_ = result.data[resultIdx++];
} }
/*
* Configure the H/V flip controls based on the combination of
* the sensor and user transform.
*/
if (supportsFlips_) {
ControlList ctrls(unicam_[Unicam::Image].dev()->controls());
ctrls.set(V4L2_CID_HFLIP,
static_cast<int32_t>(!!(rpiConfig->combinedTransform_ & Transform::HFlip)));
ctrls.set(V4L2_CID_VFLIP,
static_cast<int32_t>(!!(rpiConfig->combinedTransform_ & Transform::VFlip)));
unicam_[Unicam::Image].dev()->setControls(&ctrls);
}
return 0; return 0;
} }