[RFC,v1,11/27] libcamera: pipeline: rkisp1: Simplify dewarper configuration

26975 diff mbox series

There is no need for to define a separate vector, initializing the
argument in the call expression works. So do that.

Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
---
 src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

On Thu, Jun 18, 2026 at 02:38:28PM +0200, Barnabás Pőcze wrote:
> There is no need for to define a separate vector, initializing the
> argument in the call expression works. So do that.
>
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index 9606459fc2..4f9c0aa741 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -1042,7 +1042,6 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
>  	data->properties_.set(properties::ScalerCropMaximum, sensorCrop);
>
>  	std::map<unsigned int, IPAStream> streamConfig;
> -	std::vector<std::reference_wrapper<const StreamConfiguration>> outputCfgs;
>
>  	for (const StreamConfiguration &cfg : *config) {
>  		if (cfg.stream() == &data->mainPathStream_) {
> @@ -1053,15 +1052,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
>  			 */
>  			StreamConfiguration ispCfg = cfg;
>  			if (data->usesDewarper_) {
> -				outputCfgs.push_back(const_cast<StreamConfiguration &>(cfg));
> -
>  				ispCfg.bufferCount = kRkISP1MinBufferCount;
>  				ispCfg.size = format.size;
>  				ispCfg.stride =
>  					PixelFormatInfo::info(ispCfg.pixelFormat)
>  						.stride(ispCfg.size.width, 0);
>
> -				ret = dewarper_->configure(ispCfg, outputCfgs);
> +				ret = dewarper_->configure(ispCfg, { cfg });
>  				if (ret)
>  					return ret;
>
> --
> 2.54.0
>

On Thu, Jun 18, 2026 at 02:38:28PM +0200, Barnabás Pőcze wrote:
> There is no need for to define a separate vector, initializing the
> argument in the call expression works. So do that.
> 
> Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>

Assuming this passes CI,

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  src/libcamera/pipeline/rkisp1/rkisp1.cpp | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> index 9606459fc2..4f9c0aa741 100644
> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
> @@ -1042,7 +1042,6 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
>  	data->properties_.set(properties::ScalerCropMaximum, sensorCrop);
>  
>  	std::map<unsigned int, IPAStream> streamConfig;
> -	std::vector<std::reference_wrapper<const StreamConfiguration>> outputCfgs;
>  
>  	for (const StreamConfiguration &cfg : *config) {
>  		if (cfg.stream() == &data->mainPathStream_) {
> @@ -1053,15 +1052,13 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)
>  			 */
>  			StreamConfiguration ispCfg = cfg;
>  			if (data->usesDewarper_) {
> -				outputCfgs.push_back(const_cast<StreamConfiguration &>(cfg));
> -
>  				ispCfg.bufferCount = kRkISP1MinBufferCount;
>  				ispCfg.size = format.size;
>  				ispCfg.stride =
>  					PixelFormatInfo::info(ispCfg.pixelFormat)
>  						.stride(ispCfg.size.width, 0);
>  
> -				ret = dewarper_->configure(ispCfg, outputCfgs);
> +				ret = dewarper_->configure(ispCfg, { cfg });
>  				if (ret)
>  					return ret;
>