diff options
author | Paul Elder <paul.elder@ideasonboard.com> | 2020-07-04 18:00:36 +0900 |
---|---|---|
committer | Paul Elder <paul.elder@ideasonboard.com> | 2020-07-10 16:11:50 +0900 |
commit | 323a53c2329fe70a063b2d479b19385d10e0a559 (patch) | |
tree | ccc97d67146e94856236fbfef2d2762a20c4145f /src/v4l2/v4l2_camera_proxy.h | |
parent | a3b5ee998e18f74ba5cf68e3831d356463c85740 (diff) |
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 <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/v4l2/v4l2_camera_proxy.h')
-rw-r--r-- | src/v4l2/v4l2_camera_proxy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index e9626942..f06b5b87 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -41,7 +41,7 @@ private: bool validateMemoryType(uint32_t memory); void setFmtFromConfig(StreamConfiguration &streamConfig); void querycap(std::shared_ptr<Camera> camera); - void tryFormat(struct v4l2_format *arg); + int tryFormat(struct v4l2_format *arg); enum v4l2_priority maxPriority(); void updateBuffers(); void freeBuffers(); |