aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2021-04-22 14:43:01 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2021-04-22 14:43:01 +0200
commitb36d9f24c14eb7b761d9bdbd636ac65ed5c00232 (patch)
tree086b5297fd403e0c04ab56ccff3b2a29761f8c03
parent65270533bc0de850e9722d09e54da6569afc2b36 (diff)
v4l2-compliance: move all vivid controls to v4l2-compliance.h
The vivid controls are defined in two places: the header and v4l2-test-buffers.cpp. Move them all to the header so they are all in a single place. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/v4l2-compliance/v4l2-compliance.h10
-rw-r--r--utils/v4l2-compliance/v4l2-test-buffers.cpp10
2 files changed, 8 insertions, 12 deletions
diff --git a/utils/v4l2-compliance/v4l2-compliance.h b/utils/v4l2-compliance/v4l2-compliance.h
index d13dd2e2..c2835d95 100644
--- a/utils/v4l2-compliance/v4l2-compliance.h
+++ b/utils/v4l2-compliance/v4l2-compliance.h
@@ -70,9 +70,15 @@ enum poll_mode {
#define IS_ENCODER(node) ((node)->codec_mask & (JPEG_ENCODER | STATEFUL_ENCODER | STATELESS_ENCODER))
#define IS_DECODER(node) ((node)->codec_mask & (JPEG_DECODER | STATEFUL_DECODER | STATELESS_DECODER))
-#define V4L2_CTRL_CLASS_VIVID 0x00f00000
+#define V4L2_CTRL_CLASS_VIVID 0x00f00000
#define VIVID_CID_VIVID_BASE (V4L2_CTRL_CLASS_VIVID | 0xf000)
-#define VIVID_CID_DISCONNECT (VIVID_CID_VIVID_BASE + 65)
+#define VIVID_CID_DISCONNECT (VIVID_CID_VIVID_BASE + 65)
+#define VIVID_CID_DQBUF_ERROR (VIVID_CID_VIVID_BASE + 66)
+#define VIVID_CID_QUEUE_SETUP_ERROR (VIVID_CID_VIVID_BASE + 67)
+#define VIVID_CID_BUF_PREPARE_ERROR (VIVID_CID_VIVID_BASE + 68)
+#define VIVID_CID_START_STR_ERROR (VIVID_CID_VIVID_BASE + 69)
+#define VIVID_CID_QUEUE_ERROR (VIVID_CID_VIVID_BASE + 70)
+#define VIVID_CID_REQ_VALIDATE_ERROR (VIVID_CID_VIVID_BASE + 72)
struct test_query_ext_ctrl: v4l2_query_ext_ctrl {
__u64 menu_mask;
diff --git a/utils/v4l2-compliance/v4l2-test-buffers.cpp b/utils/v4l2-compliance/v4l2-test-buffers.cpp
index bc5958c2..045f8d54 100644
--- a/utils/v4l2-compliance/v4l2-test-buffers.cpp
+++ b/utils/v4l2-compliance/v4l2-test-buffers.cpp
@@ -32,16 +32,6 @@
#include "v4l2-compliance.h"
-#define V4L2_CTRL_CLASS_VIVID 0x00f00000
-#define VIVID_CID_VIVID_BASE (V4L2_CTRL_CLASS_VIVID | 0xf000)
-#define VIVID_CID_DISCONNECT (VIVID_CID_VIVID_BASE + 65)
-#define VIVID_CID_DQBUF_ERROR (VIVID_CID_VIVID_BASE + 66)
-#define VIVID_CID_QUEUE_SETUP_ERROR (VIVID_CID_VIVID_BASE + 67)
-#define VIVID_CID_BUF_PREPARE_ERROR (VIVID_CID_VIVID_BASE + 68)
-#define VIVID_CID_START_STR_ERROR (VIVID_CID_VIVID_BASE + 69)
-#define VIVID_CID_QUEUE_ERROR (VIVID_CID_VIVID_BASE + 70)
-#define VIVID_CID_REQ_VALIDATE_ERROR (VIVID_CID_VIVID_BASE + 72)
-
static cv4l_fmt cur_fmt;
static cv4l_fmt cur_m2m_fmt;
static int stream_from_fd = -1;

Privacy Policy