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

libcamera: pipeline: raspberrypi: Fix scaler crop when sensor is configured

Browse Source 
We must calculate the initial scaler crop when the camera is
configured, otherwise the metadata will report this rectangle as being
all zeroes.

Because the calculation is identical to that performed later in handling
the scaler crop control, we factor it into a small helper function,
RPiCameraData::scaleIspCrop.

Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Naushir Patuck <naush@raspberrypi.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
2022-03-03 12:11:13 +00:00
committed by Kieran Bingham
parent e68e0f1ed2
commit cdad084a91
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+20 -3
View File
@@ -212,6 +212,7 @@ public:
void handleStreamBuffer(FrameBuffer *buffer, RPi::Stream *stream);
void handleExternalBuffer(FrameBuffer *buffer, RPi::Stream *stream);
void handleState();
Rectangle scaleIspCrop(const Rectangle &ispCrop) const;
void applyScalerCrop(const ControlList &controls);
std::unique_ptr<ipa::RPi::IPAProxyRPi> ipa_;
@@ -887,6 +888,12 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)
if (ret)
LOG(RPI, Error) << "Failed to configure the IPA: " << ret;
/*
* Set the scaler crop to the value we are using (scaled to native sensor
* coordinates).
*/
data->scalerCrop_ = data->scaleIspCrop(data->ispCrop_);
/*
* Configure the Unicam embedded data output format only if the sensor
* supports it.
@@ -1974,6 +1981,18 @@ void RPiCameraData::checkRequestCompleted()
}
}
Rectangle RPiCameraData::scaleIspCrop(const Rectangle &ispCrop) const
{
/*
* Scale a crop rectangle defined in the ISP's coordinates into native sensor
* coordinates.
*/
Rectangle nativeCrop = ispCrop.scaledBy(sensorInfo_.analogCrop.size(),
sensorInfo_.outputSize);
nativeCrop.translateBy(sensorInfo_.analogCrop.topLeft());
return nativeCrop;
}
void RPiCameraData::applyScalerCrop(const ControlList &controls)
{
if (controls.contains(controls::ScalerCrop)) {
@@ -2006,9 +2025,7 @@ void RPiCameraData::applyScalerCrop(const ControlList &controls)
* used. But we must first rescale that from ISP (camera mode) pixels
* back into sensor native pixels.
*/
scalerCrop_ = ispCrop_.scaledBy(sensorInfo_.analogCrop.size(),
sensorInfo_.outputSize);
scalerCrop_.translateBy(sensorInfo_.analogCrop.topLeft());
scalerCrop_ = scaleIspCrop(ispCrop_);
}
}
}