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

pipeline: rkisp1: Reorder sensorInfo collection code

Browse source 
The sensorInfo (specifically the crop rectangle of the selected sensor
mode) is collected to be passed to the IPA later. In an upcoming patch
that data will also be needed for correct ScalerCrop handling. Move the
collection of the sensorInfo before the dewarper configuration step and
refactor the code a bit.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
This commit is contained in:
Stefan Klug 2024-12-16 16:40:45 +01:00
parent 169b65ce16
commit 60bb16695e
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -843,6 +843,11 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
<< "ISP output pad configured with " << format
<< " crop " << outputCrop;
IPACameraSensorInfo sensorInfo;
ret = data->sensor_->sensorInfo(&sensorInfo);
if (ret)
return ret;
std::map<unsigned int, IPAStream> streamConfig;
std::vector<std::reference_wrapper<StreamConfiguration>> outputCfgs;
@ -882,14 +887,9 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
return ret;
/* Inform IPA of stream configuration and sensor controls. */
ipa::rkisp1::IPAConfigInfo ipaConfig{};
ret = data->sensor_->sensorInfo(&ipaConfig.sensorInfo);
if (ret)
return ret;
ipaConfig.sensorControls = data->sensor_->controls();
ipaConfig.paramFormat = paramFormat.fourcc;
ipa::rkisp1::IPAConfigInfo ipaConfig{ sensorInfo,
data->sensor_->controls(),
paramFormat.fourcc };
ret = data->ipa_->configure(ipaConfig, streamConfig, &data->ipaControls_);
if (ret) {