[libcamera-devel] [PATCH 2/3] libcamera: raspberrypi: Fail on unsupported stream role

Laurent Pinchart laurent.pinchart at ideasonboard.com
Mon Jun 29 01:29:52 CEST 2020


Hi Jacopo,

Thank you for the patch.

On Sun, Jun 28, 2020 at 06:17:22PM +0200, Jacopo Mondi wrote:
> When an unsupported stream roles is requested to
> generateConfiguration(), the function shall fail instead of simply
> ignoring the request.
> 
> Signed-off-by: Jacopo Mondi <jacopo at jmondi.org>

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

> ---
>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> index d1338b640e3c..aa7b7eb93aab 100644
> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> @@ -568,7 +568,8 @@ CameraConfiguration *PipelineHandlerRPi::generateConfiguration(Camera *camera,
>  		default:
>  			LOG(RPI, Error) << "Requested stream role not supported: "
>  					<< role;
> -			break;
> +			delete config;
> +			return nullptr;
>  		}
>  
>  		if (rawCount > 1 || outCount > 2) {

-- 
Regards,

Laurent Pinchart


More information about the libcamera-devel mailing list