From 323a53c2329fe70a063b2d479b19385d10e0a559 Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Sat, 4 Jul 2020 18:00:36 +0900 Subject: v4l2: v4l2_camera_proxy: Use stream config in tryFormat For handling try_fmt, the values should be filled in by validating the stream configuration, and not by recalculating them or manually checking against the cached list of formats and sizes. Add a new V4L2Camera::validateConfiguration() function to validate a configuration and use it to obtain size, format, stride, and frameSize values. If the format negotiation fails, return error from try_fmt and s_fmt. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- src/v4l2/v4l2_camera.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/v4l2/v4l2_camera.h') diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 515e9060..be6c4e18 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -47,6 +47,9 @@ public: int configure(StreamConfiguration *streamConfigOut, const Size &size, const PixelFormat &pixelformat, unsigned int bufferCount); + int validateConfiguration(const PixelFormat &pixelformat, + const Size &size, + StreamConfiguration *streamConfigOut); int allocBuffers(unsigned int count); void freeBuffers(); -- cgit v1.2.1