[libcamera-devel] [PATCH v4 7/9] libcamera: pipeline: raspberrypi: Fix bug in passing configuration to IPA

[Kieran Bingham]

Hi Naush,

On 20/07/2020 10:13, Naushir Patuck wrote:
> The counter was not incremented, so multiple streams would only pass the
> last stream config to the IPA.
> 
> Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund at ragnatech.se>

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> ---
>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> index dbc22521..c28fe997 100644
> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> @@ -976,14 +976,14 @@ int RPiCameraData::configureIPA()
>  	unicam_[Unicam::Image].dev()->getFormat(&sensorFormat);
>  	/* Inform IPA of stream configuration and sensor controls. */
>  	unsigned int i = 0;
> -	for (auto const &stream : isp_) {
> +	for (auto const &stream : isp_)
>  		if (stream.isExternal()) {
> -			streamConfig[i] = {
> +			streamConfig[i++] = {
>  				.pixelFormat = stream.configuration().pixelFormat,
>  				.size = stream.configuration().size
>  			};
>  		}
> -	}
> +

Hrm, I would have probably kept the outer scope braces on the for loop,
it only has a single scope statement, but it's more complex than a
single line.

Not sure if we have a defined rule on this for style, but I don't object
anyway...


>  	entityControls.emplace(0, unicam_[Unicam::Image].dev()->controls());
>  	entityControls.emplace(1, isp_[Isp::Input].dev()->controls());
>  
> 

-- 
Regards
--
Kieran