diff --git a/include/libcamera/internal/converter.h b/include/libcamera/internal/converter.h index 4b811686..08e80a22 100644 --- a/include/libcamera/internal/converter.h +++ b/include/libcamera/internal/converter.h @@ -71,7 +71,7 @@ public: Alignment align = Alignment::Down) = 0; virtual int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs) = 0; + const std::vector> &outputCfgs) = 0; virtual bool isConfigured(const Stream *stream) const = 0; virtual int exportBuffers(const Stream *stream, unsigned int count, std::vector> *buffers) = 0; diff --git a/include/libcamera/internal/converter/converter_dw100.h b/include/libcamera/internal/converter/converter_dw100.h index d70c8fe7..0a41b180 100644 --- a/include/libcamera/internal/converter/converter_dw100.h +++ b/include/libcamera/internal/converter/converter_dw100.h @@ -34,7 +34,7 @@ public: int init(const YamlObject ¶ms); int configure(const StreamConfiguration &inputCfg, - const std::vector> + const std::vector> &outputCfg); bool isConfigured(const Stream *stream) const; diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h index 6d2453bb..63cea6b0 100644 --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h @@ -54,7 +54,7 @@ public: const Size &size, Alignment align = Alignment::Down) override; int configure(const StreamConfiguration &inputCfg, - const std::vector> + const std::vector> &outputCfg) override; bool isConfigured(const Stream *stream) const override; int exportBuffers(const Stream *stream, unsigned int count, diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h index ad89c9b3..585e0d6d 100644 --- a/include/libcamera/internal/software_isp/software_isp.h +++ b/include/libcamera/internal/software_isp/software_isp.h @@ -64,7 +64,7 @@ public: strideAndFrameSize(const PixelFormat &outputFormat, const Size &size); int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, const ipa::soft::IPAConfigInfo &configInfo); int exportBuffers(const Stream *stream, unsigned int count, diff --git a/src/libcamera/converter/converter_dw100.cpp b/src/libcamera/converter/converter_dw100.cpp index df5155cf..7899fe8c 100644 --- a/src/libcamera/converter/converter_dw100.cpp +++ b/src/libcamera/converter/converter_dw100.cpp @@ -142,7 +142,7 @@ int ConverterDW100Module::init(const YamlObject ¶ms) * \copydoc libcamera::V4L2M2MConverter::configure */ int ConverterDW100Module::configure(const StreamConfiguration &inputCfg, - const std::vector> + const std::vector> &outputCfgs) { int ret; diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp index 4427a37c..ffba0434 100644 --- a/src/libcamera/converter/converter_v4l2_m2m.cpp +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp @@ -548,7 +548,7 @@ Size V4L2M2MConverter::adjustSizes(const Size &cfgSize, * \copydoc libcamera::Converter::configure */ int V4L2M2MConverter::configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs) + const std::vector> &outputCfgs) { int ret = 0; diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 320a4dc5..faeeecd9 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -1037,7 +1037,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c) data->properties_.set(properties::ScalerCropMaximum, sensorCrop); std::map streamConfig; - std::vector> outputCfgs; + std::vector> outputCfgs; for (const StreamConfiguration &cfg : *config) { if (cfg.stream() == &data->mainPathStream_) { diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index c2fe8351..812ff796 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -1562,7 +1562,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c) } /* Configure the converter if needed. */ - std::vector> outputCfgs; + std::vector> outputCfgs; data->useConversion_ = config->needConversion(); data->rawStream_ = nullptr; diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index ce9350b7..ea1ec6dc 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -39,7 +39,7 @@ public: virtual ~Debayer() = 0; virtual int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, bool ccmEnabled) = 0; virtual std::vector formats(PixelFormat inputFormat) = 0; diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 1de70b3b..dd0fff87 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -540,7 +540,7 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, } int DebayerCpu::configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, bool ccmEnabled) { if (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0) diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h index 9bd20820..05fecc8f 100644 --- a/src/libcamera/software_isp/debayer_cpu.h +++ b/src/libcamera/software_isp/debayer_cpu.h @@ -35,7 +35,7 @@ public: ~DebayerCpu(); int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, bool ccmEnabled); Size patternSize(PixelFormat inputFormat); std::vector formats(PixelFormat input); diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 8147eca1..2ad258bc 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -277,7 +277,7 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm } int DebayerEGL::configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, [[maybe_unused]] bool ccmEnabled) { if (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0) @@ -307,7 +307,7 @@ int DebayerEGL::configure(const StreamConfiguration &inputCfg, return -EINVAL; } - StreamConfiguration &outputCfg = outputCfgs[0]; + const StreamConfiguration &outputCfg = outputCfgs[0]; SizeRange outSizeRange = sizes(inputCfg.pixelFormat, inputCfg.size); std::tie(outputConfig_.stride, outputConfig_.frameSize) = strideAndFrameSize(outputCfg.pixelFormat, outputCfg.size); diff --git a/src/libcamera/software_isp/debayer_egl.h b/src/libcamera/software_isp/debayer_egl.h index d4c1fa31..bdde676f 100644 --- a/src/libcamera/software_isp/debayer_egl.h +++ b/src/libcamera/software_isp/debayer_egl.h @@ -42,7 +42,7 @@ public: ~DebayerEGL(); int configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, bool ccmEnabled); Size patternSize(PixelFormat inputFormat); diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index 4cf5639d..60228369 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -262,7 +262,7 @@ SoftwareIsp::strideAndFrameSize(const PixelFormat &outputFormat, const Size &siz * \return 0 on success, a negative errno on failure */ int SoftwareIsp::configure(const StreamConfiguration &inputCfg, - const std::vector> &outputCfgs, + const std::vector> &outputCfgs, const ipa::soft::IPAConfigInfo &configInfo) { ASSERT(ipa_ && debayer_);