[libcamera-devel] [PATCH] pipeline: raspberrypi: Improve the values reported in the ScalerCrop control

[Naushir Patuck]

Hi David,

Thank you for this fix!

On Thu, 12 Jan 2023 at 11:06, David Plowman via libcamera-devel <
libcamera-devel at lists.libcamera.org> wrote:

> Previously the x,y offsets in the min/max ScalerCrop control values
> were zero. Here we make them the same as the sensor's analogue crop
> offset which is I think less misleading.
>
> With this change, it also seems reasonable to advertise the default
> scaler crop value to be the true default that you will get. This makes
> it possible for applications to see what that value will be without
> having to start the camera and wait for frames.
>
> Signed-off-by: David Plowman <david.plowman at raspberrypi.com>
>

Reviewed-by: Naushir Patuck <naush at raspberrypi.com>


> ---
>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> index 8569df17..809af4d2 100644
> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> @@ -905,6 +905,7 @@ int PipelineHandlerRPi::configure(Camera *camera,
> CameraConfiguration *config)
>         /* Adjust aspect ratio by providing crops on the input image. */
>         Size size = unicamFormat.size.boundedToAspectRatio(maxSize);
>         Rectangle crop =
> size.centeredTo(Rectangle(unicamFormat.size).center());
> +       Rectangle defaultCrop = crop;
>         data->ispCrop_ = crop;
>
>         data->isp_[Isp::Input].dev()->setSelection(V4L2_SEL_TGT_CROP,
> &crop);
> @@ -958,9 +959,9 @@ int PipelineHandlerRPi::configure(Camera *camera,
> CameraConfiguration *config)
>                 ctrlMap.emplace(c.first, c.second);
>
>         /* Add the ScalerCrop control limits based on the current mode. */
> -       Rectangle ispMinCrop(data->ispMinCropSize_);
> -       ispMinCrop.scaleBy(data->sensorInfo_.analogCrop.size(),
> data->sensorInfo_.outputSize);
> -       ctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop,
> Rectangle(data->sensorInfo_.analogCrop.size()));
> +       Rectangle ispMinCrop =
> data->scaleIspCrop(Rectangle(data->ispMinCropSize_));
> +       defaultCrop = data->scaleIspCrop(defaultCrop);
> +       ctrlMap[&controls::ScalerCrop] = ControlInfo(ispMinCrop,
> data->sensorInfo_.analogCrop, defaultCrop);
>
>         data->controlInfo_ = ControlInfoMap(std::move(ctrlMap),
> result.controlInfo.idmap());
>
> --
> 2.30.2
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.libcamera.org/pipermail/libcamera-devel/attachments/20230112/433e90a4/attachment.htm>