diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 59a1604c..f6ef4df1 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -54,7 +54,7 @@ public: virtual Size resolution() const = 0; virtual V4L2SubdeviceFormat - getFormat(const std::vector &mbusCodes, + getFormat(Span mbusCodes, const Size &size, const Size maxSize = Size()) const = 0; virtual int setFormat(V4L2SubdeviceFormat *format, Transform transform = Transform::Identity) = 0; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp index 8ea5500d..d318bea9 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp @@ -7,6 +7,8 @@ #include "rkisp1_path.h" +#include + #include #include @@ -341,7 +343,7 @@ RkISP1Path::validate(const CameraSensor *sensor, : cfg->size; V4L2SubdeviceFormat sensorFormat = - sensor->getFormat({ mbusCode }, rawSize); + sensor->getFormat(std::array{ mbusCode }, rawSize); if (sensorConfig && sensorConfig->outputSize != sensorFormat.size) @@ -362,7 +364,7 @@ RkISP1Path::validate(const CameraSensor *sensor, uint32_t mbusCode = formatToMediaBus.at(rawFormat); V4L2SubdeviceFormat sensorFormat = - sensor->getFormat({ mbusCode }, sensorSize); + sensor->getFormat(std::array{ mbusCode }, sensorSize); if (sensorFormat.size != sensorSize) return CameraConfiguration::Invalid; diff --git a/src/libcamera/sensor/camera_sensor_legacy.cpp b/src/libcamera/sensor/camera_sensor_legacy.cpp index 0b0790ea..f9e685a9 100644 --- a/src/libcamera/sensor/camera_sensor_legacy.cpp +++ b/src/libcamera/sensor/camera_sensor_legacy.cpp @@ -73,7 +73,7 @@ public: std::vector sizes(unsigned int mbusCode) const override; Size resolution() const override; - V4L2SubdeviceFormat getFormat(const std::vector &mbusCodes, + V4L2SubdeviceFormat getFormat(Span mbusCodes, const Size &size, const Size maxSize) const override; int setFormat(V4L2SubdeviceFormat *format, @@ -699,7 +699,7 @@ Size CameraSensorLegacy::resolution() const } V4L2SubdeviceFormat -CameraSensorLegacy::getFormat(const std::vector &mbusCodes, +CameraSensorLegacy::getFormat(Span mbusCodes, const Size &size, Size maxSize) const { unsigned int desiredArea = size.width * size.height; diff --git a/src/libcamera/sensor/camera_sensor_raw.cpp b/src/libcamera/sensor/camera_sensor_raw.cpp index b9e5b19a..8ea44236 100644 --- a/src/libcamera/sensor/camera_sensor_raw.cpp +++ b/src/libcamera/sensor/camera_sensor_raw.cpp @@ -74,7 +74,7 @@ public: std::vector sizes(unsigned int mbusCode) const override; Size resolution() const override; - V4L2SubdeviceFormat getFormat(const std::vector &mbusCodes, + V4L2SubdeviceFormat getFormat(Span mbusCodes, const Size &size, const Size maxSize) const override; int setFormat(V4L2SubdeviceFormat *format, @@ -757,7 +757,7 @@ Size CameraSensorRaw::resolution() const } V4L2SubdeviceFormat -CameraSensorRaw::getFormat(const std::vector &mbusCodes, +CameraSensorRaw::getFormat(Span mbusCodes, const Size &size, Size maxSize) const { unsigned int desiredArea = size.width * size.height; diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index 869c7889..c30a2212 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -96,10 +96,13 @@ protected: } /* Use an invalid format and make sure it's not selected. */ - V4L2SubdeviceFormat format = sensor_->getFormat({ 0xdeadbeef, - MEDIA_BUS_FMT_SBGGR10_1X10, - MEDIA_BUS_FMT_BGR888_1X24 }, - Size(1024, 768)); + static constexpr uint32_t mbusCodes[] = { + 0xdeadbeef, + MEDIA_BUS_FMT_SBGGR10_1X10, + MEDIA_BUS_FMT_BGR888_1X24, + }; + + V4L2SubdeviceFormat format = sensor_->getFormat(mbusCodes, Size(1024, 768)); if (format.code != MEDIA_BUS_FMT_SBGGR10_1X10 || format.size != Size(4096, 2160)) { cerr << "Failed to get a suitable format, expected 4096x2160-0x"