v4l2-utils: test cache_hints for MMAP queues
RFC PATCH 1/1 v4l2-utils: test cache_hints for MMAP queues
RFC version
The patch adds V4L2_FLAG_MEMORY_NON_CONSISTENT consistency attr test to VIDIOC_REQBUFS and VIDIOC_CREATE_BUFS ioctl-s, and V4L2_BUF_FLAG_NO_CACHE_INVALIDATE/V4L2_BUF_FLAG_NO_CACHE_CLEAN buffer cache management hints for MMAP queues.
Signed-off-by Sergey Senozhatsky <[email protected]>
--- utils/common/cv4l-helpers.h | 8 +- utils/common/v4l-helpers.h | 10 +- utils/common/v4l2-info.cpp | 1 + utils/v4l2-compliance/v4l2-test-buffers.cpp | 118 +++++++++++++++++++- 4 files changed, 124 insertions(+), 13 deletions(-)
utils/common/cv4l-helpers.h +4 -4
@@ -753,17 +753,17 @@ public:int g_fd (unsigned index,unsigned plane) const {return v4l_queue_g_fd (this, index, plane); }void s_fd (unsigned index,unsigned plane,int fd) {v4l_queue_s_fd (this, index, plane, fd); } - int reqbufs(cv4l_fd *fd, unsigned count = 0) + int reqbufs(cv4l_fd *fd, unsigned count = 0, unsigned int flags = 0) { - return v4l_queue_reqbufs(fd->g_v4l_fd(), this, count); + return v4l_queue_reqbufs(fd->g_v4l_fd(), this, count, flags); }bool has_create_bufs (cv4l_fd *fd) const {return v4l_queue_has_create_bufs (fd->g_v4l_fd (), this); } - int create_bufs(cv4l_fd *fd, unsigned count, const v4l2_format *fmt = NULL) + int create_bufs(cv4l_fd *fd, unsigned count, const v4l2_format *fmt = NULL, unsigned int flags = 0) { - return v4l_queue_create_bufs(fd->g_v4l_fd(), this, count, fmt); + return v4l_queue_create_bufs(fd->g_v4l_fd(), this, count, fmt, flags); } int mmap_bufs(cv4l_fd *fd, unsigned from = 0) {
utils/common/v4l-helpers.h +6 -4
@@ -1513,7 +1513,7 @@ static inline int v4l_queue_querybufs(struct v4l_fd *f, struct v4l_queue *q, uns }static inline int v4l_queue_reqbufs (struct v4l_fd *f, -struct v4l_queue *q,unsigned count) + struct v4l_queue *q, unsigned count, unsigned int flags = 0) { struct v4l2_requestbuffers reqbufs;int ret;
@@ -1521,7 +1521,7 @@ static inline int v4l_queue_reqbufs(struct v4l_fd *f, reqbufs.type = q->type; reqbufs.memory = q->memory; reqbufs.count = count; -memset (reqbufs.reserved,0 ,sizeof (reqbufs.reserved)); + reqbufs.flags = flags;/* * Problem: if REQBUFS returns an error, did it free any old * buffers or not?
@@ -1545,7 +1545,8 @@ static inline bool v4l_queue_has_create_bufs(struct v4l_fd *f, const struct v4l_ }static inline int v4l_queue_create_bufs (struct v4l_fd *f, -struct v4l_queue *q,unsigned count,const struct v4l2_format *fmt) +struct v4l_queue *q,unsigned count, + const struct v4l2_format *fmt, unsigned int flags = 0) { struct v4l2_create_buffers createbufs;int ret;
@@ -1553,6 +1554,7 @@ static inline int v4l_queue_create_bufs(struct v4l_fd *f, createbufs.format.type = q->type; createbufs.memory = q->memory; createbufs.count = count; + createbufs.flags = flags;if (fmt) { createbufs.format = *fmt; }else {
@@ -1731,7 +1733,7 @@ static inline void v4l_queue_free(struct v4l_fd *f, struct v4l_queue *q)v4l_ioctl (f,VIDIOC_STREAMOFF , &q->type);v4l_queue_release_bufs (f, q,0 );v4l_queue_close_exported_fds (q); -v4l_queue_reqbufs (f, q,0 ); +v4l_queue_reqbufs (f, q,0 ,0 ); } static inline void v4l_queue_buffer_update(const struct v4l_queue *q,
utils/common/v4l2-info.cpp +1 -0
@@ -206,6 +206,7 @@ static const flag_def bufcap_def[] = { { V4L2_BUF_CAP_SUPPORTS_REQUESTS, "requests" }, { V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS, "orphaned-bufs" }, { V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF, "m2m-hold-capture-buf" }, + { V4L2_BUF_CAP_SUPPORTS_CACHE_HINTS, "cache-hints" }, { 0, NULL } };
utils/v4l2-compliance/v4l2-test-buffers.cpp +113 -5
204 lines not on this page · raw message
Signature · 1 line
2.26.2