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

pipeline: rkisp1: Fix config validation when dewarper is used

Browse source 
When the dewarper is used, config->validate() needs to take the
restrictions of the dewarper into account. Add the corresponding checks.

As the useDewarper_ variable is now accessed earlier in
PipelineHandlerRkISP1::configure(), ensure it gets set early enough.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@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:58 +01:00
parent d4487f690f
commit 041377839b
1 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -497,6 +497,7 @@ bool RkISP1CameraConfiguration::fitsAllPaths(const StreamConfiguration &cfg)
CameraConfiguration::Status RkISP1CameraConfiguration::validate() CameraConfiguration::Status RkISP1CameraConfiguration::validate()
{ {
const PipelineHandlerRkISP1 *pipe = data_->pipe();
const CameraSensor *sensor = data_->sensor_.get(); const CameraSensor *sensor = data_->sensor_.get();
unsigned int pathCount = data_->selfPath_ ? 2 : 1; unsigned int pathCount = data_->selfPath_ ? 2 : 1;
Status status; Status status;
@ -553,6 +554,18 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()
} }
} }
bool useDewarper = false;
if (pipe->dewarper_) {
/*
* Platforms with dewarper support, such as i.MX8MP, support
* only a single stream. We can inspect config_[0] only here.
*/
bool isRaw = PixelFormatInfo::info(config_[0].pixelFormat).colourEncoding ==
PixelFormatInfo::ColourEncodingRAW;
if (!isRaw)
useDewarper = true;
}
/* /*
* If there are more than one stream in the configuration figure out the * If there are more than one stream in the configuration figure out the
* order to evaluate the streams. The first stream has the highest * order to evaluate the streams. The first stream has the highest
@ -565,12 +578,31 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()
if (config_.size() == 2 && fitsAllPaths(config_[0])) if (config_.size() == 2 && fitsAllPaths(config_[0]))
std::reverse(order.begin(), order.end()); std::reverse(order.begin(), order.end());
/*
* Validate the configuration against the desired path and, if the
* platform supports it, the dewarper.
*/
auto validateConfig = [&](StreamConfiguration &cfg, RkISP1Path *path, auto validateConfig = [&](StreamConfiguration &cfg, RkISP1Path *path,
Stream *stream, Status expectedStatus) { Stream *stream, Status expectedStatus) {
StreamConfiguration tryCfg = cfg; StreamConfiguration tryCfg = cfg;
if (path->validate(sensor, sensorConfig, &tryCfg) != expectedStatus)
Status ret = path->validate(sensor, sensorConfig, &tryCfg);
if (ret == Invalid)
return false; return false;
if (!useDewarper &&
(expectedStatus == Valid && ret == Adjusted))
return false;
if (useDewarper) {
bool adjusted;
pipe->dewarper_->validateOutput(&tryCfg, &adjusted,
Converter::Alignment::Down);
if (expectedStatus == Valid && adjusted)
return false;
}
cfg = tryCfg; cfg = tryCfg;
cfg.setStream(stream); cfg.setStream(stream);
return true; return true;
@ -820,6 +852,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
const PixelFormat &streamFormat = config->at(0).pixelFormat; const PixelFormat &streamFormat = config->at(0).pixelFormat;
const PixelFormatInfo &info = PixelFormatInfo::info(streamFormat); const PixelFormatInfo &info = PixelFormatInfo::info(streamFormat);
isRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW; isRaw_ = info.colourEncoding == PixelFormatInfo::ColourEncodingRAW;
useDewarper_ = dewarper_ && !isRaw_;
/* YUYV8_2X8 is required on the ISP source path pad for YUV output. */ /* YUYV8_2X8 is required on the ISP source path pad for YUV output. */
if (!isRaw_) if (!isRaw_)
@ -832,8 +865,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
if (media_->hwRevision() == RKISP1_V_IMX8MP) { if (media_->hwRevision() == RKISP1_V_IMX8MP) {
/* imx8mp has only a single path. */ /* imx8mp has only a single path. */
const auto &cfg = config->at(0); const auto &cfg = config->at(0);
Size ispCrop = format.size.boundedToAspectRatio(cfg.size) Size ispCrop = format.size.boundedToAspectRatio(cfg.size);
.alignedUpTo(2, 2); if (useDewarper_)
ispCrop = dewarper_->adjustInputSize(cfg.pixelFormat,
ispCrop);
else
ispCrop.alignUpTo(2, 2);
outputCrop = ispCrop.centeredTo(Rectangle(format.size).center()); outputCrop = ispCrop.centeredTo(Rectangle(format.size).center());
format.size = ispCrop; format.size = ispCrop;
} }
@ -875,8 +913,6 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
if (ret) if (ret)
return ret; return ret;
useDewarper_ = true;
/* /*
* Calculate the crop rectangle of the data * Calculate the crop rectangle of the data
* flowing into the dewarper in sensor * flowing into the dewarper in sensor