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

pipeline: rpi: Pass ISP output index into platformSetIspCrop()

Browse Source 
At this point, the index is unused, but will be in a future commit where
we can set different crops on each ISP output.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2024-10-31 09:49:56 +00:00
committed by Laurent Pinchart
parent d6a1d9596b
commit 7154247b86
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcamera/pipeline/rpi/common/pipeline_base.cpp
View File

@@ -1321,7 +1321,7 @@ void CameraData::applyScalerCrop(const ControlList &controls)
if (ispCrop != cropParams.ispCrop) {
cropParams.ispCrop = ispCrop;
platformSetIspCrop(ispCrop);
platformSetIspCrop(cropParams.ispIndex, ispCrop);
}
}
}

2
src/libcamera/pipeline/rpi/common/pipeline_base.h
View File

@@ -83,7 +83,7 @@ public:
Rectangle scaleIspCrop(const Rectangle &ispCrop) const;
void applyScalerCrop(const ControlList &controls);
virtual void platformSetIspCrop(const Rectangle &ispCrop) = 0;
virtual void platformSetIspCrop(unsigned int index, const Rectangle &ispCrop) = 0;
void cameraTimeout();
void frameStarted(uint32_t sequence);

4
src/libcamera/pipeline/rpi/vc4/vc4.cpp
View File

@@ -109,7 +109,7 @@ public:
Config config_;
private:
void platformSetIspCrop(const Rectangle &ispCrop) override
void platformSetIspCrop([[maybe_unused]] unsigned int index, const Rectangle &ispCrop) override
{
Rectangle crop = ispCrop;
isp_[Isp::Input].dev()->setSelection(V4L2_SEL_TGT_CROP, &crop);
@@ -707,7 +707,7 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi
Size size = unicamFormat.size.boundedToAspectRatio(maxSize);
Rectangle ispCrop = size.centeredTo(Rectangle(unicamFormat.size).center());
platformSetIspCrop(ispCrop);
platformSetIspCrop(0, ispCrop);
/*
* Set the scaler crop to the value we are using (scaled to native sensor
* coordinates).