NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

pipeline: rpi: Track which ISP output is configured for a stream

Browse source 
Add a ispIndex field to CropParams that is used to track
which ISP output (0/1) will be used for a given stream during
configuration.

Tracking this information is required for an upcoming change where crop
rectangles can be specified for each configured stream. Currently, the
value is fixed to 0.

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:55 +00:00 • committed by Laurent Pinchart
parent 81afca4078
commit d6a1d9596b
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libcamera/pipeline/rpi/common/pipeline_base.h
View file

@ -135,8 +135,8 @@ public:
IPACameraSensorInfo sensorInfo_;
struct CropParams {
CropParams(Rectangle ispCrop_, Size ispMinCropSize_)
: ispCrop(ispCrop_), ispMinCropSize(ispMinCropSize_)
CropParams(Rectangle ispCrop_, Size ispMinCropSize_, unsigned int ispIndex_)
: ispCrop(ispCrop_), ispMinCropSize(ispMinCropSize_), ispIndex(ispIndex_)
{
}
@ -144,6 +144,8 @@ public:
Rectangle ispCrop;
/* Minimum crop size in ISP output pixels */
Size ispMinCropSize;
/* Index of the ISP output channel for this crop */
unsigned int ispIndex;
};
/* Mapping of CropParams keyed by the output stream order in CameraConfiguration */

2
src/libcamera/pipeline/rpi/vc4/vc4.cpp
View file

@ -714,7 +714,7 @@ int Vc4CameraData::platformConfigure(const RPi::RPiCameraConfiguration *rpiConfi
*/
cropParams_.emplace(std::piecewise_construct,
std::forward_as_tuple(0),
std::forward_as_tuple(ispCrop, testCrop.size()));
std::forward_as_tuple(ispCrop, testCrop.size(), 0));
return 0;
}