vivid: Add metadata capture support
bnvandana at gmail.com (Vandana BN)
PATCH v2 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 90 ++++++++- drivers/media/platform/vivid/vivid-core.h | 13 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 190 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 24 +++ drivers/media/platform/vivid/vivid-meta-gen.c | 33 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 23 +++ 9 files changed, 428 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +85 -5
192 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +13 -0
@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)
@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -324,6 +331,7 @@ struct vivid_dev {unsigned tv_audmode;unsigned tv_field_cap;unsigned tv_audio_input; +struct vivid_meta_gen_data meta_gen;u32 power_present;
@@ -390,6 +398,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +417,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
drivers/media/platform/vivid/vivid-ctrls.c +14 -0
@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;
@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,
@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }
@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }
drivers/media/platform/vivid/vivid-kthread-cap.c +45 -3
99 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +190 -0
190 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +24 -0
@@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +/* TODO: change this to size of vivid metadata structure */ +#define VIVID_META_SIZE 8 + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +int vidioc_s_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif
drivers/media/platform/vivid/vivid-meta-gen.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_meta_gen_data *meta_gen,unsigned int seq) +{ +unsigned int i =0 ; + +for (i =0 ; i <VIVID_META_GRP ; i++) { +struct vivid_uvc_meta_buf *meta = &meta_gen->data[i]; + + meta->ns =ktime_get_ns (); + meta->sof = seq + i; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ; + meta->flags =UVC_STREAM_EOH |UVC_STREAM_PTS |UVC_STREAM_SCR ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +//else if (i == VIVID_META_GRP - 1) +// meta->flags |= UVC_STREAM_EOF; + } +}
drivers/media/platform/vivid/vivid-meta-gen.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +#define VIVID_META_GRP 2 +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +struct vivid_meta_gen_data { +struct vivid_uvc_meta_buf data[VIVID_META_GRP ]; +}; + +void vivid_meta_cap_gen (struct vivid_meta_gen_data *meta_gen,unsigned int seq); +#endif
Signature · 1 line
2.17.1
PATCH v3 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
---
v2 Add UVC metadata structure.
v3 Use correct metadata size.
drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 90 ++++++++- drivers/media/platform/vivid/vivid-core.h | 13 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 187 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 21 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 22 +++ 9 files changed, 413 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +85 -5
192 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +13 -0
@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)
@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -324,6 +331,7 @@ struct vivid_dev {unsigned tv_audmode;unsigned tv_field_cap;unsigned tv_audio_input; +struct vivid_meta_gen_data meta_gen;u32 power_present;
@@ -390,6 +398,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +417,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
drivers/media/platform/vivid/vivid-ctrls.c +14 -0
@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;
@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,
@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }
@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }
drivers/media/platform/vivid/vivid-kthread-cap.c +45 -3
99 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +187 -0
187 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +int vidioc_s_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif
drivers/media/platform/vivid/vivid-meta-gen.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ; + meta->flags =UVC_STREAM_EOH ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}
drivers/media/platform/vivid/vivid-meta-gen.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +struct vivid_meta_gen_data { +struct vivid_uvc_meta_buf data; +}; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v4 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
---
v2 Add UVC metadata structure.
v3 Use correct metadata size.
v4 use VFL_TYPE_METADATA.
drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 87 +++++++- drivers/media/platform/vivid/vivid-core.h | 13 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 187 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 21 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 22 +++ 9 files changed, 410 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +82 -5
183 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +13 -0
@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)
@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -324,6 +331,7 @@ struct vivid_dev {unsigned tv_audmode;unsigned tv_field_cap;unsigned tv_audio_input; +struct vivid_meta_gen_data meta_gen;u32 power_present;
@@ -390,6 +398,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +417,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
drivers/media/platform/vivid/vivid-ctrls.c +14 -0
@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;
@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,
@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }
@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }
drivers/media/platform/vivid/vivid-kthread-cap.c +45 -3
99 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +187 -0
187 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +int vidioc_s_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif
drivers/media/platform/vivid/vivid-meta-gen.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ; + meta->flags =UVC_STREAM_EOH ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}
drivers/media/platform/vivid/vivid-meta-gen.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +struct vivid_meta_gen_data { +struct vivid_uvc_meta_buf data; +}; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Signature · 1 line
2.17.1
hverkuil at xs4all.nl (Hans Verkuil)
PATCH v4 1/1 vivid: Add metadata capture support
Hi Vandana,
Some checkpatch warnings:
Applying: vivid: Add metadata capture support
WARNING: line over 80 characters
#43: FILE: drivers/media/platform/vivid/vivid-core.c:103:
+/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out + meta-cap */
This can easily be split up.
WARNING: line over 80 characters
#44: FILE: drivers/media/platform/vivid/vivid-core.c:104:
+static unsigned node_types[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 0x21d3d };
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
#44: FILE: drivers/media/platform/vivid/vivid-core.c:104:
+static unsigned node_types[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 0x21d3d };
Let's use unsigned int and more the part after the = to the next line.
WARNING: line over 80 characters
#403: FILE: drivers/media/platform/vivid/vivid-kthread-cap.c:860:
+ dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;
This one we can keep, I think it gets harder to read if this was split up.
Some more comments below:
Quoted 131 lines · Vandana BN
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
Signed-off-by Vandana BN <bnvandana at gmail.com>---
v2 Add UVC metadata structure.
v3 Use correct metadata size.
v4 useVFL_TYPE_METADATA.drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 87 +++++++- drivers/media/platform/vivid/vivid-core.h | 13 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 187 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 21 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 22 +++ 9 files changed, 410 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.hdrivers/media/platform/vivid/Makefile +1
-1@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endifdrivers/media/platform/vivid/vivid-core.c +21
-5@@ -37,6 +37,7 @@#include "vivid-osd.h" #include "vivid-cec.h" #include "vivid-ctrls.h" +#include "vivid-meta-cap.h" #define VIVID_MODULE_NAME "vivid"@@ -79,6 +80,10 @@ static int radio_tx_nr[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = -1 };module_param_array (radio_tx_nr, int,NULL ,0444 );MODULE_PARM_DESC (radio_tx_nr," radioX start number, -1 is autodetect" ); +static int meta_cap_nr[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 }; +module_param_array (meta_cap_nr, int,NULL ,0444 ); +MODULE_PARM_DESC (meta_cap_nr," videoX start number, -1 is autodetect" ); +static int ccs_cap_mode[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 };module_param_array (ccs_cap_mode, int,NULL ,0444 ); MODULE_PARM_DESC(ccs_cap_mode, " capture crop/compose/scale mode:\n"@@ -95,8 +100,8 @@ static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1module_param_array (multiplanar, uint,NULL ,0444 );MODULE_PARM_DESC (multiplanar," 1 (default) creates a single planar device, 2 creates a multiplanar device." ); -/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out */ -static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x1d3d }; +/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out + meta-cap */ +static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x21d3d };module_param_array (node_types, uint,NULL ,0444 );MODULE_PARM_DESC (node_types," node types, default is 0x1d3d. Bitmask with the following meaning:\n" "\t\t bit 0: Video Capture node\n"@@ -106,7 +111,8 @@ MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f"\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" - "\t\t bit 16: Framebuffer for testing overlays"); +"\t\t bit 16: Framebuffer for testing overlays\n" + "\t\t bit 17: Metadata capture node\n");/* Default: 4 inputs */ static unsigned num_inputs[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =4 };@@ -205,7 +211,7 @@ static int vidioc_querycap(struct file *file, void *priv, cap->capabilities = dev->vid_cap_caps | dev->vid_out_caps | dev->vbi_cap_caps | dev->vbi_out_caps | dev->radio_rx_caps | dev->radio_tx_caps | - dev->sdr_cap_caps |V4L2_CAP_DEVICE_CAPS ; + dev->sdr_cap_caps | dev->meta_cap_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }@@ -433,7 +439,8 @@ static bool vivid_is_last_user(struct vivid_dev *dev)vivid_is_in_use (&dev->vbi_out_dev) +vivid_is_in_use (&dev->sdr_cap_dev) +vivid_is_in_use (&dev->radio_rx_dev) + -vivid_is_in_use (&dev->radio_tx_dev); +vivid_is_in_use (&dev->radio_tx_dev) + +vivid_is_in_use (&dev->meta_cap_dev);return uses ==1 ; }@@ -459,6 +466,7 @@ static int vivid_fop_release(struct file *file)set_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +set_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); }mutex_unlock (&dev->mutex);if (file->private_data == dev->overlay_cap_owner)@@ -604,6 +612,11 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_log_status = vidioc_log_status, .vidioc_subscribe_event = vidioc_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + + .vidioc_enum_fmt_meta_cap = vidioc_enum_fmt_meta_cap, + .vidioc_g_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_s_fmt_meta_cap = vidioc_s_fmt_meta_cap, + .vidioc_try_fmt_meta_cap = vidioc_g_fmt_meta_cap, };/* ----------------------------------------------------------------- @@ -818,6 +831,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->has_scaler_out ? 'Y' : 'N'); } +/* do we create a meta capture device */ + dev->has_meta_cap = node_type &0x20000 ; +/* end detecting feature set */ if (dev->has_vid_cap) {
drivers/media/platform/vivid/vivid-core.c static int vivid_create_instance(struct platform_device *pdev, int inst) · line 896
Quoted 6 lines
drivers/media/platform/vivid/vivid-core.c +3
-0@@ -875,6 +891,10 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps =V4L2_CAP_RDS_OUTPUT |V4L2_CAP_MODULATOR |V4L2_CAP_READWRITE ; +/* set up the capabilities of meta capture device */ +if (dev->has_meta_cap) + dev->meta_cap_caps =V4L2_CAP_META_CAPTURE |V4L2_CAP_STREAMING ;
You are missing V4L2_CAP_READWRITE here. Without it v4l2-compliance will fail.
Quoted 150 lines
drivers/media/platform/vivid/vivid-core.c +58
-0+ ret = -ENOMEM ;/* initialize the test pattern generator */ tpg_init (&dev->tpg,640 ,360 );@@ -1078,6 +1098,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)INIT_LIST_HEAD (&dev->vbi_cap_active);INIT_LIST_HEAD (&dev->vbi_out_active);INIT_LIST_HEAD (&dev->sdr_cap_active); +INIT_LIST_HEAD (&dev->meta_cap_active);INIT_LIST_HEAD (&dev->cec_work_list);spin_lock_init (&dev->cec_slock);@@ -1225,6 +1246,27 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->fb_info.node); } +if (dev->has_meta_cap) { +/* initialize meta_cap queue */ + q = &dev->vb_meta_cap_q; + q->type =V4L2_BUF_TYPE_META_CAPTURE ; + q->io_modes =VB2_MMAP |VB2_DMABUF |VB2_READ ; +if (!allocator) + q->io_modes |=VB2_USERPTR ; + q->drv_priv = dev; + q->buf_struct_size =sizeof (struct vivid_buffer ); + q->ops = &vivid_meta_cap_qops; + q->mem_ops = vivid_mem_ops[allocator]; + q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; + q->min_buffers_needed =2 ; + q->lock = &dev->mutex; + q->dev = dev->v4l2_dev.dev; + q->supports_requests = true; + ret =vb2_queue_init (q); +if (ret) + goto unreg_dev; + } +#ifdef CONFIG_VIDEO_VIVID_CEC if (dev->has_vid_cap && in_type_counter[HDMI ]) {struct cec_adapter *adap;@@ -1265,6 +1307,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_rx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_tx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_sdr_cap); +v4l2_ctrl_handler_setup (&dev->ctrl_hdl_meta_cap);/* finally start creating the device nodes */ if (dev->has_vid_cap) {@@ -1492,6 +1535,34 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) video_device_node_name(vfd)); } +if (dev->has_meta_cap) { + vfd = &dev->meta_cap_dev; +snprintf (vfd->name,sizeof (vfd->name), +"vivid-%03d-meta-cap" , inst); + vfd->fops = &vivid_fops; + vfd->ioctl_ops = &vivid_ioctl_ops; + vfd->device_caps = dev->meta_cap_caps; + vfd->release = video_device_release_empty; + vfd->v4l2_dev = &dev->v4l2_dev; + vfd->queue = &dev->vb_meta_cap_q; + vfd->lock = &dev->mutex; +video_set_drvdata (vfd, dev); +#ifdef CONFIG_MEDIA_CONTROLLER + dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , + &dev->meta_cap_pad); +if (ret) + goto unreg_dev; +#endif + ret =video_register_device (vfd,VFL_TYPE_METADATA , + meta_cap_nr[inst]); +if (ret <0 ) + goto unreg_dev; +v4l2_info (&dev->v4l2_dev, +"V4L2 metadata capture device registered as %s\n" , +video_device_node_name (vfd)); + } +#ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device */ ret =media_device_register (&dev->mdev);@@ -1508,6 +1579,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)return 0 ; unreg_dev: +video_unregister_device (&dev->meta_cap_dev);video_unregister_device (&dev->radio_tx_dev);video_unregister_device (&dev->radio_rx_dev);video_unregister_device (&dev->sdr_cap_dev);@@ -1624,6 +1696,11 @@ static int vivid_remove(struct platform_device *pdev)unregister_framebuffer (&dev->fb_info);vivid_fb_release_buffers (dev); } +if (dev->has_meta_cap) { +v4l2_info (&dev->v4l2_dev,"unregistering %s\n" , +video_device_node_name (&dev->meta_cap_dev)); +video_unregister_device (&dev->meta_cap_dev); + }cec_unregister_adapter (dev->cec_rx_adap);for (j =0 ; j <MAX_OUTPUTS ; j++)cec_unregister_adapter (dev->cec_tx_adap[j]);drivers/media/platform/vivid/vivid-core.h +7
-0@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
drivers/media/platform/vivid/vivid-core.h struct vivid_dev { · line 334
Quoted 4 lines
drivers/media/platform/vivid/vivid-core.h +1
-0@@ -324,6 +331,7 @@ struct vivid_dev {unsigned tv_audmode;unsigned tv_field_cap;unsigned tv_audio_input; +struct vivid_meta_gen_data meta_gen;
Both the type and the field appear to be unused. Leftover from a previous version?
Quoted 94 lines
drivers/media/platform/vivid/vivid-core.h +5
-0u32 power_present;@@ -390,6 +398,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;@@ -407,6 +417,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;drivers/media/platform/vivid/vivid-ctrls.c +14
-0@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }drivers/media/platform/vivid/vivid-kthread-cap.c +2
-0@@ -39,6 +39,7 @@#include "vivid-osd.h" #include "vivid-ctrls.h" #include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" static inline v4l2_std_id vivid_get_std_cap (const struct vivid_dev *dev) {@@ -677,6 +678,7 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, {struct vivid_buffer *vid_cap_buf =NULL ;struct vivid_buffer *vbi_cap_buf =NULL ; +struct vivid_buffer *meta_cap_buf =NULL ;u64 f_time =0 ;dprintk (dev,1 ,"Video Capture Thread Tick\n" );
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 709
Quoted 4 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +1
-0@@ -704,9 +706,15 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,list_del (&vbi_cap_buf->list); } } +if (!list_empty (&dev->meta_cap_active) && vid_cap_buf) {
I know I said that it would make sense that there is no metadata as long as there is no video capture. However, I changed my mind on this. One of the reasons for having vivid is to do regression testing with v4l2-compliance, and v4l2-compliance expects that it can capture from any device node independently of another. So this '&& vid_cap_buf' actually prevents me from running v4l2-compliance on the metadata device node.
So just drop that bit.
With this change and the change above the compliance test passes.
Quoted 255 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +42
-3+ meta_cap_buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&meta_cap_buf->list); + } +spin_unlock (&dev->slock); -if (!vid_cap_buf && !vbi_cap_buf) +if (!vid_cap_buf && !vbi_cap_buf && !meta_cap_buf) goto update_mv; f_time = dev->cap_frame_period * dev->vid_cap_seq_count +@@ -758,6 +766,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,do_div (vbi_period,100 ); vbi_cap_buf->vb.vb2_buf.timestamp = f_time + vbi_period; } + +if (meta_cap_buf) { +v4l2_ctrl_request_setup (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vivid_meta_cap_fillbuff (dev, meta_cap_buf); +v4l2_ctrl_request_complete (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&meta_cap_buf->vb.vb2_buf, dev->dqbuf_error ? +VB2_BUF_STATE_ERROR :VB2_BUF_STATE_DONE ); +dprintk (dev,2 ,"meta_cap %d done\n" , + meta_cap_buf->vb.vb2_buf.index); + meta_cap_buf->vb.vb2_buf.timestamp = f_time; + } + dev->dqbuf_error = false; update_mv:@@ -835,6 +857,7 @@ static int vivid_thread_vid_cap(void *data) dev->cap_seq_count = buffers_since_start + dev->cap_seq_offset; dev->vid_cap_seq_count = dev->cap_seq_count - dev->vid_cap_seq_start; dev->vbi_cap_seq_count = dev->cap_seq_count - dev->vbi_cap_seq_start; + dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;vivid_thread_vid_cap_tick (dev, dropped_bufs);@@ -883,8 +906,10 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)if (pstreaming == &dev->vid_cap_streaming) dev->vid_cap_seq_start = seq_count; -else +else if (pstreaming == &dev->vbi_cap_streaming) dev->vbi_cap_seq_start = seq_count; +else + dev->meta_cap_seq_start = seq_count; *pstreaming = true;return 0 ; }@@ -894,6 +919,7 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) dev->vid_cap_seq_start = dev->seq_wrap *128 ; dev->vbi_cap_seq_start = dev->seq_wrap *128 ; + dev->meta_cap_seq_start = dev->seq_wrap *128 ; dev->kthread_vid_cap =kthread_run (vivid_thread_vid_cap, dev,"%s-vid-cap" , dev->v4l2_dev.name);@@ -951,7 +977,23 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) } } -if (dev->vid_cap_streaming || dev->vbi_cap_streaming) +if (pstreaming == &dev->meta_cap_streaming) { +while (!list_empty (&dev->meta_cap_active)) { +struct vivid_buffer *buf; + + buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&buf->list); +v4l2_ctrl_request_complete (buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +dprintk (dev,2 ,"meta_cap buffer %d done\n" , + buf->vb.vb2_buf.index); + } + } + +if (dev->vid_cap_streaming || dev->vbi_cap_streaming || + dev->meta_cap_streaming)return ;/* shutdown control thread */ drivers/media/platform/vivid/vivid-meta-cap.c new file +163
-0@@ -0,0 +1,187 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-cap.c - meta capture support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/videodev2.h> +#include <media/v4l2-common.h> +#include <linux/usb/video.h> + +#include "vivid-core.h" +#include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" +#include "vivid-meta-gen.h" + +static int meta_cap_queue_setup (struct vb2_queue *vq,unsigned int *nbuffers, +unsigned int *nplanes,unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (*nplanes) { +if (sizes[0 ] < size) +return -EINVAL ; + }else { + sizes[0 ] = size; + } + +if (vq->num_buffers + *nbuffers <2 ) + *nbuffers =2 - vq->num_buffers; + + *nplanes =1 ; +return 0 ; +} + +static int meta_cap_buf_prepare (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +dprintk (dev,1 ,"%s\n" , __func__); + +if (dev->buf_prepare_error) { +/* +* Error injection: test what happens if buf_prepare() returns +* an error. +*/ + dev->buf_prepare_error = false; +return -EINVAL ; + } +if (vb2_plane_size (vb,0 ) < size) { +dprintk (dev,1 ,"%s data will not fit into plane (%lu < %u)\n" , + __func__,vb2_plane_size (vb,0 ), size); +return -EINVAL ; + } +vb2_set_plane_payload (vb,0 , size); + +return 0 ; +} + +static void meta_cap_buf_queue (struct vb2_buffer *vb) +{ +struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb); + +dprintk (dev,1 ,"%s\n" , __func__); + +spin_lock (&dev->slock); +list_add_tail (&buf->list, &dev->meta_cap_active); +spin_unlock (&dev->slock); +} + +static int meta_cap_start_streaming (struct vb2_queue *vq,unsigned int count) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +int err; + +dprintk (dev,1 ,"%s\n" , __func__); + dev->meta_cap_seq_count =0 ; +if (dev->start_streaming_error) { + dev->start_streaming_error = false; + err = -EINVAL ; + }else { + err =vivid_start_generating_vid_cap (dev, + &dev->meta_cap_streaming); + } +if (err) { +struct vivid_buffer *buf, *tmp; + +list_for_each_entry_safe (buf, tmp, + &dev->meta_cap_active, list) { +list_del (&buf->list); +vb2_buffer_done (&buf->vb.vb2_buf, +VB2_BUF_STATE_QUEUED ); + } + } +return err; +} + +/* abort streaming and wait for last buffer */ +static void meta_cap_stop_streaming (struct vb2_queue *vq) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); + +dprintk (dev,1 ,"%s\n" , __func__); +vivid_stop_generating_vid_cap (dev, &dev->meta_cap_streaming); +} + +static void meta_cap_buf_request_complete (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + +v4l2_ctrl_request_complete (vb->req_obj.req, &dev->ctrl_hdl_meta_cap); +} + +const struct vb2_ops vivid_meta_cap_qops = { + .queue_setup = meta_cap_queue_setup, + .buf_prepare = meta_cap_buf_prepare, + .buf_queue = meta_cap_buf_queue, + .start_streaming = meta_cap_start_streaming, + .stop_streaming = meta_cap_stop_streaming, + .buf_request_complete = meta_cap_buf_request_complete, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) +{ +struct vivid_dev *dev =video_drvdata (file); + +if (!vivid_is_webcam (dev)) +return -ENODATA ; + +if (f->index >0 ) +return -EINVAL ; + + f->type =V4L2_BUF_TYPE_META_CAPTURE ; + f->pixelformat =V4L2_META_FMT_UVC ; +return 0 ; +} + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct vivid_dev *dev =video_drvdata (file); +struct v4l2_meta_format *meta = &f->fmt.meta; + +if (!vivid_is_webcam (dev) || !dev->has_meta_cap) +return -EINVAL ; + + meta->dataformat =V4L2_META_FMT_UVC ; + meta->buffersize =sizeof (struct vivid_uvc_meta_buf ); +return 0 ; +} +
drivers/media/platform/vivid/vivid-meta-cap.c line 173
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +10
-0+int vidioc_s_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +int ret =vidioc_g_fmt_meta_cap (file, priv, f); + +if (ret) +return ret; +/*TODO: try fmt and then set meta format */ +return 0 ; +}
Just drop this function and use vidioc_g_fmt_meta_cap for the .vidioc_s_fmt_meta_cap callback.
drivers/media/platform/vivid/vivid-meta-cap.c line 184
Quoted 11 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +11
-0+ +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf) +{ +struct vivid_uvc_meta_buf *vbuf =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (vbuf,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); +vivid_meta_cap_gen (vbuf, buf->vb.sequence); +//vbuf = dev->meta_gen.data;
Delete this line.
drivers/media/platform/vivid/vivid-meta-cap.c line 186
Quoted 2 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +2
-0+dprintk (dev,1 ,"%s ns %llu sof %u, len %u, flags 0x%x\n" , + __func__, vbuf->ns, vbuf->sof, vbuf->length, vbuf->flags);
I'd set the debug level to 2 for this.
Quoted 15 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +1
-0+}drivers/media/platform/vivid/vivid-meta-cap.h new file +8
-0@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ +
drivers/media/platform/vivid/vivid-meta-cap.h line 18
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-cap.h new file +10
-0+void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +int vidioc_s_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f);
This function can be dropped.
Quoted 49 lines
drivers/media/platform/vivid/vivid-meta-cap.h new file +3
-0+ +extern const struct vb2_ops vivid_meta_cap_qops; +#endif drivers/media/platform/vivid/vivid-meta-gen.c new file +25
-0@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ; + meta->flags =UVC_STREAM_EOH ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}drivers/media/platform/vivid/vivid-meta-gen.h new file +9
-0@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +struct vivid_uvc_meta_buf {
drivers/media/platform/vivid/vivid-meta-gen.h line 19
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-gen.h new file +10
-0+__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +struct vivid_meta_gen_data { +struct vivid_uvc_meta_buf data; +};
Unused struct.
drivers/media/platform/vivid/vivid-meta-gen.h line 22
Quoted 4 lines
drivers/media/platform/vivid/vivid-meta-gen.h new file +3
-0+ +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Regards,
Hans
bnvandana at gmail.com (Vandana BN)
PATCH v5 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 92 ++++++++- drivers/media/platform/vivid/vivid-core.h | 12 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 175 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 18 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 18 ++ 9 files changed, 395 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +87 -5
188 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +12 -0
@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)
@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +397,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +416,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
drivers/media/platform/vivid/vivid-ctrls.c +14 -0
@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;
@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,
@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }
@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }
drivers/media/platform/vivid/vivid-kthread-cap.c +45 -3
99 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +175 -0
175 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif
drivers/media/platform/vivid/vivid-meta-gen.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ; + meta->flags =UVC_STREAM_EOH ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}
drivers/media/platform/vivid/vivid-meta-gen.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Signature · 1 line
2.17.1
hverkuil at xs4all.nl (Hans Verkuil)
PATCH v5 1/1 vivid: Add metadata capture support
Quoted 4 lines · Vandana BN
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
Signed-off-by Vandana BN <bnvandana at gmail.com>
It's good practice to mention what has changed since v4.
You can do that by adding a --- separator and then something along the lines of:
---
Changes since v4:
- foo
- bar
Everything between the two --- separators is ignored when the patch is merged, so it won't end up in the commit log.
Quoted 53 lines
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 92 ++++++++- drivers/media/platform/vivid/vivid-core.h | 12 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 175 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 18 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 18 ++ 9 files changed, 395 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.hdrivers/media/platform/vivid/Makefile +1
-1@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endifdrivers/media/platform/vivid/vivid-core.c +5
-0@@ -37,6 +37,7 @@#include "vivid-osd.h" #include "vivid-cec.h" #include "vivid-ctrls.h" +#include "vivid-meta-cap.h" #define VIVID_MODULE_NAME "vivid"@@ -79,6 +80,10 @@ static int radio_tx_nr[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = -1 };module_param_array (radio_tx_nr, int,NULL ,0444 );MODULE_PARM_DESC (radio_tx_nr," radioX start number, -1 is autodetect" ); +static int meta_cap_nr[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 }; +module_param_array (meta_cap_nr, int,NULL ,0444 ); +MODULE_PARM_DESC (meta_cap_nr," videoX start number, -1 is autodetect" ); +static int ccs_cap_mode[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 };module_param_array (ccs_cap_mode, int,NULL ,0444 ); MODULE_PARM_DESC(ccs_cap_mode, " capture crop/compose/scale mode:\n"
drivers/media/platform/vivid/vivid-core.c static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1 · line 103
Quoted 6 lines
drivers/media/platform/vivid/vivid-core.c +1
-2@@ -95,8 +100,12 @@ static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1module_param_array (multiplanar, uint,NULL ,0444 );MODULE_PARM_DESC (multiplanar," 1 (default) creates a single planar device, 2 creates a multiplanar device." ); -/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out */ -static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x1d3d }; +/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr +
Put this on a new line. A comment is either of the form:
/* A one line comment */
or:
/*
* A multiline comment.
* Line 2
*/
Quoted 627 lines
drivers/media/platform/vivid/vivid-core.c +81
-3+* vbi-out + vid-out + meta-cap +*/ +static unsigned int node_types[VIVID_MAX_DEVS ] = { + [0 ... (VIVID_MAX_DEVS -1 )] =0x21d3d +};module_param_array (node_types, uint,NULL ,0444 );MODULE_PARM_DESC (node_types," node types, default is 0x1d3d. Bitmask with the following meaning:\n" "\t\t bit 0: Video Capture node\n"@@ -106,7 +115,8 @@ MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f"\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" - "\t\t bit 16: Framebuffer for testing overlays"); +"\t\t bit 16: Framebuffer for testing overlays\n" + "\t\t bit 17: Metadata capture node\n");/* Default: 4 inputs */ static unsigned num_inputs[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =4 };@@ -205,7 +215,7 @@ static int vidioc_querycap(struct file *file, void *priv, cap->capabilities = dev->vid_cap_caps | dev->vid_out_caps | dev->vbi_cap_caps | dev->vbi_out_caps | dev->radio_rx_caps | dev->radio_tx_caps | - dev->sdr_cap_caps |V4L2_CAP_DEVICE_CAPS ; + dev->sdr_cap_caps | dev->meta_cap_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }@@ -433,7 +443,8 @@ static bool vivid_is_last_user(struct vivid_dev *dev)vivid_is_in_use (&dev->vbi_out_dev) +vivid_is_in_use (&dev->sdr_cap_dev) +vivid_is_in_use (&dev->radio_rx_dev) + -vivid_is_in_use (&dev->radio_tx_dev); +vivid_is_in_use (&dev->radio_tx_dev) + +vivid_is_in_use (&dev->meta_cap_dev);return uses ==1 ; }@@ -459,6 +470,7 @@ static int vivid_fop_release(struct file *file)set_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +set_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); }mutex_unlock (&dev->mutex);if (file->private_data == dev->overlay_cap_owner)@@ -604,6 +616,11 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_log_status = vidioc_log_status, .vidioc_subscribe_event = vidioc_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + + .vidioc_enum_fmt_meta_cap = vidioc_enum_fmt_meta_cap, + .vidioc_g_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_s_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_try_fmt_meta_cap = vidioc_g_fmt_meta_cap, };/* ----------------------------------------------------------------- @@ -818,6 +835,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->has_scaler_out ? 'Y' : 'N'); } +/* do we create a meta capture device */ + dev->has_meta_cap = node_type &0x20000 ; +/* end detecting feature set */ if (dev->has_vid_cap) {@@ -875,6 +895,11 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps =V4L2_CAP_RDS_OUTPUT |V4L2_CAP_MODULATOR |V4L2_CAP_READWRITE ; +/* set up the capabilities of meta capture device */ +if (dev->has_meta_cap) + dev->meta_cap_caps =V4L2_CAP_META_CAPTURE | +V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; + ret = -ENOMEM ;/* initialize the test pattern generator */ tpg_init (&dev->tpg,640 ,360 );@@ -1078,6 +1103,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)INIT_LIST_HEAD (&dev->vbi_cap_active);INIT_LIST_HEAD (&dev->vbi_out_active);INIT_LIST_HEAD (&dev->sdr_cap_active); +INIT_LIST_HEAD (&dev->meta_cap_active);INIT_LIST_HEAD (&dev->cec_work_list);spin_lock_init (&dev->cec_slock);@@ -1225,6 +1251,27 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->fb_info.node); } +if (dev->has_meta_cap) { +/* initialize meta_cap queue */ + q = &dev->vb_meta_cap_q; + q->type =V4L2_BUF_TYPE_META_CAPTURE ; + q->io_modes =VB2_MMAP |VB2_DMABUF |VB2_READ ; +if (!allocator) + q->io_modes |=VB2_USERPTR ; + q->drv_priv = dev; + q->buf_struct_size =sizeof (struct vivid_buffer ); + q->ops = &vivid_meta_cap_qops; + q->mem_ops = vivid_mem_ops[allocator]; + q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; + q->min_buffers_needed =2 ; + q->lock = &dev->mutex; + q->dev = dev->v4l2_dev.dev; + q->supports_requests = true; + ret =vb2_queue_init (q); +if (ret) + goto unreg_dev; + } +#ifdef CONFIG_VIDEO_VIVID_CEC if (dev->has_vid_cap && in_type_counter[HDMI ]) {struct cec_adapter *adap;@@ -1265,6 +1312,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_rx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_tx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_sdr_cap); +v4l2_ctrl_handler_setup (&dev->ctrl_hdl_meta_cap);/* finally start creating the device nodes */ if (dev->has_vid_cap) {@@ -1492,6 +1540,34 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) video_device_node_name(vfd)); } +if (dev->has_meta_cap) { + vfd = &dev->meta_cap_dev; +snprintf (vfd->name,sizeof (vfd->name), +"vivid-%03d-meta-cap" , inst); + vfd->fops = &vivid_fops; + vfd->ioctl_ops = &vivid_ioctl_ops; + vfd->device_caps = dev->meta_cap_caps; + vfd->release = video_device_release_empty; + vfd->v4l2_dev = &dev->v4l2_dev; + vfd->queue = &dev->vb_meta_cap_q; + vfd->lock = &dev->mutex; +video_set_drvdata (vfd, dev); +#ifdef CONFIG_MEDIA_CONTROLLER + dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , + &dev->meta_cap_pad); +if (ret) + goto unreg_dev; +#endif + ret =video_register_device (vfd,VFL_TYPE_METADATA , + meta_cap_nr[inst]); +if (ret <0 ) + goto unreg_dev; +v4l2_info (&dev->v4l2_dev, +"V4L2 metadata capture device registered as %s\n" , +video_device_node_name (vfd)); + } +#ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device */ ret =media_device_register (&dev->mdev);@@ -1508,6 +1584,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)return 0 ; unreg_dev: +video_unregister_device (&dev->meta_cap_dev);video_unregister_device (&dev->radio_tx_dev);video_unregister_device (&dev->radio_rx_dev);video_unregister_device (&dev->sdr_cap_dev);@@ -1624,6 +1701,11 @@ static int vivid_remove(struct platform_device *pdev)unregister_framebuffer (&dev->fb_info);vivid_fb_release_buffers (dev); } +if (dev->has_meta_cap) { +v4l2_info (&dev->v4l2_dev,"unregistering %s\n" , +video_device_node_name (&dev->meta_cap_dev)); +video_unregister_device (&dev->meta_cap_dev); + }cec_unregister_adapter (dev->cec_rx_adap);for (j =0 ; j <MAX_OUTPUTS ; j++)cec_unregister_adapter (dev->cec_tx_adap[j]);drivers/media/platform/vivid/vivid-core.h +12
-0@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;@@ -390,6 +397,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;@@ -407,6 +416,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;drivers/media/platform/vivid/vivid-ctrls.c +14
-0@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }drivers/media/platform/vivid/vivid-kthread-cap.c +45
-3@@ -39,6 +39,7 @@#include "vivid-osd.h" #include "vivid-ctrls.h" #include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" static inline v4l2_std_id vivid_get_std_cap (const struct vivid_dev *dev) {@@ -677,6 +678,7 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, {struct vivid_buffer *vid_cap_buf =NULL ;struct vivid_buffer *vbi_cap_buf =NULL ; +struct vivid_buffer *meta_cap_buf =NULL ;u64 f_time =0 ;dprintk (dev,1 ,"Video Capture Thread Tick\n" );@@ -704,9 +706,15 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,list_del (&vbi_cap_buf->list); } } +if (!list_empty (&dev->meta_cap_active)) { + meta_cap_buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&meta_cap_buf->list); + } +spin_unlock (&dev->slock); -if (!vid_cap_buf && !vbi_cap_buf) +if (!vid_cap_buf && !vbi_cap_buf && !meta_cap_buf) goto update_mv; f_time = dev->cap_frame_period * dev->vid_cap_seq_count +@@ -758,6 +766,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,do_div (vbi_period,100 ); vbi_cap_buf->vb.vb2_buf.timestamp = f_time + vbi_period; } + +if (meta_cap_buf) { +v4l2_ctrl_request_setup (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vivid_meta_cap_fillbuff (dev, meta_cap_buf); +v4l2_ctrl_request_complete (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&meta_cap_buf->vb.vb2_buf, dev->dqbuf_error ? +VB2_BUF_STATE_ERROR :VB2_BUF_STATE_DONE ); +dprintk (dev,2 ,"meta_cap %d done\n" , + meta_cap_buf->vb.vb2_buf.index); + meta_cap_buf->vb.vb2_buf.timestamp = f_time; + } + dev->dqbuf_error = false; update_mv:@@ -835,6 +857,7 @@ static int vivid_thread_vid_cap(void *data) dev->cap_seq_count = buffers_since_start + dev->cap_seq_offset; dev->vid_cap_seq_count = dev->cap_seq_count - dev->vid_cap_seq_start; dev->vbi_cap_seq_count = dev->cap_seq_count - dev->vbi_cap_seq_start; + dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;vivid_thread_vid_cap_tick (dev, dropped_bufs);@@ -883,8 +906,10 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)if (pstreaming == &dev->vid_cap_streaming) dev->vid_cap_seq_start = seq_count; -else +else if (pstreaming == &dev->vbi_cap_streaming) dev->vbi_cap_seq_start = seq_count; +else + dev->meta_cap_seq_start = seq_count; *pstreaming = true;return 0 ; }@@ -894,6 +919,7 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) dev->vid_cap_seq_start = dev->seq_wrap *128 ; dev->vbi_cap_seq_start = dev->seq_wrap *128 ; + dev->meta_cap_seq_start = dev->seq_wrap *128 ; dev->kthread_vid_cap =kthread_run (vivid_thread_vid_cap, dev,"%s-vid-cap" , dev->v4l2_dev.name);@@ -951,7 +977,23 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) } } -if (dev->vid_cap_streaming || dev->vbi_cap_streaming) +if (pstreaming == &dev->meta_cap_streaming) { +while (!list_empty (&dev->meta_cap_active)) { +struct vivid_buffer *buf; + + buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&buf->list); +v4l2_ctrl_request_complete (buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +dprintk (dev,2 ,"meta_cap buffer %d done\n" , + buf->vb.vb2_buf.index); + } + } + +if (dev->vid_cap_streaming || dev->vbi_cap_streaming || + dev->meta_cap_streaming)return ;/* shutdown control thread */ drivers/media/platform/vivid/vivid-meta-cap.c new file +175
-0@@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-cap.c - meta capture support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/videodev2.h> +#include <media/v4l2-common.h> +#include <linux/usb/video.h> + +#include "vivid-core.h" +#include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" +#include "vivid-meta-gen.h" + +static int meta_cap_queue_setup (struct vb2_queue *vq,unsigned int *nbuffers, +unsigned int *nplanes,unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (*nplanes) { +if (sizes[0 ] < size) +return -EINVAL ; + }else { + sizes[0 ] = size; + } + +if (vq->num_buffers + *nbuffers <2 ) + *nbuffers =2 - vq->num_buffers; + + *nplanes =1 ; +return 0 ; +} + +static int meta_cap_buf_prepare (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +dprintk (dev,1 ,"%s\n" , __func__); + +if (dev->buf_prepare_error) { +/* +* Error injection: test what happens if buf_prepare() returns +* an error. +*/ + dev->buf_prepare_error = false; +return -EINVAL ; + } +if (vb2_plane_size (vb,0 ) < size) { +dprintk (dev,1 ,"%s data will not fit into plane (%lu < %u)\n" , + __func__,vb2_plane_size (vb,0 ), size); +return -EINVAL ; + } +vb2_set_plane_payload (vb,0 , size); + +return 0 ; +} + +static void meta_cap_buf_queue (struct vb2_buffer *vb) +{ +struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb); + +dprintk (dev,1 ,"%s\n" , __func__); + +spin_lock (&dev->slock); +list_add_tail (&buf->list, &dev->meta_cap_active); +spin_unlock (&dev->slock); +} + +static int meta_cap_start_streaming (struct vb2_queue *vq,unsigned int count) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +int err; + +dprintk (dev,1 ,"%s\n" , __func__); + dev->meta_cap_seq_count =0 ; +if (dev->start_streaming_error) { + dev->start_streaming_error = false; + err = -EINVAL ; + }else { + err =vivid_start_generating_vid_cap (dev, + &dev->meta_cap_streaming); + } +if (err) { +struct vivid_buffer *buf, *tmp; + +list_for_each_entry_safe (buf, tmp, + &dev->meta_cap_active, list) { +list_del (&buf->list); +vb2_buffer_done (&buf->vb.vb2_buf, +VB2_BUF_STATE_QUEUED ); + } + } +return err; +} + +/* abort streaming and wait for last buffer */ +static void meta_cap_stop_streaming (struct vb2_queue *vq) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); + +dprintk (dev,1 ,"%s\n" , __func__); +vivid_stop_generating_vid_cap (dev, &dev->meta_cap_streaming); +} + +static void meta_cap_buf_request_complete (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + +v4l2_ctrl_request_complete (vb->req_obj.req, &dev->ctrl_hdl_meta_cap); +} + +const struct vb2_ops vivid_meta_cap_qops = { + .queue_setup = meta_cap_queue_setup, + .buf_prepare = meta_cap_buf_prepare, + .buf_queue = meta_cap_buf_queue, + .start_streaming = meta_cap_start_streaming, + .stop_streaming = meta_cap_stop_streaming, + .buf_request_complete = meta_cap_buf_request_complete, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) +{ +struct vivid_dev *dev =video_drvdata (file); + +if (!vivid_is_webcam (dev)) +return -ENODATA ; + +if (f->index >0 ) +return -EINVAL ; + + f->type =V4L2_BUF_TYPE_META_CAPTURE ; + f->pixelformat =V4L2_META_FMT_UVC ; +return 0 ; +} + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct vivid_dev *dev =video_drvdata (file); +struct v4l2_meta_format *meta = &f->fmt.meta; + +if (!vivid_is_webcam (dev) || !dev->has_meta_cap) +return -EINVAL ; + + meta->dataformat =V4L2_META_FMT_UVC ; + meta->buffersize =sizeof (struct vivid_uvc_meta_buf ); +return 0 ; +} + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf) +{ +struct vivid_uvc_meta_buf *vbuf =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (vbuf,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); +vivid_meta_cap_gen (vbuf, buf->vb.sequence); +dprintk (dev,2 ,"%s ns %llu sof %u, len %u, flags 0x%x\n" , + __func__, vbuf->ns, vbuf->sof, vbuf->length, vbuf->flags); +}drivers/media/platform/vivid/vivid-meta-cap.h new file +18
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif drivers/media/platform/vivid/vivid-meta-gen.c new file +11
-0@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h>
drivers/media/platform/vivid/vivid-meta-gen.c line 21
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +10
-0+#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (meta->ns) +sizeof (meta->sof) +2 ;
This is wrong. The length is sizeof(*meta) - offsetof(struct vivid_uvc_meta_buf, length)
The sof value is a bit weird: I expect this to be updated for every buffer, instead the first 4 frames have a sof of 0, the next four have a sof of 4, the next 4 frames have a sof of 8, etc.
I would expect to see it increment by some value (4 seems a bit small) for every frame. Looking at what happens with uvc it seems that for every frame a lot of metadata packets arrive, but all with the same SOF. Whenever a new video frame begins the SOF value increases by some small value (around 30).
In the emulation we don't need to have multiple metadata packets per frame, one is sufficient. But I would expect to see the SOF increase for every frame.
drivers/media/platform/vivid/vivid-meta-gen.c line 24
Quoted 3 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +3
-0+ meta->flags =UVC_STREAM_EOH ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ;
This seems to be always 1. I suspect meta->flags needs to be cleared somewhere.
Bit 1 (End of Frame) should also be set, since this is always the end of frame since we transmit only one metadata buffer per frame.
Quoted 16 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +1
-0+}drivers/media/platform/vivid/vivid-meta-gen.h new file +8
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ +
drivers/media/platform/vivid/vivid-meta-gen.h line 18
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-gen.h new file +10
-0+struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Regards,
Hans
PATCH v6 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
---
Changes since v5:
-Use multiline comment in vivid-core.c. -changed vivid_meta_cap_gen() to take proper length.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 93 +++++++++- drivers/media/platform/vivid/vivid-core.h | 12 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 175 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 18 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 18 ++ 9 files changed, 396 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +88 -5
189 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +12 -0
@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)
@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +397,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +416,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
drivers/media/platform/vivid/vivid-ctrls.c +14 -0
@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;
@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,
@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }
@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }
drivers/media/platform/vivid/vivid-kthread-cap.c +45 -3
99 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +175 -0
175 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +* +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif
drivers/media/platform/vivid/vivid-meta-gen.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +* +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h> +#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq; + meta->length =sizeof (*meta) - offsetof(struct vivid_uvc_meta_buf , length); + meta->flags =UVC_STREAM_EOH |UVC_STREAM_EOF ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}
drivers/media/platform/vivid/vivid-meta-gen.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq); +#endif
Signature · 1 line
2.17.1
PATCH v6 1/1 vivid: Add metadata capture support
Quoted 65 lines · Vandana BN
This patch adds meatadata capture support in vivid driver. Added new files for metadata capture.
Signed-off-by Vandana BN <bnvandana at gmail.com>---
Changes since v5:(quoted diff) +0
-3-Use multiline comment in vivid-core.c. -changed vivid_meta_cap_gen() to take proper length. --- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 93 +++++++++- drivers/media/platform/vivid/vivid-core.h | 12 ++ drivers/media/platform/vivid/vivid-ctrls.c | 14 ++ .../media/platform/vivid/vivid-kthread-cap.c | 48 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 175 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 18 ++ drivers/media/platform/vivid/vivid-meta-gen.c | 25 +++ drivers/media/platform/vivid/vivid-meta-gen.h | 18 ++ 9 files changed, 396 insertions(+), 9 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.c create mode 100644 drivers/media/platform/vivid/vivid-meta-gen.hdrivers/media/platform/vivid/Makefile +1
-1@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o vivid-meta-gen.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endifdrivers/media/platform/vivid/vivid-core.c +5
-1@@ -37,6 +37,7 @@#include "vivid-osd.h" #include "vivid-cec.h" #include "vivid-ctrls.h" +#include "vivid-meta-cap.h" #define VIVID_MODULE_NAME "vivid"@@ -79,6 +80,10 @@ static int radio_tx_nr[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = -1 };module_param_array (radio_tx_nr, int,NULL ,0444 );MODULE_PARM_DESC (radio_tx_nr," radioX start number, -1 is autodetect" ); +static int meta_cap_nr[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 }; +module_param_array (meta_cap_nr, int,NULL ,0444 ); +MODULE_PARM_DESC (meta_cap_nr," videoX start number, -1 is autodetect" ); +static int ccs_cap_mode[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 };module_param_array (ccs_cap_mode, int,NULL ,0444 ); MODULE_PARM_DESC(ccs_cap_mode, " capture crop/compose/scale mode:\n"@@ -95,8 +100,13 @@ static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1module_param_array (multiplanar, uint,NULL ,0444 );MODULE_PARM_DESC (multiplanar," 1 (default) creates a single planar device, 2 creates a multiplanar device." ); -/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out */
drivers/media/platform/vivid/vivid-core.c static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1 · line 111
Quoted 10 lines
drivers/media/platform/vivid/vivid-core.c +7
-1-static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x1d3d }; +/* +* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + +* vbi-out + vid-out + meta-cap +*/ +static unsigned int node_types[VIVID_MAX_DEVS ] = { + [0 ... (VIVID_MAX_DEVS -1 )] =0x21d3d +};module_param_array (node_types, uint,NULL ,0444 ); MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the following meaning:\n"
The default value in this text needs to be update (0x21d3d).
drivers/media/platform/vivid/vivid-core.c MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f · line 120
Quoted 8 lines
drivers/media/platform/vivid/vivid-core.c +2
-1"\t\t bit 0: Video Capture node\n" @@ -106,7 +116,8 @@ MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f"\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" - "\t\t bit 16: Framebuffer for testing overlays"); +"\t\t bit 16: Framebuffer for testing overlays\n" + "\t\t bit 17: Metadata capture node\n");
Nitpick: capture -> Capture (conforms with e.g. Video Capture)
Quoted 396 lines
drivers/media/platform/vivid/vivid-core.c +74
-2/* Default: 4 inputs */ static unsigned num_inputs[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =4 };@@ -205,7 +216,7 @@ static int vidioc_querycap(struct file *file, void *priv, cap->capabilities = dev->vid_cap_caps | dev->vid_out_caps | dev->vbi_cap_caps | dev->vbi_out_caps | dev->radio_rx_caps | dev->radio_tx_caps | - dev->sdr_cap_caps |V4L2_CAP_DEVICE_CAPS ; + dev->sdr_cap_caps | dev->meta_cap_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }@@ -433,7 +444,8 @@ static bool vivid_is_last_user(struct vivid_dev *dev)vivid_is_in_use (&dev->vbi_out_dev) +vivid_is_in_use (&dev->sdr_cap_dev) +vivid_is_in_use (&dev->radio_rx_dev) + -vivid_is_in_use (&dev->radio_tx_dev); +vivid_is_in_use (&dev->radio_tx_dev) + +vivid_is_in_use (&dev->meta_cap_dev);return uses ==1 ; }@@ -459,6 +471,7 @@ static int vivid_fop_release(struct file *file)set_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +set_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); }mutex_unlock (&dev->mutex);if (file->private_data == dev->overlay_cap_owner)@@ -604,6 +617,11 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_log_status = vidioc_log_status, .vidioc_subscribe_event = vidioc_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + + .vidioc_enum_fmt_meta_cap = vidioc_enum_fmt_meta_cap, + .vidioc_g_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_s_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_try_fmt_meta_cap = vidioc_g_fmt_meta_cap, };/* ----------------------------------------------------------------- @@ -818,6 +836,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->has_scaler_out ? 'Y' : 'N'); } +/* do we create a meta capture device */ + dev->has_meta_cap = node_type &0x20000 ; +/* end detecting feature set */ if (dev->has_vid_cap) {@@ -875,6 +896,11 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps =V4L2_CAP_RDS_OUTPUT |V4L2_CAP_MODULATOR |V4L2_CAP_READWRITE ; +/* set up the capabilities of meta capture device */ +if (dev->has_meta_cap) + dev->meta_cap_caps =V4L2_CAP_META_CAPTURE | +V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; + ret = -ENOMEM ;/* initialize the test pattern generator */ tpg_init (&dev->tpg,640 ,360 );@@ -1078,6 +1104,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)INIT_LIST_HEAD (&dev->vbi_cap_active);INIT_LIST_HEAD (&dev->vbi_out_active);INIT_LIST_HEAD (&dev->sdr_cap_active); +INIT_LIST_HEAD (&dev->meta_cap_active);INIT_LIST_HEAD (&dev->cec_work_list);spin_lock_init (&dev->cec_slock);@@ -1225,6 +1252,27 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->fb_info.node); } +if (dev->has_meta_cap) { +/* initialize meta_cap queue */ + q = &dev->vb_meta_cap_q; + q->type =V4L2_BUF_TYPE_META_CAPTURE ; + q->io_modes =VB2_MMAP |VB2_DMABUF |VB2_READ ; +if (!allocator) + q->io_modes |=VB2_USERPTR ; + q->drv_priv = dev; + q->buf_struct_size =sizeof (struct vivid_buffer ); + q->ops = &vivid_meta_cap_qops; + q->mem_ops = vivid_mem_ops[allocator]; + q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; + q->min_buffers_needed =2 ; + q->lock = &dev->mutex; + q->dev = dev->v4l2_dev.dev; + q->supports_requests = true; + ret =vb2_queue_init (q); +if (ret) + goto unreg_dev; + } +#ifdef CONFIG_VIDEO_VIVID_CEC if (dev->has_vid_cap && in_type_counter[HDMI ]) {struct cec_adapter *adap;@@ -1265,6 +1313,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_rx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_tx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_sdr_cap); +v4l2_ctrl_handler_setup (&dev->ctrl_hdl_meta_cap);/* finally start creating the device nodes */ if (dev->has_vid_cap) {@@ -1492,6 +1541,34 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) video_device_node_name(vfd)); } +if (dev->has_meta_cap) { + vfd = &dev->meta_cap_dev; +snprintf (vfd->name,sizeof (vfd->name), +"vivid-%03d-meta-cap" , inst); + vfd->fops = &vivid_fops; + vfd->ioctl_ops = &vivid_ioctl_ops; + vfd->device_caps = dev->meta_cap_caps; + vfd->release = video_device_release_empty; + vfd->v4l2_dev = &dev->v4l2_dev; + vfd->queue = &dev->vb_meta_cap_q; + vfd->lock = &dev->mutex; +video_set_drvdata (vfd, dev); +#ifdef CONFIG_MEDIA_CONTROLLER + dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , + &dev->meta_cap_pad); +if (ret) + goto unreg_dev; +#endif + ret =video_register_device (vfd,VFL_TYPE_METADATA , + meta_cap_nr[inst]); +if (ret <0 ) + goto unreg_dev; +v4l2_info (&dev->v4l2_dev, +"V4L2 metadata capture device registered as %s\n" , +video_device_node_name (vfd)); + } +#ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device */ ret =media_device_register (&dev->mdev);@@ -1508,6 +1585,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)return 0 ; unreg_dev: +video_unregister_device (&dev->meta_cap_dev);video_unregister_device (&dev->radio_tx_dev);video_unregister_device (&dev->radio_rx_dev);video_unregister_device (&dev->sdr_cap_dev);@@ -1624,6 +1702,11 @@ static int vivid_remove(struct platform_device *pdev)unregister_framebuffer (&dev->fb_info);vivid_fb_release_buffers (dev); } +if (dev->has_meta_cap) { +v4l2_info (&dev->v4l2_dev,"unregistering %s\n" , +video_device_node_name (&dev->meta_cap_dev)); +video_unregister_device (&dev->meta_cap_dev); + }cec_unregister_adapter (dev->cec_rx_adap);for (j =0 ; j <MAX_OUTPUTS ; j++)cec_unregister_adapter (dev->cec_tx_adap[j]);drivers/media/platform/vivid/vivid-core.h +12
-0@@ -18,6 +18,7 @@#include <media/tpg/v4l2-tpg.h> #include "vivid-rds-gen.h" #include "vivid-vbi-gen.h" +#include "vivid-meta-gen.h" #define dprintk(dev, level, fmt, arg...) \ v4l2_dbg(level, vivid_debug, &dev->v4l2_dev, fmt, ## arg)@@ -131,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;@@ -153,6 +155,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;@@ -164,6 +169,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;@@ -189,6 +195,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;@@ -390,6 +397,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;@@ -407,6 +416,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;drivers/media/platform/vivid/vivid-ctrls.c +14
-0@@ -110,6 +110,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;@@ -1448,6 +1449,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,@@ -1486,6 +1489,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,@@ -1817,6 +1822,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }@@ -1836,4 +1849,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }drivers/media/platform/vivid/vivid-kthread-cap.c +45
-3@@ -39,6 +39,7 @@#include "vivid-osd.h" #include "vivid-ctrls.h" #include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" static inline v4l2_std_id vivid_get_std_cap (const struct vivid_dev *dev) {@@ -677,6 +678,7 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, {struct vivid_buffer *vid_cap_buf =NULL ;struct vivid_buffer *vbi_cap_buf =NULL ; +struct vivid_buffer *meta_cap_buf =NULL ;u64 f_time =0 ;dprintk (dev,1 ,"Video Capture Thread Tick\n" );@@ -704,9 +706,15 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,list_del (&vbi_cap_buf->list); } } +if (!list_empty (&dev->meta_cap_active)) { + meta_cap_buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&meta_cap_buf->list); + } +spin_unlock (&dev->slock); -if (!vid_cap_buf && !vbi_cap_buf) +if (!vid_cap_buf && !vbi_cap_buf && !meta_cap_buf) goto update_mv; f_time = dev->cap_frame_period * dev->vid_cap_seq_count +@@ -758,6 +766,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,do_div (vbi_period,100 ); vbi_cap_buf->vb.vb2_buf.timestamp = f_time + vbi_period; } + +if (meta_cap_buf) { +v4l2_ctrl_request_setup (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vivid_meta_cap_fillbuff (dev, meta_cap_buf); +v4l2_ctrl_request_complete (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&meta_cap_buf->vb.vb2_buf, dev->dqbuf_error ? +VB2_BUF_STATE_ERROR :VB2_BUF_STATE_DONE ); +dprintk (dev,2 ,"meta_cap %d done\n" , + meta_cap_buf->vb.vb2_buf.index); + meta_cap_buf->vb.vb2_buf.timestamp = f_time; + } + dev->dqbuf_error = false; update_mv:@@ -835,6 +857,7 @@ static int vivid_thread_vid_cap(void *data) dev->cap_seq_count = buffers_since_start + dev->cap_seq_offset; dev->vid_cap_seq_count = dev->cap_seq_count - dev->vid_cap_seq_start; dev->vbi_cap_seq_count = dev->cap_seq_count - dev->vbi_cap_seq_start; + dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;vivid_thread_vid_cap_tick (dev, dropped_bufs);@@ -883,8 +906,10 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)if (pstreaming == &dev->vid_cap_streaming) dev->vid_cap_seq_start = seq_count; -else +else if (pstreaming == &dev->vbi_cap_streaming) dev->vbi_cap_seq_start = seq_count; +else + dev->meta_cap_seq_start = seq_count; *pstreaming = true;return 0 ; }@@ -894,6 +919,7 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) dev->vid_cap_seq_start = dev->seq_wrap *128 ; dev->vbi_cap_seq_start = dev->seq_wrap *128 ; + dev->meta_cap_seq_start = dev->seq_wrap *128 ; dev->kthread_vid_cap =kthread_run (vivid_thread_vid_cap, dev,"%s-vid-cap" , dev->v4l2_dev.name);@@ -951,7 +977,23 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) } } -if (dev->vid_cap_streaming || dev->vbi_cap_streaming) +if (pstreaming == &dev->meta_cap_streaming) { +while (!list_empty (&dev->meta_cap_active)) { +struct vivid_buffer *buf; + + buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&buf->list); +v4l2_ctrl_request_complete (buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +dprintk (dev,2 ,"meta_cap buffer %d done\n" , + buf->vb.vb2_buf.index); + } + } + +if (dev->vid_cap_streaming || dev->vbi_cap_streaming || + dev->meta_cap_streaming)return ;/* shutdown control thread */ drivers/media/platform/vivid/vivid-meta-cap.c new file +0
-0
drivers/media/platform/vivid/vivid-meta-cap.c line 4
Quoted 4 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +4
-0@@ -0,0 +1,175 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-cap.c - meta capture support functions. +*
Nitpick: drop this empty comment line
Quoted 177 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +171
-0+*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/videodev2.h> +#include <media/v4l2-common.h> +#include <linux/usb/video.h> + +#include "vivid-core.h" +#include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" +#include "vivid-meta-gen.h" + +static int meta_cap_queue_setup (struct vb2_queue *vq,unsigned int *nbuffers, +unsigned int *nplanes,unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (*nplanes) { +if (sizes[0 ] < size) +return -EINVAL ; + }else { + sizes[0 ] = size; + } + +if (vq->num_buffers + *nbuffers <2 ) + *nbuffers =2 - vq->num_buffers; + + *nplanes =1 ; +return 0 ; +} + +static int meta_cap_buf_prepare (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +dprintk (dev,1 ,"%s\n" , __func__); + +if (dev->buf_prepare_error) { +/* +* Error injection: test what happens if buf_prepare() returns +* an error. +*/ + dev->buf_prepare_error = false; +return -EINVAL ; + } +if (vb2_plane_size (vb,0 ) < size) { +dprintk (dev,1 ,"%s data will not fit into plane (%lu < %u)\n" , + __func__,vb2_plane_size (vb,0 ), size); +return -EINVAL ; + } +vb2_set_plane_payload (vb,0 , size); + +return 0 ; +} + +static void meta_cap_buf_queue (struct vb2_buffer *vb) +{ +struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb); + +dprintk (dev,1 ,"%s\n" , __func__); + +spin_lock (&dev->slock); +list_add_tail (&buf->list, &dev->meta_cap_active); +spin_unlock (&dev->slock); +} + +static int meta_cap_start_streaming (struct vb2_queue *vq,unsigned int count) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +int err; + +dprintk (dev,1 ,"%s\n" , __func__); + dev->meta_cap_seq_count =0 ; +if (dev->start_streaming_error) { + dev->start_streaming_error = false; + err = -EINVAL ; + }else { + err =vivid_start_generating_vid_cap (dev, + &dev->meta_cap_streaming); + } +if (err) { +struct vivid_buffer *buf, *tmp; + +list_for_each_entry_safe (buf, tmp, + &dev->meta_cap_active, list) { +list_del (&buf->list); +vb2_buffer_done (&buf->vb.vb2_buf, +VB2_BUF_STATE_QUEUED ); + } + } +return err; +} + +/* abort streaming and wait for last buffer */ +static void meta_cap_stop_streaming (struct vb2_queue *vq) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); + +dprintk (dev,1 ,"%s\n" , __func__); +vivid_stop_generating_vid_cap (dev, &dev->meta_cap_streaming); +} + +static void meta_cap_buf_request_complete (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + +v4l2_ctrl_request_complete (vb->req_obj.req, &dev->ctrl_hdl_meta_cap); +} + +const struct vb2_ops vivid_meta_cap_qops = { + .queue_setup = meta_cap_queue_setup, + .buf_prepare = meta_cap_buf_prepare, + .buf_queue = meta_cap_buf_queue, + .start_streaming = meta_cap_start_streaming, + .stop_streaming = meta_cap_stop_streaming, + .buf_request_complete = meta_cap_buf_request_complete, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) +{ +struct vivid_dev *dev =video_drvdata (file); + +if (!vivid_is_webcam (dev)) +return -ENODATA ; + +if (f->index >0 ) +return -EINVAL ; + + f->type =V4L2_BUF_TYPE_META_CAPTURE ; + f->pixelformat =V4L2_META_FMT_UVC ; +return 0 ; +} + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct vivid_dev *dev =video_drvdata (file); +struct v4l2_meta_format *meta = &f->fmt.meta; + +if (!vivid_is_webcam (dev) || !dev->has_meta_cap) +return -EINVAL ; + + meta->dataformat =V4L2_META_FMT_UVC ; + meta->buffersize =sizeof (struct vivid_uvc_meta_buf ); +return 0 ; +} + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf) +{ +struct vivid_uvc_meta_buf *vbuf =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (vbuf,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); +vivid_meta_cap_gen (vbuf, buf->vb.sequence); +dprintk (dev,2 ,"%s ns %llu sof %u, len %u, flags 0x%x\n" , + __func__, vbuf->ns, vbuf->sof, vbuf->length, vbuf->flags); +}drivers/media/platform/vivid/vivid-meta-cap.h new file +0
-0
drivers/media/platform/vivid/vivid-meta-cap.h line 4
Quoted 4 lines
drivers/media/platform/vivid/vivid-meta-cap.h new file +4
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*
Nitpick: drop this empty comment line.
Quoted 20 lines
drivers/media/platform/vivid/vivid-meta-cap.h new file +14
-0+*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev,struct vivid_buffer *buf); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; +#endif drivers/media/platform/vivid/vivid-meta-gen.c new file +0
-0
drivers/media/platform/vivid/vivid-meta-gen.c line 4
Quoted 4 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +4
-0@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-gen.c - metadata generator support functions. +*
Nitpick: drop this empty comment line.
Quoted 6 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +6
-0+*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/ktime.h> +#include <linux/string.h>
drivers/media/platform/vivid/vivid-meta-gen.c line 20
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +10
-0+#include <linux/videodev2.h> +#include <linux/usb/video.h> + +#include "vivid-meta-gen.h" +#include "vivid-core.h" + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq) +{ + meta->ns =ktime_get_ns (); + meta->sof = seq;
Typically in a real usb device there will be multiple USB frames for each video frame, so I'd change this to seq * 30. If you want to be really fancy, then this would actually depend on the size of the capture video frame. But it doesn't seem to be trivial to get hold of that information from here.
Quoted 18 lines
drivers/media/platform/vivid/vivid-meta-gen.c new file +5
-0+ meta->length =sizeof (*meta) - offsetof(struct vivid_uvc_meta_buf , length); + meta->flags =UVC_STREAM_EOH |UVC_STREAM_EOF ; +if ((seq %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; +}drivers/media/platform/vivid/vivid-meta-gen.h new file +7
-0@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-gen.h - meta generator support functions. +* +*/ +#ifndef _VIVID_META_GEN_H_ +#define _VIVID_META_GEN_H_
drivers/media/platform/vivid/vivid-meta-gen.h line 17
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-gen.h new file +10
-0+ +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[]; +} __packed; + +void vivid_meta_cap_gen (struct vivid_uvc_meta_buf *meta,unsigned int seq);
Nitpick: add a newline here.
drivers/media/platform/vivid/vivid-meta-gen.h line 18
Quoted 2 lines
drivers/media/platform/vivid/vivid-meta-gen.h new file +1
-0+#endif
You can fix these issues, but since [PATCH v3] v4l2-core: Add metadata type to vfl_devnode_type needs updating (which will have cascade effects in this patch), I'd hold off on a v7.
Regards,
Hans
v7 cover vivid: Add metadata capture support
This Patch series adds support for emulation of metadata capture in vivid driver.
UVCH metadata format is supported as it is widely used in webcams.
https://hverkuil.home.xs4all.nl/spec/uapi/v4l/pixfmt-meta-uvc.html
Regards,
Vandana.
Hans Verkuil (1):
vivid: fixes for v4l2-compliance issues.
Vandana BN (1):
vivid: Add metadata capture support
drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 107 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 64 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 52 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 462 insertions(+), 12 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
Signature · 1 line
2.17.1
PATCH v7 1/2 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 93 +++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 64 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 52 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ 7 files changed, 444 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +88 -5
189 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +14 -0
@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)
drivers/media/platform/vivid/vivid-ctrls.c +64 -0
110 lines not on this page · raw message
drivers/media/platform/vivid/vivid-kthread-cap.c +47 -5
113 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +201 -0
201 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
Signature · 1 line
2.17.1
PATCH v7 1/2 vivid: Add metadata capture support
Quoted 321 lines · Vandana BN
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream.Signed-off-by Vandana BN <bnvandana at gmail.com>--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 93 +++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 64 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 52 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ 7 files changed, 444 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.hdrivers/media/platform/vivid/Makefile +1
-1@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endifdrivers/media/platform/vivid/vivid-core.c +88
-5@@ -37,6 +37,7 @@#include "vivid-osd.h" #include "vivid-cec.h" #include "vivid-ctrls.h" +#include "vivid-meta-cap.h" #define VIVID_MODULE_NAME "vivid"@@ -79,6 +80,10 @@ static int radio_tx_nr[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = -1 };module_param_array (radio_tx_nr, int,NULL ,0444 );MODULE_PARM_DESC (radio_tx_nr," radioX start number, -1 is autodetect" ); +static int meta_cap_nr[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 }; +module_param_array (meta_cap_nr, int,NULL ,0444 ); +MODULE_PARM_DESC (meta_cap_nr," videoX start number, -1 is autodetect" ); +static int ccs_cap_mode[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 };module_param_array (ccs_cap_mode, int,NULL ,0444 ); MODULE_PARM_DESC(ccs_cap_mode, " capture crop/compose/scale mode:\n"@@ -95,8 +100,13 @@ static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1module_param_array (multiplanar, uint,NULL ,0444 );MODULE_PARM_DESC (multiplanar," 1 (default) creates a single planar device, 2 creates a multiplanar device." ); -/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out */ -static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x1d3d }; +/* +* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + +* vbi-out + vid-out + meta-cap +*/ +static unsigned int node_types[VIVID_MAX_DEVS ] = { + [0 ... (VIVID_MAX_DEVS -1 )] =0x21d3d +};module_param_array (node_types, uint,NULL ,0444 );MODULE_PARM_DESC (node_types," node types, default is 0x1d3d. Bitmask with the following meaning:\n" "\t\t bit 0: Video Capture node\n"@@ -106,7 +116,8 @@ MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f"\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" - "\t\t bit 16: Framebuffer for testing overlays"); +"\t\t bit 16: Framebuffer for testing overlays\n" + "\t\t bit 17: Metadata Capture node\n");/* Default: 4 inputs */ static unsigned num_inputs[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =4 };@@ -205,7 +216,7 @@ static int vidioc_querycap(struct file *file, void *priv, cap->capabilities = dev->vid_cap_caps | dev->vid_out_caps | dev->vbi_cap_caps | dev->vbi_out_caps | dev->radio_rx_caps | dev->radio_tx_caps | - dev->sdr_cap_caps |V4L2_CAP_DEVICE_CAPS ; + dev->sdr_cap_caps | dev->meta_cap_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }@@ -433,7 +444,8 @@ static bool vivid_is_last_user(struct vivid_dev *dev)vivid_is_in_use (&dev->vbi_out_dev) +vivid_is_in_use (&dev->sdr_cap_dev) +vivid_is_in_use (&dev->radio_rx_dev) + -vivid_is_in_use (&dev->radio_tx_dev); +vivid_is_in_use (&dev->radio_tx_dev) + +vivid_is_in_use (&dev->meta_cap_dev);return uses ==1 ; }@@ -459,6 +471,7 @@ static int vivid_fop_release(struct file *file)set_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +set_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); }mutex_unlock (&dev->mutex);if (file->private_data == dev->overlay_cap_owner)@@ -604,6 +617,11 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_log_status = vidioc_log_status, .vidioc_subscribe_event = vidioc_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + + .vidioc_enum_fmt_meta_cap = vidioc_enum_fmt_meta_cap, + .vidioc_g_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_s_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_try_fmt_meta_cap = vidioc_g_fmt_meta_cap, };/* ----------------------------------------------------------------- @@ -818,6 +836,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->has_scaler_out ? 'Y' : 'N'); } +/* do we create a meta capture device */ + dev->has_meta_cap = node_type &0x20000 ; +/* end detecting feature set */ if (dev->has_vid_cap) {@@ -875,6 +896,11 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps =V4L2_CAP_RDS_OUTPUT |V4L2_CAP_MODULATOR |V4L2_CAP_READWRITE ; +/* set up the capabilities of meta capture device */ +if (dev->has_meta_cap) + dev->meta_cap_caps =V4L2_CAP_META_CAPTURE | +V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; + ret = -ENOMEM ;/* initialize the test pattern generator */ tpg_init (&dev->tpg,640 ,360 );@@ -1078,6 +1104,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)INIT_LIST_HEAD (&dev->vbi_cap_active);INIT_LIST_HEAD (&dev->vbi_out_active);INIT_LIST_HEAD (&dev->sdr_cap_active); +INIT_LIST_HEAD (&dev->meta_cap_active);INIT_LIST_HEAD (&dev->cec_work_list);spin_lock_init (&dev->cec_slock);@@ -1225,6 +1252,27 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->fb_info.node); } +if (dev->has_meta_cap) { +/* initialize meta_cap queue */ + q = &dev->vb_meta_cap_q; + q->type =V4L2_BUF_TYPE_META_CAPTURE ; + q->io_modes =VB2_MMAP |VB2_DMABUF |VB2_READ ; +if (!allocator) + q->io_modes |=VB2_USERPTR ; + q->drv_priv = dev; + q->buf_struct_size =sizeof (struct vivid_buffer ); + q->ops = &vivid_meta_cap_qops; + q->mem_ops = vivid_mem_ops[allocator]; + q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; + q->min_buffers_needed =2 ; + q->lock = &dev->mutex; + q->dev = dev->v4l2_dev.dev; + q->supports_requests = true; + ret =vb2_queue_init (q); +if (ret) + goto unreg_dev; + } +#ifdef CONFIG_VIDEO_VIVID_CEC if (dev->has_vid_cap && in_type_counter[HDMI ]) {struct cec_adapter *adap;@@ -1265,6 +1313,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_rx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_tx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_sdr_cap); +v4l2_ctrl_handler_setup (&dev->ctrl_hdl_meta_cap);/* finally start creating the device nodes */ if (dev->has_vid_cap) {@@ -1492,6 +1541,34 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) video_device_node_name(vfd)); } +if (dev->has_meta_cap) { + vfd = &dev->meta_cap_dev; +snprintf (vfd->name,sizeof (vfd->name), +"vivid-%03d-meta-cap" , inst); + vfd->fops = &vivid_fops; + vfd->ioctl_ops = &vivid_ioctl_ops; + vfd->device_caps = dev->meta_cap_caps; + vfd->release = video_device_release_empty; + vfd->v4l2_dev = &dev->v4l2_dev; + vfd->queue = &dev->vb_meta_cap_q; + vfd->lock = &dev->mutex; +video_set_drvdata (vfd, dev); +#ifdef CONFIG_MEDIA_CONTROLLER + dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , + &dev->meta_cap_pad); +if (ret) + goto unreg_dev; +#endif + ret =video_register_device (vfd,VFL_TYPE_GRABBER , + meta_cap_nr[inst]); +if (ret <0 ) + goto unreg_dev; +v4l2_info (&dev->v4l2_dev, +"V4L2 metadata capture device registered as %s\n" , +video_device_node_name (vfd)); + } +#ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device */ ret =media_device_register (&dev->mdev);@@ -1508,6 +1585,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)return 0 ; unreg_dev: +video_unregister_device (&dev->meta_cap_dev);video_unregister_device (&dev->radio_tx_dev);video_unregister_device (&dev->radio_rx_dev);video_unregister_device (&dev->sdr_cap_dev);@@ -1624,6 +1702,11 @@ static int vivid_remove(struct platform_device *pdev)unregister_framebuffer (&dev->fb_info);vivid_fb_release_buffers (dev); } +if (dev->has_meta_cap) { +v4l2_info (&dev->v4l2_dev,"unregistering %s\n" , +video_device_node_name (&dev->meta_cap_dev)); +video_unregister_device (&dev->meta_cap_dev); + }cec_unregister_adapter (dev->cec_rx_adap);for (j =0 ; j <MAX_OUTPUTS ; j++)cec_unregister_adapter (dev->cec_tx_adap[j]);drivers/media/platform/vivid/vivid-core.h +14
-0@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)drivers/media/platform/vivid/vivid-ctrls.c +3
-0@@ -94,6 +94,9 @@#define VIVID_CID_SDR_CAP_FM_DEVIATION (VIVID_CID_VIVID_BASE + 110) +#define VIVID_CID_META_CAP_GENERATE_PTS (VIVID_CID_VIVID_BASE + 111) +#define VIVID_CID_META_CAP_GENERATE_SCR (VIVID_CID_VIVID_BASE + 112) +/* General User Controls */ static int vivid_user_gen_s_ctrl (struct v4l2_ctrl *ctrl)
drivers/media/platform/vivid/vivid-ctrls.c static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl) · line 117
Quoted 5 lines
drivers/media/platform/vivid/vivid-ctrls.c +2
-0@@ -110,6 +113,8 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);
Duplicate line!
Quoted 36 lines
drivers/media/platform/vivid/vivid-ctrls.c +29
-0break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;@@ -1421,6 +1426,45 @@ static const struct v4l2_ctrl_config vivid_ctrl_sdr_cap_fm_deviation = { .step = 1, }; +/* Metadata Capture Control */ + +static int vivid_meta_cap_s_ctrl (struct v4l2_ctrl *ctrl) +{ + struct vivid_dev *dev = container_of(ctrl->handler, struct vivid_dev, + ctrl_hdl_meta_cap); + +switch (ctrl->id) { +case VIVID_CID_META_CAP_GENERATE_PTS : + dev->meta_pts = ctrl->val; +break ; +case VIVID_CID_META_CAP_GENERATE_SCR : + dev->meta_scr = ctrl->val; +break ; + } +return 0 ; +} + +static const struct v4l2_ctrl_ops vivid_meta_cap_ctrl_ops = { + .s_ctrl = vivid_meta_cap_s_ctrl, +}; + +static const struct v4l2_ctrl_config vivid_ctrl_meta_has_pts = { + .ops = &vivid_meta_cap_ctrl_ops, + .id =VIVID_CID_META_CAP_GENERATE_PTS , + .name ="Generate PTS" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .max =1 , + .step =1 ,
drivers/media/platform/vivid/vivid-ctrls.c static const struct v4l2_ctrl_config vivid_ctrl_sdr_cap_fm_deviation = { · line 1467
Quoted 10 lines
drivers/media/platform/vivid/vivid-ctrls.c +10
-0+}; + +static const struct v4l2_ctrl_config vivid_ctrl_meta_has_src_clk = { + .ops = &vivid_meta_cap_ctrl_ops, + .id =VIVID_CID_META_CAP_GENERATE_SCR , + .name ="Generate SCR" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .max =1 , + .step =1 , +};
Enable these two controls by default. So add '.def = 1,'.
Quoted 109 lines
drivers/media/platform/vivid/vivid-ctrls.c +20
-0static const struct v4l2_ctrl_config vivid_ctrl_class = { .ops = &vivid_user_gen_ctrl_ops,@@ -1448,6 +1492,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,@@ -1486,6 +1532,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,@@ -1743,6 +1791,13 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_sdr_cap_fm_deviation,NULL ); } +if (dev->has_meta_cap) { +v4l2_ctrl_new_custom (hdl_meta_cap, + &vivid_ctrl_meta_has_pts,NULL ); +v4l2_ctrl_new_custom (hdl_meta_cap, + &vivid_ctrl_meta_has_src_clk,NULL ); + } +if (hdl_user_gen->error)return hdl_user_gen->error;if (hdl_user_vid->error)@@ -1817,6 +1872,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }@@ -1836,4 +1899,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }drivers/media/platform/vivid/vivid-kthread-cap.c +11
-3@@ -39,6 +39,7 @@#include "vivid-osd.h" #include "vivid-ctrls.h" #include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" static inline v4l2_std_id vivid_get_std_cap (const struct vivid_dev *dev) {@@ -677,6 +678,7 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, {struct vivid_buffer *vid_cap_buf =NULL ;struct vivid_buffer *vbi_cap_buf =NULL ; +struct vivid_buffer *meta_cap_buf =NULL ;u64 f_time =0 ;dprintk (dev,1 ,"Video Capture Thread Tick\n" );@@ -704,15 +706,19 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,list_del (&vbi_cap_buf->list); } } +if (!list_empty (&dev->meta_cap_active)) { + meta_cap_buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&meta_cap_buf->list); + } +spin_unlock (&dev->slock); -if (!vid_cap_buf && !vbi_cap_buf) +if (!vid_cap_buf && !vbi_cap_buf && !meta_cap_buf) goto update_mv; f_time = dev->cap_frame_period * dev->vid_cap_seq_count + dev->cap_stream_start + dev->time_wrap_offset; -if (!dev->tstamp_src_is_soe) - f_time += dev->cap_frame_eof_offset;if (vid_cap_buf) { v4l2_ctrl_request_setup(vid_cap_buf->vb.vb2_buf.req_obj.req,@@ -735,6 +741,8 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, vid_cap_buf->vb.vb2_buf.index); vid_cap_buf->vb.vb2_buf.timestamp = f_time; +if (!dev->tstamp_src_is_soe) + vid_cap_buf->vb.vb2_buf.timestamp += dev->cap_frame_eof_offset; }if (vbi_cap_buf) {
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 767
Quoted 2 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +0
-0@@ -758,6 +766,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,do_div (vbi_period,100 ); vbi_cap_buf->vb.vb2_buf.timestamp = f_time + vbi_period;
Here you need to add dev->cap_frame_eof_offset as well.
tstamp_src_is_soe applies to video buffers only, not VBI, so the timestamp for VBI buffers should include dev->cap_frame_eof_offset.
Note that this was a bug before: VBI timestamps were incorrectly modified by tstamp_src_is_soe.
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 780
Quoted 13 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +12
-0} + +if (meta_cap_buf) { +v4l2_ctrl_request_setup (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vivid_meta_cap_fillbuff (dev, meta_cap_buf, f_time); +v4l2_ctrl_request_complete (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&meta_cap_buf->vb.vb2_buf, dev->dqbuf_error ? +VB2_BUF_STATE_ERROR :VB2_BUF_STATE_DONE ); +dprintk (dev,2 ,"meta_cap %d done\n" , + meta_cap_buf->vb.vb2_buf.index); + meta_cap_buf->vb.vb2_buf.timestamp = f_time;
Ditto for metadata timestamps.
Quoted 291 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +24
-2+ } + dev->dqbuf_error = false; update_mv:@@ -835,6 +857,7 @@ static int vivid_thread_vid_cap(void *data) dev->cap_seq_count = buffers_since_start + dev->cap_seq_offset; dev->vid_cap_seq_count = dev->cap_seq_count - dev->vid_cap_seq_start; dev->vbi_cap_seq_count = dev->cap_seq_count - dev->vbi_cap_seq_start; + dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;vivid_thread_vid_cap_tick (dev, dropped_bufs);@@ -883,8 +906,10 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)if (pstreaming == &dev->vid_cap_streaming) dev->vid_cap_seq_start = seq_count; -else +else if (pstreaming == &dev->vbi_cap_streaming) dev->vbi_cap_seq_start = seq_count; +else + dev->meta_cap_seq_start = seq_count; *pstreaming = true;return 0 ; }@@ -894,6 +919,7 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) dev->vid_cap_seq_start = dev->seq_wrap *128 ; dev->vbi_cap_seq_start = dev->seq_wrap *128 ; + dev->meta_cap_seq_start = dev->seq_wrap *128 ; dev->kthread_vid_cap =kthread_run (vivid_thread_vid_cap, dev,"%s-vid-cap" , dev->v4l2_dev.name);@@ -951,7 +977,23 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) } } -if (dev->vid_cap_streaming || dev->vbi_cap_streaming) +if (pstreaming == &dev->meta_cap_streaming) { +while (!list_empty (&dev->meta_cap_active)) { +struct vivid_buffer *buf; + + buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&buf->list); +v4l2_ctrl_request_complete (buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +dprintk (dev,2 ,"meta_cap buffer %d done\n" , + buf->vb.vb2_buf.index); + } + } + +if (dev->vid_cap_streaming || dev->vbi_cap_streaming || + dev->meta_cap_streaming)return ;/* shutdown control thread */ drivers/media/platform/vivid/vivid-meta-cap.c new file +201
-0@@ -0,0 +1,201 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-cap.c - meta capture support functions. +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/videodev2.h> +#include <media/v4l2-common.h> +#include <linux/usb/video.h> + +#include "vivid-core.h" +#include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" + +static int meta_cap_queue_setup (struct vb2_queue *vq,unsigned int *nbuffers, +unsigned int *nplanes,unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (*nplanes) { +if (sizes[0 ] < size) +return -EINVAL ; + }else { + sizes[0 ] = size; + } + +if (vq->num_buffers + *nbuffers <2 ) + *nbuffers =2 - vq->num_buffers; + + *nplanes =1 ; +return 0 ; +} + +static int meta_cap_buf_prepare (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +dprintk (dev,1 ,"%s\n" , __func__); + +if (dev->buf_prepare_error) { +/* +* Error injection: test what happens if buf_prepare() returns +* an error. +*/ + dev->buf_prepare_error = false; +return -EINVAL ; + } +if (vb2_plane_size (vb,0 ) < size) { +dprintk (dev,1 ,"%s data will not fit into plane (%lu < %u)\n" , + __func__,vb2_plane_size (vb,0 ), size); +return -EINVAL ; + } +vb2_set_plane_payload (vb,0 , size); + +return 0 ; +} + +static void meta_cap_buf_queue (struct vb2_buffer *vb) +{ +struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb); + +dprintk (dev,1 ,"%s\n" , __func__); + +spin_lock (&dev->slock); +list_add_tail (&buf->list, &dev->meta_cap_active); +spin_unlock (&dev->slock); +} + +static int meta_cap_start_streaming (struct vb2_queue *vq,unsigned int count) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +int err; + +dprintk (dev,1 ,"%s\n" , __func__); + dev->meta_cap_seq_count =0 ; +if (dev->start_streaming_error) { + dev->start_streaming_error = false; + err = -EINVAL ; + }else { + err =vivid_start_generating_vid_cap (dev, + &dev->meta_cap_streaming); + } +if (err) { +struct vivid_buffer *buf, *tmp; + +list_for_each_entry_safe (buf, tmp, + &dev->meta_cap_active, list) { +list_del (&buf->list); +vb2_buffer_done (&buf->vb.vb2_buf, +VB2_BUF_STATE_QUEUED ); + } + } +return err; +} + +/* abort streaming and wait for last buffer */ +static void meta_cap_stop_streaming (struct vb2_queue *vq) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); + +dprintk (dev,1 ,"%s\n" , __func__); +vivid_stop_generating_vid_cap (dev, &dev->meta_cap_streaming); +} + +static void meta_cap_buf_request_complete (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + +v4l2_ctrl_request_complete (vb->req_obj.req, &dev->ctrl_hdl_meta_cap); +} + +const struct vb2_ops vivid_meta_cap_qops = { + .queue_setup = meta_cap_queue_setup, + .buf_prepare = meta_cap_buf_prepare, + .buf_queue = meta_cap_buf_queue, + .start_streaming = meta_cap_start_streaming, + .stop_streaming = meta_cap_stop_streaming, + .buf_request_complete = meta_cap_buf_request_complete, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) +{ +struct vivid_dev *dev =video_drvdata (file); + +if (!vivid_is_webcam (dev)) +return -ENODATA ; + +if (f->index >0 ) +return -EINVAL ; + + f->type =V4L2_BUF_TYPE_META_CAPTURE ; + f->pixelformat =V4L2_META_FMT_UVC ; +return 0 ; +} + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct vivid_dev *dev =video_drvdata (file); +struct v4l2_meta_format *meta = &f->fmt.meta; + +if (!vivid_is_webcam (dev) || !dev->has_meta_cap) +return -EINVAL ; + + meta->dataformat =V4L2_META_FMT_UVC ; + meta->buffersize =sizeof (struct vivid_uvc_meta_buf ); +return 0 ; +} + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe) +{ +struct vivid_uvc_meta_buf *meta =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); +int buf_off =0 ; + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (meta,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); + + meta->ns =ktime_get_ns (); + meta->sof = buf->vb.sequence *30 ; + meta->length =sizeof (*meta) - offsetof(struct vivid_uvc_meta_buf , length); + meta->flags =UVC_STREAM_EOH |UVC_STREAM_EOF ; + +if ((buf->vb.sequence %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; + +dprintk (dev,2 ,"%s ns:%llu sof:%4d len:%u flags: 0x%02x" , + __func__, meta->ns, meta->sof, meta->length, meta->flags); +if (dev->meta_pts) { + meta->flags |=UVC_STREAM_PTS ; + meta->buf[0 ] = soe /VIVID_META_CLOCK_UNIT ; + buf_off =4 ; +dprintk (dev,2 ," pts: %u\n" , *(__u32 *)(meta->buf)); + } + +if (dev->meta_scr) { + meta->flags |=UVC_STREAM_SCR ; + meta->buf[buf_off] = (soe + dev->cap_frame_eof_offset) + /VIVID_META_CLOCK_UNIT ; + + meta->buf[buf_off +4 ] = (buf->vb.sequence *30 ) %1000 ; +dprintk (dev,2 ," stc: %u, sof counter: %u\n" , + *(__u32 *)(meta->buf + buf_off), + *(__u16 *)(meta->buf + buf_off +4 )); + } +dprintk (dev,2 ,"\n" ); +}drivers/media/platform/vivid/vivid-meta-cap.h new file +19
-0@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe);
drivers/media/platform/vivid/vivid-meta-cap.h line 29
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-cap.h new file +10
-0+ +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
Regards,
Hans
PATCH v8 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream.
---
V8 - squash commit:fixes for v4l2-compliance issues.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 107 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 65 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 55 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 465 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +102 -5
227 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +14 -0
@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)
drivers/media/platform/vivid/vivid-ctrls.c +65 -0
111 lines not on this page · raw message
drivers/media/platform/vivid/vivid-kthread-cap.c +49 -6
115 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +201 -0
201 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-cap.c +4 -1
@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;
@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
Signature · 1 line
2.17.1
hverkuil at xs4all.nl (Hans Verkuil)
PATCH v8 1/1 vivid: Add metadata capture support
Quoted 505 lines · Vandana BN
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream.Signed-off-by Vandana BN <bnvandana at gmail.com>---
V8 - squash commit:fixes for v4l2-compliance issues.--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 107 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 65 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 55 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 465 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.hdrivers/media/platform/vivid/Makefile +1
-1@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endifdrivers/media/platform/vivid/vivid-core.c +102
-5@@ -37,6 +37,7 @@#include "vivid-osd.h" #include "vivid-cec.h" #include "vivid-ctrls.h" +#include "vivid-meta-cap.h" #define VIVID_MODULE_NAME "vivid"@@ -79,6 +80,10 @@ static int radio_tx_nr[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = -1 };module_param_array (radio_tx_nr, int,NULL ,0444 );MODULE_PARM_DESC (radio_tx_nr," radioX start number, -1 is autodetect" ); +static int meta_cap_nr[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 }; +module_param_array (meta_cap_nr, int,NULL ,0444 ); +MODULE_PARM_DESC (meta_cap_nr," videoX start number, -1 is autodetect" ); +static int ccs_cap_mode[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =-1 };module_param_array (ccs_cap_mode, int,NULL ,0444 ); MODULE_PARM_DESC(ccs_cap_mode, " capture crop/compose/scale mode:\n"@@ -95,8 +100,13 @@ static unsigned multiplanar[VIVID_MAX_DEVS] = { [0 ... (VIVID_MAX_DEVS - 1)] = 1module_param_array (multiplanar, uint,NULL ,0444 );MODULE_PARM_DESC (multiplanar," 1 (default) creates a single planar device, 2 creates a multiplanar device." ); -/* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + vbi-out + vid-out */ -static unsigned node_types[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =0x1d3d }; +/* +* Default: video + vbi-cap (raw and sliced) + radio rx + radio tx + sdr + +* vbi-out + vid-out + meta-cap +*/ +static unsigned int node_types[VIVID_MAX_DEVS ] = { + [0 ... (VIVID_MAX_DEVS -1 )] =0x21d3d +};module_param_array (node_types, uint,NULL ,0444 );MODULE_PARM_DESC (node_types," node types, default is 0x1d3d. Bitmask with the following meaning:\n" "\t\t bit 0: Video Capture node\n"@@ -106,7 +116,8 @@ MODULE_PARM_DESC(node_types, " node types, default is 0x1d3d. Bitmask with the f"\t\t bit 8: Video Output node\n" "\t\t bit 10-11: VBI Output node: 0 = none, 1 = raw vbi, 2 = sliced vbi, 3 = both\n" "\t\t bit 12: Radio Transmitter node\n" - "\t\t bit 16: Framebuffer for testing overlays"); +"\t\t bit 16: Framebuffer for testing overlays\n" + "\t\t bit 17: Metadata Capture node\n");/* Default: 4 inputs */ static unsigned num_inputs[VIVID_MAX_DEVS ] = { [0 ... (VIVID_MAX_DEVS -1 )] =4 };@@ -205,7 +216,7 @@ static int vidioc_querycap(struct file *file, void *priv, cap->capabilities = dev->vid_cap_caps | dev->vid_out_caps | dev->vbi_cap_caps | dev->vbi_out_caps | dev->radio_rx_caps | dev->radio_tx_caps | - dev->sdr_cap_caps |V4L2_CAP_DEVICE_CAPS ; + dev->sdr_cap_caps | dev->meta_cap_caps |V4L2_CAP_DEVICE_CAPS ;return 0 ; }@@ -433,7 +444,8 @@ static bool vivid_is_last_user(struct vivid_dev *dev)vivid_is_in_use (&dev->vbi_out_dev) +vivid_is_in_use (&dev->sdr_cap_dev) +vivid_is_in_use (&dev->radio_rx_dev) + -vivid_is_in_use (&dev->radio_tx_dev); +vivid_is_in_use (&dev->radio_tx_dev) + +vivid_is_in_use (&dev->meta_cap_dev);return uses ==1 ; }@@ -459,6 +471,7 @@ static int vivid_fop_release(struct file *file)set_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);set_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +set_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags); }mutex_unlock (&dev->mutex);if (file->private_data == dev->overlay_cap_owner)@@ -604,6 +617,11 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_log_status = vidioc_log_status, .vidioc_subscribe_event = vidioc_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, + + .vidioc_enum_fmt_meta_cap = vidioc_enum_fmt_meta_cap, + .vidioc_g_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_s_fmt_meta_cap = vidioc_g_fmt_meta_cap, + .vidioc_try_fmt_meta_cap = vidioc_g_fmt_meta_cap, };/* ----------------------------------------------------------------- @@ -818,6 +836,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->has_scaler_out ? 'Y' : 'N'); } +/* do we create a meta capture device */ + dev->has_meta_cap = node_type &0x20000 ; +/* end detecting feature set */ if (dev->has_vid_cap) {@@ -875,6 +896,16 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->radio_tx_caps =V4L2_CAP_RDS_OUTPUT |V4L2_CAP_MODULATOR |V4L2_CAP_READWRITE ; +/* set up the capabilities of meta capture device */ +if (dev->has_meta_cap) { + dev->meta_cap_caps =V4L2_CAP_META_CAPTURE | +V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; +if (dev->has_audio_inputs) + dev->meta_cap_caps |=V4L2_CAP_AUDIO ; +if (in_type_counter[TV ]) + dev->meta_cap_caps |=V4L2_CAP_TUNER ; + } + ret = -ENOMEM ;/* initialize the test pattern generator */ tpg_init (&dev->tpg,640 ,360 );@@ -934,6 +965,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_ENUMAUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_ENUMAUDIO ); }if (!dev->has_audio_outputs) {v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_AUDOUT );@@ -959,12 +993,16 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_FREQUENCY ); }if (!has_tuner) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_TUNER ); }if (in_type_counter[HDMI ] ==0 ) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_EDID );@@ -990,6 +1028,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->sdr_cap_dev,VIDIOC_S_HW_FREQ_SEEK ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_ENUM_FRAMESIZES );@@ -1078,6 +1117,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)INIT_LIST_HEAD (&dev->vbi_cap_active);INIT_LIST_HEAD (&dev->vbi_out_active);INIT_LIST_HEAD (&dev->sdr_cap_active); +INIT_LIST_HEAD (&dev->meta_cap_active);INIT_LIST_HEAD (&dev->cec_work_list);spin_lock_init (&dev->cec_slock);@@ -1225,6 +1265,27 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) dev->fb_info.node); } +if (dev->has_meta_cap) { +/* initialize meta_cap queue */ + q = &dev->vb_meta_cap_q; + q->type =V4L2_BUF_TYPE_META_CAPTURE ; + q->io_modes =VB2_MMAP |VB2_DMABUF |VB2_READ ; +if (!allocator) + q->io_modes |=VB2_USERPTR ; + q->drv_priv = dev; + q->buf_struct_size =sizeof (struct vivid_buffer ); + q->ops = &vivid_meta_cap_qops; + q->mem_ops = vivid_mem_ops[allocator]; + q->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC ; + q->min_buffers_needed =2 ; + q->lock = &dev->mutex; + q->dev = dev->v4l2_dev.dev; + q->supports_requests = true; + ret =vb2_queue_init (q); +if (ret) + goto unreg_dev; + } +#ifdef CONFIG_VIDEO_VIVID_CEC if (dev->has_vid_cap && in_type_counter[HDMI ]) {struct cec_adapter *adap;@@ -1265,6 +1326,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_rx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_radio_tx);v4l2_ctrl_handler_setup (&dev->ctrl_hdl_sdr_cap); +v4l2_ctrl_handler_setup (&dev->ctrl_hdl_meta_cap);/* finally start creating the device nodes */ if (dev->has_vid_cap) {@@ -1492,6 +1554,35 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) video_device_node_name(vfd)); } +if (dev->has_meta_cap) { + vfd = &dev->meta_cap_dev; +snprintf (vfd->name,sizeof (vfd->name), +"vivid-%03d-meta-cap" , inst); + vfd->fops = &vivid_fops; + vfd->ioctl_ops = &vivid_ioctl_ops; + vfd->device_caps = dev->meta_cap_caps; + vfd->release = video_device_release_empty; + vfd->v4l2_dev = &dev->v4l2_dev; + vfd->queue = &dev->vb_meta_cap_q; + vfd->lock = &dev->mutex; + vfd->tvnorms = tvnorms_cap; +video_set_drvdata (vfd, dev); +#ifdef CONFIG_MEDIA_CONTROLLER + dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ; + ret =media_entity_pads_init (&vfd->entity,1 , + &dev->meta_cap_pad); +if (ret) + goto unreg_dev; +#endif + ret =video_register_device (vfd,VFL_TYPE_GRABBER , + meta_cap_nr[inst]); +if (ret <0 ) + goto unreg_dev; +v4l2_info (&dev->v4l2_dev, +"V4L2 metadata capture device registered as %s\n" , +video_device_node_name (vfd)); + } +#ifdef CONFIG_MEDIA_CONTROLLER /* Register the media device */ ret =media_device_register (&dev->mdev);@@ -1508,6 +1599,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)return 0 ; unreg_dev: +video_unregister_device (&dev->meta_cap_dev);video_unregister_device (&dev->radio_tx_dev);video_unregister_device (&dev->radio_rx_dev);video_unregister_device (&dev->sdr_cap_dev);@@ -1624,6 +1716,11 @@ static int vivid_remove(struct platform_device *pdev)unregister_framebuffer (&dev->fb_info);vivid_fb_release_buffers (dev); } +if (dev->has_meta_cap) { +v4l2_info (&dev->v4l2_dev,"unregistering %s\n" , +video_device_node_name (&dev->meta_cap_dev)); +video_unregister_device (&dev->meta_cap_dev); + }cec_unregister_adapter (dev->cec_rx_adap);for (j =0 ; j <MAX_OUTPUTS ; j++)cec_unregister_adapter (dev->cec_tx_adap[j]);drivers/media/platform/vivid/vivid-core.h +14
-0@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)drivers/media/platform/vivid/vivid-ctrls.c +65
-0@@ -94,6 +94,9 @@#define VIVID_CID_SDR_CAP_FM_DEVIATION (VIVID_CID_VIVID_BASE + 110) +#define VIVID_CID_META_CAP_GENERATE_PTS (VIVID_CID_VIVID_BASE + 111) +#define VIVID_CID_META_CAP_GENERATE_SCR (VIVID_CID_VIVID_BASE + 112) +/* General User Controls */ static int vivid_user_gen_s_ctrl (struct v4l2_ctrl *ctrl)@@ -110,6 +113,7 @@ static int vivid_user_gen_s_ctrl(struct v4l2_ctrl *ctrl)clear_bit (V4L2_FL_REGISTERED , &dev->sdr_cap_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_rx_dev.flags);clear_bit (V4L2_FL_REGISTERED , &dev->radio_tx_dev.flags); +clear_bit (V4L2_FL_REGISTERED , &dev->meta_cap_dev.flags);break ;case VIVID_CID_BUTTON : dev->button_pressed =30 ;@@ -1421,6 +1425,47 @@ static const struct v4l2_ctrl_config vivid_ctrl_sdr_cap_fm_deviation = { .step = 1, }; +/* Metadata Capture Control */ + +static int vivid_meta_cap_s_ctrl (struct v4l2_ctrl *ctrl) +{ + struct vivid_dev *dev = container_of(ctrl->handler, struct vivid_dev, + ctrl_hdl_meta_cap); + +switch (ctrl->id) { +case VIVID_CID_META_CAP_GENERATE_PTS : + dev->meta_pts = ctrl->val; +break ; +case VIVID_CID_META_CAP_GENERATE_SCR : + dev->meta_scr = ctrl->val; +break ; + } +return 0 ; +} + +static const struct v4l2_ctrl_ops vivid_meta_cap_ctrl_ops = { + .s_ctrl = vivid_meta_cap_s_ctrl, +}; + +static const struct v4l2_ctrl_config vivid_ctrl_meta_has_pts = { + .ops = &vivid_meta_cap_ctrl_ops, + .id =VIVID_CID_META_CAP_GENERATE_PTS , + .name ="Generate PTS" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .max =1 , + .def =1 , + .step =1 , +}; + +static const struct v4l2_ctrl_config vivid_ctrl_meta_has_src_clk = { + .ops = &vivid_meta_cap_ctrl_ops, + .id =VIVID_CID_META_CAP_GENERATE_SCR , + .name ="Generate SCR" , + .type =V4L2_CTRL_TYPE_BOOLEAN , + .max =1 , + .def =1 , + .step =1 , +};static const struct v4l2_ctrl_config vivid_ctrl_class = { .ops = &vivid_user_gen_ctrl_ops,@@ -1448,6 +1493,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_rx = &dev->ctrl_hdl_radio_rx;struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap; +struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops, .id =VIVID_CID_DV_TIMINGS ,@@ -1486,6 +1533,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_radio_tx, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_sdr_cap,19 );v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_cap,2 ); +v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,@@ -1743,6 +1792,13 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_sdr_cap_fm_deviation,NULL ); } +if (dev->has_meta_cap) { +v4l2_ctrl_new_custom (hdl_meta_cap, + &vivid_ctrl_meta_has_pts,NULL ); +v4l2_ctrl_new_custom (hdl_meta_cap, + &vivid_ctrl_meta_has_src_clk,NULL ); + } +if (hdl_user_gen->error)return hdl_user_gen->error;if (hdl_user_vid->error)@@ -1817,6 +1873,14 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_sdr_cap->error; dev->sdr_cap_dev.ctrl_handler = hdl_sdr_cap; } +if (dev->has_meta_cap) { +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_cap, hdl_streaming,NULL , false); +if (hdl_meta_cap->error) +return hdl_meta_cap->error; + dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; + } +return 0 ; }@@ -1836,4 +1900,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_sdtv_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); }drivers/media/platform/vivid/vivid-kthread-cap.c +8
-0@@ -39,6 +39,7 @@#include "vivid-osd.h" #include "vivid-ctrls.h" #include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" static inline v4l2_std_id vivid_get_std_cap (const struct vivid_dev *dev) {@@ -677,6 +678,7 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, {struct vivid_buffer *vid_cap_buf =NULL ;struct vivid_buffer *vbi_cap_buf =NULL ; +struct vivid_buffer *meta_cap_buf =NULL ;u64 f_time =0 ;dprintk (dev,1 ,"Video Capture Thread Tick\n" );@@ -704,15 +706,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,list_del (&vbi_cap_buf->list); } } +if (!list_empty (&dev->meta_cap_active)) { + meta_cap_buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&meta_cap_buf->list); + } +spin_unlock (&dev->slock);
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 722
Quoted 10 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +3
-4-if (!vid_cap_buf && !vbi_cap_buf) +if (!vid_cap_buf && !vbi_cap_buf && !meta_cap_buf) goto update_mv; f_time = dev->cap_frame_period * dev->vid_cap_seq_count + - dev->cap_stream_start + dev->time_wrap_offset; -if (!dev->tstamp_src_is_soe) - f_time += dev->cap_frame_eof_offset; + dev->cap_stream_start + dev->time_wrap_offset + + dev->cap_frame_eof_offset;
No, keep the code as in v7: f_time is the time at the beginning of the frame.
Then only add dev->cap_frame_eof_offset where it is needed.
Subtracting time values is harder to understand than adding time values.
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 746
Quoted 9 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +2
-0if (vid_cap_buf) { v4l2_ctrl_request_setup(vid_cap_buf->vb.vb2_buf.req_obj.req,@@ -735,6 +742,8 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, vid_cap_buf->vb.vb2_buf.index); vid_cap_buf->vb.vb2_buf.timestamp = f_time; +if (dev->tstamp_src_is_soe) + vid_cap_buf->vb.vb2_buf.timestamp -= dev->cap_frame_eof_offset;
This becomes:
if (!dev->tstamp_src_is_soe) vid_cap_buf->vb.vb2_buf.timestamp += dev->cap_frame_eof_offset;
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 768
Quoted 6 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +0
-0}if (vbi_cap_buf) {@@ -758,6 +767,20 @@ static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev,do_div (vbi_period,100 ); vbi_cap_buf->vb.vb2_buf.timestamp = f_time + vbi_period;
This becomes f_time + dev->cap_frame_eof_offset + vbi_period;
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 774
Quoted 6 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +5
-0} + +if (meta_cap_buf) { +v4l2_ctrl_request_setup (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vivid_meta_cap_fillbuff (dev, meta_cap_buf, f_time);
This is now wrong in v8, since vivid_meta_cap_fillbuff() expects the start-of-frame time. If f_time is once again the start-of-frame time, then this is correct again.
drivers/media/platform/vivid/vivid-kthread-cap.c static noinline_for_stack void vivid_thread_vid_cap_tick(struct vivid_dev *dev, · line 781
Quoted 7 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +7
-0+v4l2_ctrl_request_complete (meta_cap_buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&meta_cap_buf->vb.vb2_buf, dev->dqbuf_error ? +VB2_BUF_STATE_ERROR :VB2_BUF_STATE_DONE ); +dprintk (dev,2 ,"meta_cap %d done\n" , + meta_cap_buf->vb.vb2_buf.index); + meta_cap_buf->vb.vb2_buf.timestamp = f_time;
This becomes f_time + dev->cap_frame_eof_offset;
Metadata always arrives at the end of the frame.
Regards,
Hans
Quoted 324 lines
drivers/media/platform/vivid/vivid-kthread-cap.c +24
-2+ } + dev->dqbuf_error = false; update_mv:@@ -835,6 +858,7 @@ static int vivid_thread_vid_cap(void *data) dev->cap_seq_count = buffers_since_start + dev->cap_seq_offset; dev->vid_cap_seq_count = dev->cap_seq_count - dev->vid_cap_seq_start; dev->vbi_cap_seq_count = dev->cap_seq_count - dev->vbi_cap_seq_start; + dev->meta_cap_seq_count = dev->cap_seq_count - dev->meta_cap_seq_start;vivid_thread_vid_cap_tick (dev, dropped_bufs);@@ -883,8 +907,10 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)if (pstreaming == &dev->vid_cap_streaming) dev->vid_cap_seq_start = seq_count; -else +else if (pstreaming == &dev->vbi_cap_streaming) dev->vbi_cap_seq_start = seq_count; +else + dev->meta_cap_seq_start = seq_count; *pstreaming = true;return 0 ; }@@ -894,6 +920,7 @@ int vivid_start_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) dev->vid_cap_seq_start = dev->seq_wrap *128 ; dev->vbi_cap_seq_start = dev->seq_wrap *128 ; + dev->meta_cap_seq_start = dev->seq_wrap *128 ; dev->kthread_vid_cap =kthread_run (vivid_thread_vid_cap, dev,"%s-vid-cap" , dev->v4l2_dev.name);@@ -951,7 +978,23 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming) } } -if (dev->vid_cap_streaming || dev->vbi_cap_streaming) +if (pstreaming == &dev->meta_cap_streaming) { +while (!list_empty (&dev->meta_cap_active)) { +struct vivid_buffer *buf; + + buf =list_entry (dev->meta_cap_active.next, + struct vivid_buffer, list); +list_del (&buf->list); +v4l2_ctrl_request_complete (buf->vb.vb2_buf.req_obj.req, + &dev->ctrl_hdl_meta_cap); +vb2_buffer_done (&buf->vb.vb2_buf,VB2_BUF_STATE_ERROR ); +dprintk (dev,2 ,"meta_cap buffer %d done\n" , + buf->vb.vb2_buf.index); + } + } + +if (dev->vid_cap_streaming || dev->vbi_cap_streaming || + dev->meta_cap_streaming)return ;/* shutdown control thread */ drivers/media/platform/vivid/vivid-meta-cap.c new file +201
-0@@ -0,0 +1,201 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* vivid-meta-cap.c - meta capture support functions. +*/ + +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/videodev2.h> +#include <media/v4l2-common.h> +#include <linux/usb/video.h> + +#include "vivid-core.h" +#include "vivid-kthread-cap.h" +#include "vivid-meta-cap.h" + +static int meta_cap_queue_setup (struct vb2_queue *vq,unsigned int *nbuffers, +unsigned int *nplanes,unsigned int sizes[], +struct device *alloc_devs[]) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (*nplanes) { +if (sizes[0 ] < size) +return -EINVAL ; + }else { + sizes[0 ] = size; + } + +if (vq->num_buffers + *nbuffers <2 ) + *nbuffers =2 - vq->num_buffers; + + *nplanes =1 ; +return 0 ; +} + +static int meta_cap_buf_prepare (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); +unsigned int size =sizeof (struct vivid_uvc_meta_buf ); + +dprintk (dev,1 ,"%s\n" , __func__); + +if (dev->buf_prepare_error) { +/* +* Error injection: test what happens if buf_prepare() returns +* an error. +*/ + dev->buf_prepare_error = false; +return -EINVAL ; + } +if (vb2_plane_size (vb,0 ) < size) { +dprintk (dev,1 ,"%s data will not fit into plane (%lu < %u)\n" , + __func__,vb2_plane_size (vb,0 ), size); +return -EINVAL ; + } +vb2_set_plane_payload (vb,0 , size); + +return 0 ; +} + +static void meta_cap_buf_queue (struct vb2_buffer *vb) +{ +struct vb2_v4l2_buffer *vbuf =to_vb2_v4l2_buffer (vb); +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb); + +dprintk (dev,1 ,"%s\n" , __func__); + +spin_lock (&dev->slock); +list_add_tail (&buf->list, &dev->meta_cap_active); +spin_unlock (&dev->slock); +} + +static int meta_cap_start_streaming (struct vb2_queue *vq,unsigned int count) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); +int err; + +dprintk (dev,1 ,"%s\n" , __func__); + dev->meta_cap_seq_count =0 ; +if (dev->start_streaming_error) { + dev->start_streaming_error = false; + err = -EINVAL ; + }else { + err =vivid_start_generating_vid_cap (dev, + &dev->meta_cap_streaming); + } +if (err) { +struct vivid_buffer *buf, *tmp; + +list_for_each_entry_safe (buf, tmp, + &dev->meta_cap_active, list) { +list_del (&buf->list); +vb2_buffer_done (&buf->vb.vb2_buf, +VB2_BUF_STATE_QUEUED ); + } + } +return err; +} + +/* abort streaming and wait for last buffer */ +static void meta_cap_stop_streaming (struct vb2_queue *vq) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vq); + +dprintk (dev,1 ,"%s\n" , __func__); +vivid_stop_generating_vid_cap (dev, &dev->meta_cap_streaming); +} + +static void meta_cap_buf_request_complete (struct vb2_buffer *vb) +{ +struct vivid_dev *dev =vb2_get_drv_priv (vb->vb2_queue); + +v4l2_ctrl_request_complete (vb->req_obj.req, &dev->ctrl_hdl_meta_cap); +} + +const struct vb2_ops vivid_meta_cap_qops = { + .queue_setup = meta_cap_queue_setup, + .buf_prepare = meta_cap_buf_prepare, + .buf_queue = meta_cap_buf_queue, + .start_streaming = meta_cap_start_streaming, + .stop_streaming = meta_cap_stop_streaming, + .buf_request_complete = meta_cap_buf_request_complete, + .wait_prepare = vb2_ops_wait_prepare, + .wait_finish = vb2_ops_wait_finish, +}; + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f) +{ +struct vivid_dev *dev =video_drvdata (file); + +if (!vivid_is_webcam (dev)) +return -EINVAL ; + +if (f->index >0 ) +return -EINVAL ; + + f->type =V4L2_BUF_TYPE_META_CAPTURE ; + f->pixelformat =V4L2_META_FMT_UVC ; +return 0 ; +} + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f) +{ +struct vivid_dev *dev =video_drvdata (file); +struct v4l2_meta_format *meta = &f->fmt.meta; + +if (!vivid_is_webcam (dev) || !dev->has_meta_cap) +return -EINVAL ; + + meta->dataformat =V4L2_META_FMT_UVC ; + meta->buffersize =sizeof (struct vivid_uvc_meta_buf ); +return 0 ; +} + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe) +{ +struct vivid_uvc_meta_buf *meta =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); +int buf_off =0 ; + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (meta,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); + + meta->ns =ktime_get_ns (); + meta->sof = buf->vb.sequence *30 ; + meta->length =sizeof (*meta) - offsetof(struct vivid_uvc_meta_buf , length); + meta->flags =UVC_STREAM_EOH |UVC_STREAM_EOF ; + +if ((buf->vb.sequence %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; + +dprintk (dev,2 ,"%s ns:%llu sof:%4d len:%u flags: 0x%02x" , + __func__, meta->ns, meta->sof, meta->length, meta->flags); +if (dev->meta_pts) { + meta->flags |=UVC_STREAM_PTS ; + meta->buf[0 ] = soe /VIVID_META_CLOCK_UNIT ; + buf_off =4 ; +dprintk (dev,2 ," pts: %u\n" , *(__u32 *)(meta->buf)); + } + +if (dev->meta_scr) { + meta->flags |=UVC_STREAM_SCR ; + meta->buf[buf_off] = (soe + dev->cap_frame_eof_offset) + /VIVID_META_CLOCK_UNIT ; + + meta->buf[buf_off +4 ] = (buf->vb.sequence *30 ) %1000 ; +dprintk (dev,2 ," stc: %u, sof counter: %u\n" , + *(__u32 *)(meta->buf + buf_off), + *(__u16 *)(meta->buf + buf_off +4 )); + } +dprintk (dev,2 ,"\n" ); +}drivers/media/platform/vivid/vivid-meta-cap.h new file +29
-0@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif drivers/media/platform/vivid/vivid-vid-cap.c +4
-1@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
PATCH v9 1/1 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 107 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 65 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 54 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 464 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +102 -5
227 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +14 -0
@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)
drivers/media/platform/vivid/vivid-ctrls.c +65 -0
111 lines not on this page · raw message
drivers/media/platform/vivid/vivid-kthread-cap.c +48 -6
116 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +201 -0
201 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-cap.c +4 -1
@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;
@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
Signature · 1 line
2.17.1
PATCH v9 1/1 vivid: Add metadata capture support
drivers/media/platform/vivid/vivid-meta-cap.c line 163
Quoted 2 lines · Vandana BN
drivers/media/platform/vivid/vivid-meta-cap.c new file +2
-0+void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u32 soe)
soe should have been a u64 since f_time is a u64.
Quoted 12 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +12
-0+{ +struct vivid_uvc_meta_buf *meta =vb2_plane_vaddr (&buf->vb.vb2_buf,0 ); +int buf_off =0 ; + + buf->vb.sequence = dev->meta_cap_seq_count; +if (dev->field_cap ==V4L2_FIELD_ALTERNATE ) + buf->vb.sequence /=2 ; +memset (meta,1 ,vb2_plane_size (&buf->vb.vb2_buf,0 )); + + meta->ns =ktime_get_ns (); + meta->sof = buf->vb.sequence *30 ; + meta->length =sizeof (*meta) - offsetof(struct vivid_uvc_meta_buf , length);
drivers/media/platform/vivid/vivid-meta-cap.c line 185
Quoted 10 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +10
-0+ meta->flags =UVC_STREAM_EOH |UVC_STREAM_EOF ; + +if ((buf->vb.sequence %2 ) ==0 ) + meta->flags |=UVC_STREAM_FID ; + +dprintk (dev,2 ,"%s ns:%llu sof:%4d len:%u flags: 0x%02x" , + __func__, meta->ns, meta->sof, meta->length, meta->flags); +if (dev->meta_pts) { + meta->flags |=UVC_STREAM_PTS ; + meta->buf[0 ] = soe /VIVID_META_CLOCK_UNIT ;
Use div_u64() here.
drivers/media/platform/vivid/vivid-meta-cap.c line 193
Quoted 8 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +8
-0+ buf_off =4 ; +dprintk (dev,2 ," pts: %u\n" , *(__u32 *)(meta->buf)); + } + +if (dev->meta_scr) { + meta->flags |=UVC_STREAM_SCR ; + meta->buf[buf_off] = (soe + dev->cap_frame_eof_offset) + /VIVID_META_CLOCK_UNIT ;
Same here (and this is the cause of the kbuild error).
drivers/media/platform/vivid/vivid-meta-cap.c line 201
Quoted 8 lines
drivers/media/platform/vivid/vivid-meta-cap.c new file +8
-0+ + meta->buf[buf_off +4 ] = (buf->vb.sequence *30 ) %1000 ; +dprintk (dev,2 ," stc: %u, sof counter: %u\n" , + *(__u32 *)(meta->buf + buf_off), + *(__u16 *)(meta->buf + buf_off +4 )); + } +dprintk (dev,2 ,"\n" ); +}
Regards,
Hans
v10 cover vivid: Metadata support
This patch adds metadata support in vivid driver.
Metadata capture supports UVCH format V4L2_META_FMT_UVC as it is widely used in webcams.
https://hverkuil.home.xs4all.nl/spec/uapi/v4l/pixfmt-meta-uvc.html
For Metadata output a new format V4L2_META_FMT_VIVID is added,
which is used to set brightness, contrast, sturation and hue.
Regards,
Vandana.
Vandana BN (3):
vivid: Add metadata capture support
v4l2-core: Add new metadata format
vivid: Add metadata output support
drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 197 ++++++++++++++++- drivers/media/platform/vivid/vivid-core.h | 24 +++ drivers/media/platform/vivid/vivid-ctrls.c | 75 +++++++ .../media/platform/vivid/vivid-kthread-cap.c | 54 ++++- .../media/platform/vivid/vivid-kthread-out.c | 50 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-meta-out.c | 174 +++++++++++++++ drivers/media/platform/vivid/vivid-meta-out.h | 25 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- drivers/media/platform/vivid/vivid-vid-out.c | 5 +- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 14 files changed, 825 insertions(+), 18 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v10 1/3 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream. also fixes v4l2-compliance issues seen on metadata device.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 107 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 65 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 54 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 464 insertions(+), 13 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +102 -5
227 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +14 -0
@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)
drivers/media/platform/vivid/vivid-ctrls.c +65 -0
111 lines not on this page · raw message
drivers/media/platform/vivid/vivid-kthread-cap.c +48 -6
116 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +201 -0
201 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u64 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-cap.c +4 -1
@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;
@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v10 2/3 v4l2-core: Add new metadata format
In reply to Vandana BNAdd new metadata format to support metadata output in vivid.
--- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 2 files changed, 2 insertions(+)
drivers/media/v4l2-core/v4l2-ioctl.c +1 -0
@@ -1340,6 +1340,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)case V4L2_META_FMT_VSP1_HGT : descr ="R-Car VSP1 2-D Histogram" ;break ;case V4L2_META_FMT_UVC : descr ="UVC Payload Header Metadata" ;break ;case V4L2_META_FMT_D4XX : descr ="Intel D4xx UVC Metadata" ;break ; +case V4L2_META_FMT_VIVID : descr ="Vivid Metadata" ;break ;default :/* Compressed formats */
include/uapi/linux/videodev2.h +1 -0
@@ -755,6 +755,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
Signature · 1 line
2.17.1
PATCH v10 3/3 vivid: Add metadata output support
In reply to Vandana BNSupport metadata output in vivid driver.
Metadata output is used to set brightness, contrast, saturation and hue.
Adds new files for metadata output.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 98 +++++++++- drivers/media/platform/vivid/vivid-core.h | 10 + drivers/media/platform/vivid/vivid-ctrls.c | 12 +- .../media/platform/vivid/vivid-kthread-out.c | 50 ++++- drivers/media/platform/vivid/vivid-meta-out.c | 174 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-out.h | 25 +++ drivers/media/platform/vivid/vivid-vid-out.c | 5 +- 8 files changed, 365 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o vivid-meta-cap.o + vivid-osd.o vivid-meta-cap.o vivid-meta-out.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +93 -5
208 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +10 -0
@@ -132,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad;struct media_pad meta_cap_pad; +struct media_pad meta_out_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -156,6 +157,8 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_sdr_cap;struct video_device meta_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +struct video_device meta_out_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_out;spinlock_t slock;struct mutex mutex;
@@ -169,6 +172,7 @@ struct vivid_dev {u32 radio_rx_caps;u32 radio_tx_caps;u32 meta_cap_caps; +u32 meta_out_caps;/* supported features */ bool multiplanar;
@@ -195,6 +199,7 @@ struct vivid_dev {bool has_sdr_cap;bool has_fb;bool has_meta_cap; +bool has_meta_out;bool can_loop_video;
@@ -432,6 +437,8 @@ struct vivid_dev {struct list_head vid_out_active;struct vb2_queue vb_vbi_out_q;struct list_head vbi_out_active; +struct vb2_queue vb_meta_out_q; +struct list_head meta_out_active;/* video loop precalculated rectangles */
@@ -472,6 +479,9 @@ struct vivid_dev {u32 vbi_out_seq_count;bool vbi_out_streaming;bool stream_sliced_vbi_out; +u32 meta_out_seq_start; +u32 meta_out_seq_count; +bool meta_out_streaming;/* SDR capture */ struct vb2_queue vb_sdr_cap_q;
drivers/media/platform/vivid/vivid-ctrls.c +11 -1
@@ -1494,6 +1494,7 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap;struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_handler *hdl_meta_out = &dev->ctrl_hdl_meta_out;struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops,
@@ -1535,6 +1536,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_meta_cap,2 );v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_out,2 ); +v4l2_ctrl_new_custom (hdl_meta_out, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1880,7 +1883,13 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_meta_cap->error; dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; } - +if (dev->has_meta_out) { +v4l2_ctrl_add_handler (hdl_meta_out, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_out, hdl_streaming,NULL , false); +if (hdl_meta_out->error) +return hdl_meta_out->error; + dev->meta_out_dev.ctrl_handler = hdl_meta_out; + }return 0 ; }
@@ -1901,4 +1910,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb);v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_out); }
drivers/media/platform/vivid/vivid-kthread-out.c +47 -3
106 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-out.c new file +174 -0
174 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-out.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-out.h - meta output support functions. +*/ +#ifndef _VIVID_META_OUT_H_ +#define _VIVID_META_OUT_H_ + +struct vivid_meta_out_buf { +u16 brightness; +u16 contrast; +u16 saturation; +s16 hue; +}; + +void vivid_meta_out_process (struct vivid_dev *dev,struct vivid_buffer *buf); +int vidioc_enum_fmt_meta_out (struct file *file,void *priv, +struct v4l2_fmtdesc *f); +int vidioc_g_fmt_meta_out (struct file *file,void *priv, +struct v4l2_format *f); +int vidioc_s_fmt_meta_out (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_out_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-out.c +4 -1
@@ -1079,7 +1079,9 @@ int vidioc_s_output(struct file *file, void *priv, unsigned o)if (o == dev->output)return 0 ; -if (vb2_is_busy (&dev->vb_vid_out_q) ||vb2_is_busy (&dev->vb_vbi_out_q)) +if (vb2_is_busy (&dev->vb_vid_out_q) || +vb2_is_busy (&dev->vb_vbi_out_q) || +vb2_is_busy (&dev->vb_meta_out_q))return -EBUSY ; dev->output = o;
@@ -1090,6 +1092,7 @@ int vidioc_s_output(struct file *file, void *priv, unsigned o) dev->vid_out_dev.tvnorms =0 ; dev->vbi_out_dev.tvnorms = dev->vid_out_dev.tvnorms; + dev->meta_out_dev.tvnorms = dev->vid_out_dev.tvnorms;vivid_update_format_out (dev);v4l2_ctrl_activate (dev->ctrl_display_present,vivid_is_hdmi_out (dev));
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
v11 cover vivid: Metadata support
In reply to Vandana BNThis patch adds metadata support in vivid driver.
Metadata capture supports UVCH format V4L2_META_FMT_UVC as it is widely used in webcams.
https://hverkuil.home.xs4all.nl/spec/uapi/v4l/pixfmt-meta-uvc.html
For Metadata output a new format V4L2_META_FMT_VIVID is added,
which is used to set brightness, contrast, sturation and hue.
Changes in V11:
fix in metadata output patch to correctly update sequence. fix in metadata capture patch updating description of node_types
in module patameter.
Regards,
Vandana.
Vandana BN (3):
vivid: Add metadata capture support
v4l2-core: Add new metadata format
vivid: Add metadata output support
drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 197 ++++++++++++++++- drivers/media/platform/vivid/vivid-core.h | 24 +++ drivers/media/platform/vivid/vivid-ctrls.c | 75 +++++++ .../media/platform/vivid/vivid-kthread-cap.c | 54 ++++- .../media/platform/vivid/vivid-kthread-out.c | 49 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-meta-out.c | 174 +++++++++++++++ drivers/media/platform/vivid/vivid-meta-out.h | 25 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- drivers/media/platform/vivid/vivid-vid-out.c | 5 +- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 14 files changed, 824 insertions(+), 18 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v11 1/3 vivid: Add metadata capture support
This patch adds meatadata capture support in vivid driver. Adds new files for metadata capture.
Adds vivid controls to generate PTS and SCR for metadata stream. also fixes v4l2-compliance issues seen on metadata device.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 109 +++++++++- drivers/media/platform/vivid/vivid-core.h | 14 ++ drivers/media/platform/vivid/vivid-ctrls.c | 65 ++++++ .../media/platform/vivid/vivid-kthread-cap.c | 54 ++++- drivers/media/platform/vivid/vivid-meta-cap.c | 201 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-cap.h | 29 +++ drivers/media/platform/vivid/vivid-vid-cap.c | 5 +- 8 files changed, 465 insertions(+), 14 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.c create mode 100644 drivers/media/platform/vivid/vivid-meta-cap.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o + vivid-osd.o vivid-meta-cap.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +103 -6
230 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +14 -0
@@ -131,6 +131,7 @@ struct vivid_dev {struct media_pad vbi_cap_pad;struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad; +struct media_pad meta_cap_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -153,6 +154,9 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_radio_tx;struct video_device sdr_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_sdr_cap; +struct video_device meta_cap_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +spinlock_t slock;struct mutex mutex;
@@ -164,6 +168,7 @@ struct vivid_dev {u32 sdr_cap_caps;u32 radio_rx_caps;u32 radio_tx_caps; +u32 meta_cap_caps;/* supported features */ bool multiplanar;
@@ -189,6 +194,7 @@ struct vivid_dev {bool has_radio_tx;bool has_sdr_cap;bool has_fb; +bool has_meta_cap;bool can_loop_video;
@@ -390,6 +396,8 @@ struct vivid_dev {struct list_head vid_cap_active;struct vb2_queue vb_vbi_cap_q;struct list_head vbi_cap_active; +struct vb2_queue vb_meta_cap_q; +struct list_head meta_cap_active;/* thread for generating video capture stream */ struct task_struct *kthread_vid_cap;
@@ -407,6 +415,9 @@ struct vivid_dev {u32 vbi_cap_seq_count;bool vbi_cap_streaming;bool stream_sliced_vbi_cap; +u32 meta_cap_seq_start; +u32 meta_cap_seq_count; +bool meta_cap_streaming;/* video output */ const struct vivid_fmt *fmt_out;
@@ -527,6 +538,9 @@ struct vivid_dev {/* CEC OSD String */ char osd[14 ];unsigned long osd_jiffies; + +bool meta_pts; +bool meta_scr; };static inline bool vivid_is_webcam (const struct vivid_dev *dev)
drivers/media/platform/vivid/vivid-ctrls.c +65 -0
111 lines not on this page · raw message
drivers/media/platform/vivid/vivid-kthread-cap.c +48 -6
116 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.c new file +201 -0
201 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-cap.h new file +29 -0
@@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-cap.h - meta capture support functions. +*/ +#ifndef _VIVID_META_CAP_H_ +#define _VIVID_META_CAP_H_ + +#define VIVID_META_CLOCK_UNIT 10/* 100 MHz */ + +struct vivid_uvc_meta_buf { +__u64 ns; +__u16 sof; +__u8 length; +__u8 flags; +__u8 buf[10 ];/* PTS(4)+STC(4)+SOF(2) */ +} __packed; + +void vivid_meta_cap_fillbuff (struct vivid_dev *dev, +struct vivid_buffer *buf,u64 soe); + +int vidioc_enum_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_fmtdesc *f); + +int vidioc_g_fmt_meta_cap (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_cap_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-cap.c +4 -1
@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;
@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v11 2/3 v4l2-core: Add new metadata format
In reply to bnvandana at gmail.com (Vandana BN)Add new metadata format to support metadata output in vivid.
--- drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 2 files changed, 2 insertions(+)
drivers/media/v4l2-core/v4l2-ioctl.c +1 -0
@@ -1340,6 +1340,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)case V4L2_META_FMT_VSP1_HGT : descr ="R-Car VSP1 2-D Histogram" ;break ;case V4L2_META_FMT_UVC : descr ="UVC Payload Header Metadata" ;break ;case V4L2_META_FMT_D4XX : descr ="Intel D4xx UVC Metadata" ;break ; +case V4L2_META_FMT_VIVID : descr ="Vivid Metadata" ;break ;default :/* Compressed formats */
include/uapi/linux/videodev2.h +1 -0
@@ -755,6 +755,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
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v11 3/3 vivid: Add metadata output support
In reply to bnvandana at gmail.com (Vandana BN)Support metadata output in vivid driver.
Metadata output is used to set brightness, contrast, saturation and hue.
Adds new files for metadata output.
--- drivers/media/platform/vivid/Makefile | 2 +- drivers/media/platform/vivid/vivid-core.c | 98 +++++++++- drivers/media/platform/vivid/vivid-core.h | 10 + drivers/media/platform/vivid/vivid-ctrls.c | 12 +- .../media/platform/vivid/vivid-kthread-out.c | 49 ++++- drivers/media/platform/vivid/vivid-meta-out.c | 174 ++++++++++++++++++ drivers/media/platform/vivid/vivid-meta-out.h | 25 +++ drivers/media/platform/vivid/vivid-vid-out.c | 5 +- 8 files changed, 364 insertions(+), 11 deletions(-) create mode 100644 drivers/media/platform/vivid/vivid-meta-out.c create mode 100644 drivers/media/platform/vivid/vivid-meta-out.h
drivers/media/platform/vivid/Makefile +1 -1
@@ -3,7 +3,7 @@ vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \ vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \ vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \ vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \ - vivid-osd.o vivid-meta-cap.o + vivid-osd.o vivid-meta-cap.o vivid-meta-out.o ifeq ($(CONFIG_VIDEO_VIVID_CEC),y) vivid-objs += vivid-cec.o endif
drivers/media/platform/vivid/vivid-core.c +93 -5
208 lines not on this page · raw message
drivers/media/platform/vivid/vivid-core.h +10 -0
@@ -132,6 +132,7 @@ struct vivid_dev {struct media_pad vbi_out_pad;struct media_pad sdr_cap_pad;struct media_pad meta_cap_pad; +struct media_pad meta_out_pad;#endif struct v4l2_ctrl_handler ctrl_hdl_user_gen;struct v4l2_ctrl_handler ctrl_hdl_user_vid;
@@ -156,6 +157,8 @@ struct vivid_dev {struct v4l2_ctrl_handler ctrl_hdl_sdr_cap;struct video_device meta_cap_dev;struct v4l2_ctrl_handler ctrl_hdl_meta_cap; +struct video_device meta_out_dev; +struct v4l2_ctrl_handler ctrl_hdl_meta_out;spinlock_t slock;struct mutex mutex;
@@ -169,6 +172,7 @@ struct vivid_dev {u32 radio_rx_caps;u32 radio_tx_caps;u32 meta_cap_caps; +u32 meta_out_caps;/* supported features */ bool multiplanar;
@@ -195,6 +199,7 @@ struct vivid_dev {bool has_sdr_cap;bool has_fb;bool has_meta_cap; +bool has_meta_out;bool can_loop_video;
@@ -432,6 +437,8 @@ struct vivid_dev {struct list_head vid_out_active;struct vb2_queue vb_vbi_out_q;struct list_head vbi_out_active; +struct vb2_queue vb_meta_out_q; +struct list_head meta_out_active;/* video loop precalculated rectangles */
@@ -472,6 +479,9 @@ struct vivid_dev {u32 vbi_out_seq_count;bool vbi_out_streaming;bool stream_sliced_vbi_out; +u32 meta_out_seq_start; +u32 meta_out_seq_count; +bool meta_out_streaming;/* SDR capture */ struct vb2_queue vb_sdr_cap_q;
drivers/media/platform/vivid/vivid-ctrls.c +11 -1
@@ -1494,6 +1494,7 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,struct v4l2_ctrl_handler *hdl_radio_tx = &dev->ctrl_hdl_radio_tx;struct v4l2_ctrl_handler *hdl_sdr_cap = &dev->ctrl_hdl_sdr_cap;struct v4l2_ctrl_handler *hdl_meta_cap = &dev->ctrl_hdl_meta_cap; +struct v4l2_ctrl_handler *hdl_meta_out = &dev->ctrl_hdl_meta_out;struct v4l2_ctrl_config vivid_ctrl_dv_timings = { .ops = &vivid_vid_cap_ctrl_ops,
@@ -1535,6 +1536,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,v4l2_ctrl_new_custom (hdl_sdr_cap, &vivid_ctrl_class,NULL );v4l2_ctrl_handler_init (hdl_meta_cap,2 );v4l2_ctrl_new_custom (hdl_meta_cap, &vivid_ctrl_class,NULL ); +v4l2_ctrl_handler_init (hdl_meta_out,2 ); +v4l2_ctrl_new_custom (hdl_meta_out, &vivid_ctrl_class,NULL );/* User Controls */ dev->volume = v4l2_ctrl_new_std(hdl_user_aud, NULL,
@@ -1880,7 +1883,13 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,return hdl_meta_cap->error; dev->meta_cap_dev.ctrl_handler = hdl_meta_cap; } - +if (dev->has_meta_out) { +v4l2_ctrl_add_handler (hdl_meta_out, hdl_user_gen,NULL , false); +v4l2_ctrl_add_handler (hdl_meta_out, hdl_streaming,NULL , false); +if (hdl_meta_out->error) +return hdl_meta_out->error; + dev->meta_out_dev.ctrl_handler = hdl_meta_out; + }return 0 ; }
@@ -1901,4 +1910,5 @@ void vivid_free_controls(struct vivid_dev *dev)v4l2_ctrl_handler_free (&dev->ctrl_hdl_loop_cap);v4l2_ctrl_handler_free (&dev->ctrl_hdl_fb);v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_cap); +v4l2_ctrl_handler_free (&dev->ctrl_hdl_meta_out); }
drivers/media/platform/vivid/vivid-kthread-out.c +46 -3
105 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-out.c new file +174 -0
174 lines not on this page · raw message
drivers/media/platform/vivid/vivid-meta-out.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* vivid-meta-out.h - meta output support functions. +*/ +#ifndef _VIVID_META_OUT_H_ +#define _VIVID_META_OUT_H_ + +struct vivid_meta_out_buf { +u16 brightness; +u16 contrast; +u16 saturation; +s16 hue; +}; + +void vivid_meta_out_process (struct vivid_dev *dev,struct vivid_buffer *buf); +int vidioc_enum_fmt_meta_out (struct file *file,void *priv, +struct v4l2_fmtdesc *f); +int vidioc_g_fmt_meta_out (struct file *file,void *priv, +struct v4l2_format *f); +int vidioc_s_fmt_meta_out (struct file *file,void *priv, +struct v4l2_format *f); + +extern const struct vb2_ops vivid_meta_out_qops; + +#endif
drivers/media/platform/vivid/vivid-vid-out.c +4 -1
@@ -1079,7 +1079,9 @@ int vidioc_s_output(struct file *file, void *priv, unsigned o)if (o == dev->output)return 0 ; -if (vb2_is_busy (&dev->vb_vid_out_q) ||vb2_is_busy (&dev->vb_vbi_out_q)) +if (vb2_is_busy (&dev->vb_vid_out_q) || +vb2_is_busy (&dev->vb_vbi_out_q) || +vb2_is_busy (&dev->vb_meta_out_q))return -EBUSY ; dev->output = o;
@@ -1090,6 +1092,7 @@ int vidioc_s_output(struct file *file, void *priv, unsigned o) dev->vid_out_dev.tvnorms =0 ; dev->vbi_out_dev.tvnorms = dev->vid_out_dev.tvnorms; + dev->meta_out_dev.tvnorms = dev->vid_out_dev.tvnorms;vivid_update_format_out (dev);v4l2_ctrl_activate (dev->ctrl_display_present,vivid_is_hdmi_out (dev));
Signature · 1 line
2.17.1
bnvandana at gmail.com (Vandana BN)
PATCH v7 2/2 vivid: fixes for v4l2-compliance issues.
In reply to Vandana BNFrom: Hans Verkuil <hverkuil at xs4all.nl>
This patch fixes v4l2-compliance issues seen on metadata device.
--- drivers/media/platform/vivid/vivid-core.c | 16 +++++++++++++++- drivers/media/platform/vivid/vivid-meta-cap.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 5 ++++- 3 files changed, 20 insertions(+), 3 deletions(-)
drivers/media/platform/vivid/vivid-core.c +15 -1
@@ -897,9 +897,14 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)V4L2_CAP_READWRITE ;/* set up the capabilities of meta capture device */ -if (dev->has_meta_cap) +if (dev->has_meta_cap) { dev->meta_cap_caps =V4L2_CAP_META_CAPTURE |V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; +if (dev->has_audio_inputs) + dev->meta_cap_caps |=V4L2_CAP_AUDIO ; +if (in_type_counter[TV ]) + dev->meta_cap_caps |=V4L2_CAP_TUNER ; + } ret = -ENOMEM ;/* initialize the test pattern generator */
@@ -960,6 +965,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_ENUMAUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_ENUMAUDIO ); }if (!dev->has_audio_outputs) {v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_AUDOUT );
@@ -985,12 +993,16 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_FREQUENCY ); }if (!has_tuner) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_TUNER ); }if (in_type_counter[HDMI ] ==0 ) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_EDID );
@@ -1016,6 +1028,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->sdr_cap_dev,VIDIOC_S_HW_FREQ_SEEK ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_ENUM_FRAMESIZES );
@@ -1552,6 +1565,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) vfd->v4l2_dev = &dev->v4l2_dev; vfd->queue = &dev->vb_meta_cap_q; vfd->lock = &dev->mutex; + vfd->tvnorms = tvnorms_cap;video_set_drvdata (vfd, dev);#ifdef CONFIG_MEDIA_CONTROLLER dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ;
drivers/media/platform/vivid/vivid-meta-cap.c +1 -1
@@ -135,7 +135,7 @@ int vidioc_enum_fmt_meta_cap(struct file *file, void *priv,struct vivid_dev *dev =video_drvdata (file);if (!vivid_is_webcam (dev)) -return -ENODATA ; +return -EINVAL ;if (f->index >0 )return -EINVAL ;
drivers/media/platform/vivid/vivid-vid-cap.c +4 -1
@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;
@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {
Signature · 1 line
2.17.1
PATCH v7 2/2 vivid: fixes for v4l2-compliance issues.
Quoted 5 lines · Vandana BN
From: Hans Verkuil <hverkuil at xs4all.nl>
This patch fixes v4l2-compliance issues seen on metadata device.
Signed-off-by Hans Verkuil <hverkuil-cisco at xs4all.nl>
Can you squash this patch into the previous one? It's really all fixes for the previous patch, and it is better to apply one good patch.
No need to keep my Signed-off-by: it will be added again anyway when I merge the v8 vivid metadata capture patch.
Regards,
Hans
Quoted 106 lines
--- drivers/media/platform/vivid/vivid-core.c | 16 +++++++++++++++- drivers/media/platform/vivid/vivid-meta-cap.c | 2 +- drivers/media/platform/vivid/vivid-vid-cap.c | 5 ++++- 3 files changed, 20 insertions(+), 3 deletions(-)drivers/media/platform/vivid/vivid-core.c +15
-1@@ -897,9 +897,14 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)V4L2_CAP_READWRITE ;/* set up the capabilities of meta capture device */ -if (dev->has_meta_cap) +if (dev->has_meta_cap) { dev->meta_cap_caps =V4L2_CAP_META_CAPTURE |V4L2_CAP_STREAMING |V4L2_CAP_READWRITE ; +if (dev->has_audio_inputs) + dev->meta_cap_caps |=V4L2_CAP_AUDIO ; +if (in_type_counter[TV ]) + dev->meta_cap_caps |=V4L2_CAP_TUNER ; + } ret = -ENOMEM ;/* initialize the test pattern generator */ @@ -960,6 +965,9 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_AUDIO );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_ENUMAUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_AUDIO ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_ENUMAUDIO ); }if (!dev->has_audio_outputs) {v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_AUDOUT );@@ -985,12 +993,16 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_FREQUENCY ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_FREQUENCY ); }if (!has_tuner) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_G_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_TUNER );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_G_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_TUNER ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_G_TUNER ); }if (in_type_counter[HDMI ] ==0 ) {v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_EDID );@@ -1016,6 +1028,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)v4l2_disable_ioctl (&dev->vid_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vbi_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->sdr_cap_dev,VIDIOC_S_HW_FREQ_SEEK ); +v4l2_disable_ioctl (&dev->meta_cap_dev,VIDIOC_S_HW_FREQ_SEEK );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_S_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_G_FREQUENCY );v4l2_disable_ioctl (&dev->vid_out_dev,VIDIOC_ENUM_FRAMESIZES );@@ -1552,6 +1565,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) vfd->v4l2_dev = &dev->v4l2_dev; vfd->queue = &dev->vb_meta_cap_q; vfd->lock = &dev->mutex; + vfd->tvnorms = tvnorms_cap;video_set_drvdata (vfd, dev);#ifdef CONFIG_MEDIA_CONTROLLER dev->meta_cap_pad.flags =MEDIA_PAD_FL_SINK ;drivers/media/platform/vivid/vivid-meta-cap.c +1
-1@@ -135,7 +135,7 @@ int vidioc_enum_fmt_meta_cap(struct file *file, void *priv,struct vivid_dev *dev =video_drvdata (file);if (!vivid_is_webcam (dev)) -return -ENODATA ; +return -EINVAL ;if (f->index >0 )return -EINVAL ;drivers/media/platform/vivid/vivid-vid-cap.c +4
-1@@ -1356,7 +1356,9 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)if (i == dev->input)return 0 ; -if (vb2_is_busy (&dev->vb_vid_cap_q) ||vb2_is_busy (&dev->vb_vbi_cap_q)) +if (vb2_is_busy (&dev->vb_vid_cap_q) || +vb2_is_busy (&dev->vb_vbi_cap_q) || +vb2_is_busy (&dev->vb_meta_cap_q))return -EBUSY ; dev->input = i;@@ -1366,6 +1368,7 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i) dev->vid_cap_dev.tvnorms =V4L2_STD_ALL ; } dev->vbi_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms; + dev->meta_cap_dev.tvnorms = dev->vid_cap_dev.tvnorms;vivid_update_format_cap (dev, false);if (dev->colorspace) {