This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-compliance: use correct buf type for export_bufs Author: Hans Verkuil <hans.verk...@cisco.com> Date: Fri Jun 29 07:34:16 2018 +0200 Also require an explicit buf type instead of defaulting to 0 for export_bufs(). Signed-off-by: Hans Verkuil <hans.verk...@cisco.com> Reported-by: Ezequiel Garcia <ezequ...@collabora.com> utils/common/cv4l-helpers.h | 2 +- utils/v4l2-compliance/v4l2-test-buffers.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=037230a9f7e158925a62ee37dcf57ce949d1499e diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h index e196c22bd847..60f186cf6666 100644 --- a/utils/common/cv4l-helpers.h +++ b/utils/common/cv4l-helpers.h @@ -791,7 +791,7 @@ public: { return v4l_queue_has_expbuf(fd->g_v4l_fd()); } - int export_bufs(cv4l_fd *fd, unsigned exp_type = 0) + int export_bufs(cv4l_fd *fd, unsigned exp_type) { return v4l_queue_export_bufs(fd->g_v4l_fd(), this, exp_type); } diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp index 3986435bf7af..734b5c0aa0d3 100644 --- a/utils/v4l2-compliance/v4l2-test-buffers.cpp +++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp @@ -541,10 +541,10 @@ int testExpBuf(struct node *node) fail_on_test(q.reqbufs(node, 2)); if (q.has_expbuf(node)) { - fail_on_test(q.export_bufs(node)); + fail_on_test(q.export_bufs(node, q.g_type())); have_expbuf = true; } else { - fail_on_test(!q.export_bufs(node)); + fail_on_test(!q.export_bufs(node, q.g_type())); } q.close_exported_fds(); fail_on_test(q.reqbufs(node)); @@ -1064,7 +1064,7 @@ static int setupDmaBuf(struct node *expbuf_node, struct node *node, { fail_on_test(exp_q.reqbufs(expbuf_node, q.g_buffers())); fail_on_test(exp_q.g_buffers() < q.g_buffers()); - fail_on_test(exp_q.export_bufs(expbuf_node)); + fail_on_test(exp_q.export_bufs(expbuf_node, exp_q.g_type())); for (unsigned i = 0; i < q.g_buffers(); i++) { buffer buf(q); _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
