[libcamera-devel] [PATCH v2 08/20] libcamera: ipu3: Validate the stream combination
Jacopo Mondi
jacopo at jmondi.org
Thu Jul 9 10:41:16 CEST 2020
The IPU3 pipeline handler supports 2 processed RGB/YUV streams
and one RAW stream. Validate that the requested stream combination is
supported in the pipeline handler validate() implementation and return
an error in case it's not.
Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>
---
src/libcamera/pipeline/ipu3/ipu3.cpp | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 05e10ebb1a7d..9128e42d42ed 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -240,19 +240,37 @@ CameraConfiguration::Status IPU3CameraConfiguration::validate()
}
/*
- * Select the sensor format by collecting the maximum width and height
- * and picking the closest larger match, as the IPU3 can downscale
- * only. If no resolution is requested for any stream, or if no sensor
- * resolution is large enough, pick the largest one.
+ * Validate the requested stream configuration and select the sensor
+ * format by collecting the maximum width and height and picking the
+ * closest larger match, as the IPU3 can downscale only. If no
+ * resolution is requested for any stream, or if no sensor resolution is
+ * large enough, pick the largest one.
*/
+ unsigned int rawCount = 0;
+ unsigned int outCount = 0;
Size size;
for (const StreamConfiguration &cfg : config_) {
+ const PixelFormatInfo &info =
+ PixelFormatInfo::info(cfg.pixelFormat);
+
+ if (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)
+ rawCount++;
+ else
+ outCount++;
+
if (cfg.size.width > size.width)
size.width = cfg.size.width;
if (cfg.size.height > size.height)
size.height = cfg.size.height;
}
+ if (rawCount > 1 || outCount > 2) {
+ LOG(IPU3, Error)
+ << "Camera configuration not supported: "
+ << "the platform supports up to one raw stream and "
+ << "two processed ones.";
+ return Invalid;
+ }
/* Generate raw configuration from CIO2. */
cio2Configuration_ = data_->cio2_.generateConfiguration(size);
--
2.27.0
More information about the libcamera-devel
mailing list