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

libcamera: pipeline: simple: fix size adjustment in validate()

Browse Source 
SimpleCameraConfiguration::validate() adjusts the configuration of its
streams (if the size is not in the outputSizes) to the captureSize. But
the captureSize itself can be not in the outputSizes, and then the
adjusted configuration won't be valid resulting in camera configuration
failure.

Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s
Tested-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Andrey Konovalov
2024-04-16 11:13:37 +02:00
committed by Kieran Bingham
parent 1c5830a9a4
commit d89b15a612
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/libcamera/pipeline/simple/simple.cpp
View File

@@ -882,6 +882,33 @@ SimpleCameraConfiguration::SimpleCameraConfiguration(Camera *camera,
{
}
namespace {
static Size adjustSize(const Size &requestedSize, const SizeRange &supportedSizes)
{
ASSERT(supportedSizes.min <= supportedSizes.max);
if (supportedSizes.min == supportedSizes.max)
return supportedSizes.max;
unsigned int hStep = supportedSizes.hStep;
unsigned int vStep = supportedSizes.vStep;
if (hStep == 0)
hStep = supportedSizes.max.width - supportedSizes.min.width;
if (vStep == 0)
vStep = supportedSizes.max.height - supportedSizes.min.height;
Size adjusted = requestedSize.boundedTo(supportedSizes.max)
.expandedTo(supportedSizes.min);
return adjusted.shrunkBy(supportedSizes.min)
.alignedDownTo(hStep, vStep)
.grownBy(supportedSizes.min);
}
} /* namespace */
CameraConfiguration::Status SimpleCameraConfiguration::validate()
{
const CameraSensor *sensor = data_->sensor_.get();
@@ -998,10 +1025,19 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
}
if (!pipeConfig_->outputSizes.contains(cfg.size)) {
Size adjustedSize = pipeConfig_->captureSize;
/*
* The converter (when present) may not be able to output
* a size identical to its input size. The capture size is thus
* not guaranteed to be a valid output size. In such cases, use
* the smaller valid output size closest to the requested.
*/
if (!pipeConfig_->outputSizes.contains(adjustedSize))
adjustedSize = adjustSize(cfg.size, pipeConfig_->outputSizes);
LOG(SimplePipeline, Debug)
<< "Adjusting size from " << cfg.size
<< " to " << pipeConfig_->captureSize;
cfg.size = pipeConfig_->captureSize;
<< " to " << adjustedSize;
cfg.size = adjustedSize;
status = Adjusted;
}