v4l2-ctl: support for metadata output
PATCH 1/1 v4l2-ctl: support for metadata output
Adds support to test metadata output format V4L2_META_FMT_VIVID.
--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 31 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 12 ++++++--- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 43 insertions(+), 3 deletions(-)
contrib/freebsd/include/linux/videodev2.h +1 -0
@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Output Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
include/linux/videodev2.h +1 -0
@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Output Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
utils/v4l2-ctl/v4l2-ctl-meta.cpp +31 -0
@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u8 brightness; + __u8 contrast; + __u8 saturation; + __s16 hue; +}; + void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:
@@ -164,5 +172,28 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4))); fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u", vbuf_out->brightness); + fprintf(f, " contrast: %u", vbuf_out->contrast); + fprintf(f, " saturation: %u", vbuf_out->saturation); + fprintf(f, " hue: %d\n", vbuf_out->hue); + break; + } +} + +void meta_fillbuffer(int idx, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf; + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(idx, 0); + vbuf->brightness = 228; + vbuf->contrast = 228; + vbuf->saturation = 228; + vbuf->hue = 100; + break; } }
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +9 -3
@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;
@@ -1177,7 +1178,6 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf if (V4L2_FIELD_HAS_T_OR_B(field)) output_field = (stream_out_std & V4L2_STD_525_60) ? V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP; - if (is_video) { tpg_init(&tpg, 640, 360); tpg_alloc(&tpg, fmt.g_width());
@@ -1244,6 +1244,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED; + if (is_meta) + meta_fillbuffer(i, fmt, q); + if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { int media_fd = mi_get_media_fd(fd.g_fd());
@@ -1266,7 +1269,6 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf } if (qbuf) { fps_timestamps fps_ts; - set_time_stamp(buf); if (fd.qbuf(buf)) return QUEUE_ERROR;
@@ -1480,6 +1482,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {
@@ -1522,6 +1525,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap fprintf(stderr, ", dropped buffers: %u", dropped); fprintf(stderr, "\n"); } + if (stopped) return 0;
@@ -1542,6 +1546,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf.g_index(), fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {
@@ -2039,7 +2045,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;
utils/v4l2-ctl/v4l2-ctl.h +1 -0
@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(int idx, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
Signature · 1 line
2.17.1
PATCH 1/1 v4l2-ctl: support for metadata output
Hi Vandana,
Since the videodev2.h header is copied from the header I can't apply this yet until support for V4L2_META_FMT_VIVID is merged into the kernel.
I also have a few other comments, see below:
Quoted 40 lines · Vandana BN
Adds support to test metadata output format
V4L2_META_FMT_VIVID.Signed-off-by Vandana BN <bnvandana at gmail.com>--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 31 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 12 ++++++--- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 43 insertions(+), 3 deletions(-)contrib/freebsd/include/linux/videodev2.h +1
-0@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Output Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeinclude/linux/videodev2.h +1
-0@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Output Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeutils/v4l2-ctl/v4l2-ctl-meta.cpp +0
-0
utils/v4l2-ctl/v4l2-ctl-meta.cpp struct vivid_uvc_meta_buf { · line 147
Quoted 9 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +6
-0@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u8 brightness; + __u8 contrast; + __u8 saturation; + __s16 hue; +};
I'd change the __u8 to __u16 in the struct above.
The problem right now is that there is a hole of one byte in the struct between saturation and hue. That's something we try to avoid.
Quoted 11 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +2
-0+ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:@@ -164,5 +172,28 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4)));
utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 182
Quoted 10 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +8
-0fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u", vbuf_out->brightness); + fprintf(f, " contrast: %u", vbuf_out->contrast); + fprintf(f, " saturation: %u", vbuf_out->saturation); + fprintf(f, " hue: %d\n", vbuf_out->hue);
I would just combine all fprintf's into a single fprintf.
utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 189
Quoted 7 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +7
-0+ break; + } +} + +void meta_fillbuffer(int idx, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf;
Add newline.
utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 196
Quoted 7 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +7
-0+ switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(idx, 0); + vbuf->brightness = 228; + vbuf->contrast = 228; + vbuf->saturation = 228; + vbuf->hue = 100;
Ah, be a bit more creative :-)
I.e. change values based on the buffer sequence number. That way the image changes over time.
Quoted 16 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +1
-0+ break; } }utils/v4l2-ctl/v4l2-ctl-streaming.cpp +1
-0@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;
utils/v4l2-ctl/v4l2-ctl-streaming.cpp static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf · line 1180
Quoted 4 lines
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +0
-1@@ -1177,7 +1178,6 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf if (V4L2_FIELD_HAS_T_OR_B(field)) output_field = (stream_out_std & V4L2_STD_525_60) ? V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP; -
Spurious line deletion.
utils/v4l2-ctl/v4l2-ctl-streaming.cpp static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf · line 1248
Quoted 9 lines
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +2
-0if (is_video) { tpg_init(&tpg, 640, 360); tpg_alloc(&tpg, fmt.g_width());@@ -1244,6 +1244,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED; + if (is_meta) + meta_fillbuffer(i, fmt, q);
This should be moved to before the 'if (fin...' line.
Otherwise this would overwrite the data read from a file if fin != NULL.
utils/v4l2-ctl/v4l2-ctl-streaming.cpp static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf · line 1269
Quoted 9 lines
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +1
-1+ if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { int media_fd = mi_get_media_fd(fd.g_fd());@@ -1266,7 +1269,6 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf } if (qbuf) { fps_timestamps fps_ts; -
Spurious line deletion.
Quoted 43 lines
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +5
-1set_time_stamp(buf); if (fd.qbuf(buf)) return QUEUE_ERROR;@@ -1480,6 +1482,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {@@ -1522,6 +1525,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap fprintf(stderr, ", dropped buffers: %u", dropped); fprintf(stderr, "\n"); } + if (stopped) return 0;@@ -1542,6 +1546,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf.g_index(), fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {@@ -2039,7 +2045,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;utils/v4l2-ctl/v4l2-ctl.h +0
-0
utils/v4l2-ctl/v4l2-ctl.h void meta_set(cv4l_fd &fd); · line 415
Quoted 7 lines
utils/v4l2-ctl/v4l2-ctl.h +1
-0@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(int idx, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
Regards,
Hans
bnvandana at gmail.com (Vandana BN)
PATCH v2 1/1 v4l2-ctl: support for metadata output
Adds support to test metadata output format V4L2_META_FMT_VIVID.
--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 35 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 9 +++++- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 46 insertions(+), 1 deletion(-)
contrib/freebsd/include/linux/videodev2.h +1 -0
@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
include/linux/videodev2.h +1 -0
@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
utils/v4l2-ctl/v4l2-ctl-meta.cpp +35 -0
@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u16 brightness; + __u16 contrast; + __u16 saturation; + __s16 hue; +}; + void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:
@@ -164,5 +172,32 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4))); fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u contrast: %u saturation: %u hue: %d\n", + vbuf_out->brightness, vbuf_out->contrast, + vbuf_out->saturation, vbuf_out->hue); + break; + } +} + +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf; + + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + vbuf->brightness = buf.g_sequence() <= 255 ? + buf.g_sequence() : buf.g_sequence() % 255; + vbuf->contrast = buf.g_sequence() + 10 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 10) % 255; + vbuf->saturation = buf.g_sequence() + 20 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 20) % 255; + vbuf->hue = (__s16) buf.g_sequence() - 128 <= 128 ? + buf.g_sequence() - 128 : buf.g_sequence() % 256 - 128; + break; } }
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +8 -1
@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;
@@ -1241,6 +1242,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(i, j)); } } + if (is_meta) + meta_fillbuffer(buf, fmt, q); + if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED;
@@ -1480,6 +1484,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {
@@ -1542,6 +1547,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf, fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {
@@ -2039,7 +2046,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;
utils/v4l2-ctl/v4l2-ctl.h +1 -0
@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
Signature · 1 line
2.17.1
hverkuil at xs4all.nl (Hans Verkuil)
PATCH v2 1/1 v4l2-ctl: support for metadata output
Quoted 72 lines · Vandana BN
Adds support to test metadata output format
V4L2_META_FMT_VIVID.Signed-off-by Vandana BN <bnvandana at gmail.com>--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 35 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 9 +++++- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 46 insertions(+), 1 deletion(-)contrib/freebsd/include/linux/videodev2.h +1
-0@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeinclude/linux/videodev2.h +1
-0@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeutils/v4l2-ctl/v4l2-ctl-meta.cpp +18
-0@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u16 brightness; + __u16 contrast; + __u16 saturation; + __s16 hue; +}; + void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:@@ -164,5 +172,32 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4))); fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u contrast: %u saturation: %u hue: %d\n", + vbuf_out->brightness, vbuf_out->contrast, + vbuf_out->saturation, vbuf_out->hue); + break; + } +}
utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 194
Quoted 10 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +10
-0+ +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf; + + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + vbuf->brightness = buf.g_sequence() <= 255 ? + buf.g_sequence() : buf.g_sequence() % 255;
This is very cumbersome. Why not just do:
vbuf->brightness = buf.g_sequence() % 256;
(the range is 0-255, so that's modulo 256).
Same elsewhere.
Regards,
Hans
Quoted 70 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +7
-0+ vbuf->contrast = buf.g_sequence() + 10 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 10) % 255; + vbuf->saturation = buf.g_sequence() + 20 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 20) % 255; + vbuf->hue = (__s16) buf.g_sequence() - 128 <= 128 ? + buf.g_sequence() - 128 : buf.g_sequence() % 256 - 128; + break; } }utils/v4l2-ctl/v4l2-ctl-streaming.cpp +8
-1@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;@@ -1241,6 +1242,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(i, j)); } } + if (is_meta) + meta_fillbuffer(buf, fmt, q); + if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED;@@ -1480,6 +1484,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {@@ -1542,6 +1547,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf, fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {@@ -2039,7 +2046,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;utils/v4l2-ctl/v4l2-ctl.h +1
-0@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
hverkuil at xs4all.nl (Hans Verkuil)
PATCH v2 1/1 v4l2-ctl: support for metadata output
Quoted 94 lines · Hans Verkuil
Quoted 72 lines · Vandana BN
Adds support to test metadata output format
V4L2_META_FMT_VIVID.Signed-off-by Vandana BN <bnvandana at gmail.com>--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 35 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 9 +++++- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 46 insertions(+), 1 deletion(-)contrib/freebsd/include/linux/videodev2.h +1
-0@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeinclude/linux/videodev2.h +1
-0@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafeutils/v4l2-ctl/v4l2-ctl-meta.cpp +18
-0@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u16 brightness; + __u16 contrast; + __u16 saturation; + __s16 hue; +}; + void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:@@ -164,5 +172,32 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4))); fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u contrast: %u saturation: %u hue: %d\n", + vbuf_out->brightness, vbuf_out->contrast, + vbuf_out->saturation, vbuf_out->hue); + break; + } +}utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 194
Quoted 10 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +10
-0+ +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf; + + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + vbuf->brightness = buf.g_sequence() <= 255 ? + buf.g_sequence() : buf.g_sequence() % 255;This is very cumbersome. Why not just do:
vbuf->brightness = buf.g_sequence() % 256;(the range is 0-255, so that's modulo 256).
Same elsewhere.
Regards,
Quoted 8 lines
Hans
utils/v4l2-ctl/v4l2-ctl-meta.cpp void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) · line 200
Quoted 6 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +6
-0+ vbuf->contrast = buf.g_sequence() + 10 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 10) % 255; + vbuf->saturation = buf.g_sequence() + 20 <= 255 ? + buf.g_sequence(): (buf.g_sequence() + 20) % 255; + vbuf->hue = (__s16) buf.g_sequence() - 128 <= 128 ? + buf.g_sequence() - 128 : buf.g_sequence() % 256 - 128;
Another problem with this code is that the image goes completely to black at some point. It is better to prevent that from happening by for example keeping the minimum brightness and contrast at 64.
Regards,
Hans
Quoted 65 lines
Quoted 64 lines
utils/v4l2-ctl/v4l2-ctl-meta.cpp +1
-0+ break; } }utils/v4l2-ctl/v4l2-ctl-streaming.cpp +8
-1@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;@@ -1241,6 +1242,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(i, j)); } } + if (is_meta) + meta_fillbuffer(buf, fmt, q); + if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED;@@ -1480,6 +1484,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {@@ -1542,6 +1547,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf, fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {@@ -2039,7 +2046,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;utils/v4l2-ctl/v4l2-ctl.h +1
-0@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
bnvandana at gmail.com (Vandana BN)
PATCH v3 1/1 v4l2-ctl: support for metadata output
Adds support to test metadata output format V4L2_META_FMT_VIVID.
---
Changes in V3:
simplified meta_fillbuffer(), also ensure the brightness and
contrast values are in range 64-255.
--- contrib/freebsd/include/linux/videodev2.h | 1 + include/linux/videodev2.h | 1 + utils/v4l2-ctl/v4l2-ctl-meta.cpp | 31 +++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 9 ++++++- utils/v4l2-ctl/v4l2-ctl.h | 1 + 5 files changed, 42 insertions(+), 1 deletion(-)
contrib/freebsd/include/linux/videodev2.h +1 -0
@@ -783,6 +783,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
include/linux/videodev2.h +1 -0
@@ -749,6 +749,7 @@ struct v4l2_pix_format {#define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T')/* R-Car VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H')/* UVC Payload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X')/* D4XX Payload Header metadata */ +#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')/* Vivid Metadata */ /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
utils/v4l2-ctl/v4l2-ctl-meta.cpp +31 -0
@@ -139,10 +139,18 @@ struct vivid_uvc_meta_buf { #define UVC_STREAM_SCR (1 << 3) #define UVC_STREAM_PTS (1 << 2) +struct vivid_meta_out_buf { + __u16 brightness; + __u16 contrast; + __u16 saturation; + __s16 hue; +}; + void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) { struct vivid_uvc_meta_buf *vbuf; int buf_off = 0; + struct vivid_meta_out_buf *vbuf_out; switch (fmt.g_pixelformat()) { case V4L2_META_FMT_UVC:
@@ -164,5 +172,28 @@ void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) le16toh(*(__u16*)(vbuf->buf + buf_off + 4))); fprintf(f, "\n"); break; + case V4L2_META_FMT_VIVID: + fprintf(f, "VIVID:"); + vbuf_out = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + + fprintf(f, " brightness: %u contrast: %u saturation: %u hue: %d\n", + vbuf_out->brightness, vbuf_out->contrast, + vbuf_out->saturation, vbuf_out->hue); + break; + } +} + +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_meta_out_buf *vbuf; + + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_VIVID: + vbuf = (vivid_meta_out_buf *)q.g_dataptr(buf.g_index(), 0); + vbuf->brightness = buf.g_sequence() % 192 + 64; + vbuf->contrast = (buf.g_sequence() + 10) % 192 + 64; + vbuf->saturation = (buf.g_sequence() + 20) % 256; + vbuf->hue = buf.g_sequence() % 257 - 128; + break; } }
utils/v4l2-ctl/v4l2-ctl-streaming.cpp +8 -1
@@ -1146,6 +1146,7 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf bool can_fill = false; bool is_video = q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT || q.g_type() == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE; + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; if (q.obtain_bufs(&fd)) return QUEUE_ERROR;
@@ -1241,6 +1242,9 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(i, j)); } } + if (is_meta) + meta_fillbuffer(buf, fmt, q); + if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return QUEUE_STOPPED;
@@ -1480,6 +1484,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap bool stopped, bool ignore_count_skip) { cv4l_buffer buf(q); + bool is_meta = q.g_type() == V4L2_BUF_TYPE_META_OUTPUT; int ret = 0; if (cap) {
@@ -1542,6 +1547,8 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap tpg_fillbuffer(&tpg, stream_out_std, j, (u8 *)q.g_dataptr(buf.g_index(), j)); } + if (is_meta) + meta_fillbuffer(buf, fmt, q); if (fmt.g_pixelformat() == V4L2_PIX_FMT_FWHT_STATELESS) { if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) {
@@ -2039,7 +2046,7 @@ static void streaming_set_out(cv4l_fd &fd, cv4l_fd &exp_fd) if (!(capabilities & (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_MPLANE | V4L2_CAP_VBI_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT | - V4L2_CAP_SDR_OUTPUT | + V4L2_CAP_SDR_OUTPUT | V4L2_CAP_META_OUTPUT | V4L2_CAP_VIDEO_M2M | V4L2_CAP_VIDEO_M2M_MPLANE))) { fprintf(stderr, "unsupported stream type\n"); return;
utils/v4l2-ctl/v4l2-ctl.h +1 -0
@@ -409,6 +409,7 @@ void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); +void meta_fillbuffer(cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q);// v4l2-ctl-subdev.cpp void subdev_usage (void );
Signature · 1 line
2.17.1