X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vdummy;a=blobdiff_plain;f=vdummy.c;h=9786d11a04806f750c1c193f09d2ae98b115909e;hp=fcc68c01f1429f7323f9f79fdab57e7725788f58;hb=5b722856c3a22d52954ec0b482e57e18198491c5;hpb=f9dfe187cb687f6e8c8d3763e0325bffa4e00fea diff --git a/vdummy.c b/vdummy.c index fcc68c0..9786d11 100644 --- a/vdummy.c +++ b/vdummy.c @@ -3,6 +3,8 @@ #include #include #include +#include +#include #include #include #include @@ -14,7 +16,7 @@ #include struct buffer { - struct vb2_buffer vb; + struct vb2_v4l2_buffer vb; struct buffer *next; }; @@ -25,6 +27,7 @@ static int ioctl_querycap(struct file *file, void *fh, struct v4l2_capability *c static int ioctl_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *fdesc); static int ioctl_get_fmt(struct file *file, void *fh, struct v4l2_format *fmt); static int ioctl_set_fmt(struct file *file, void *fh, struct v4l2_format *fmt); +static int ioctl_try_fmt(struct file *file, void *fh, struct v4l2_format *fmt); static int ioctl_get_parm(struct file *file, void *fh, struct v4l2_streamparm *fmt); static int ioctl_set_parm(struct file *file, void *fh, struct v4l2_streamparm *fmt); static int ioctl_queryctl(struct file *file, void *fh, struct v4l2_queryctrl *ctl); @@ -39,6 +42,7 @@ static void stop_streaming(struct vb2_queue *vbq); static int update_frame(int xsz, int ysz); static int gen_frame(void); +enum hrtimer_restart timer_func(struct hrtimer *timer); module_init(init); @@ -46,7 +50,7 @@ module_exit(shutdown); MODULE_LICENSE("GPL"); MODULE_AUTHOR("John Tsiombikas"); -MODULE_DESCRIPTION("v4l2 test module"); +MODULE_DESCRIPTION("Dummy V4L2 device"); static struct mutex mutex; static struct video_device *vdev; @@ -65,6 +69,8 @@ static spinlock_t blist_lock; static struct buffer *buflist, *buflist_tail; static int seqno; +static int framerate = 1; +static struct hrtimer timer; static int init(void) { @@ -92,7 +98,7 @@ static int init(void) vbq.ops = &vbops; vbq.mem_ops = &vb2_vmalloc_memops; vbq.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; - vbq.min_buffers_needed = 1; + vbq.min_buffers_needed = 2; vbq.lock = &mutex; vbq.gfp_flags = GFP_KERNEL; @@ -128,6 +134,7 @@ static int init(void) iops.vidioc_enum_fmt_vid_cap = ioctl_enum_fmt; iops.vidioc_g_fmt_vid_cap = ioctl_get_fmt; iops.vidioc_s_fmt_vid_cap = ioctl_set_fmt; + iops.vidioc_try_fmt_vid_cap = ioctl_try_fmt; iops.vidioc_g_parm = ioctl_get_parm; iops.vidioc_s_parm = ioctl_set_parm; iops.vidioc_queryctrl = ioctl_queryctl; @@ -150,6 +157,9 @@ static int init(void) return res; } + hrtimer_init(&timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); + timer.function = timer_func; + if((res = update_frame(640, 480)) != 0) { video_unregister_device(vdev); v4l2_device_unregister(&v4l2_dev); @@ -163,6 +173,7 @@ static int init(void) static void shutdown(void) { + hrtimer_cancel(&timer); video_unregister_device(vdev); v4l2_device_unregister(&v4l2_dev); kfree(frame); @@ -171,7 +182,7 @@ static void shutdown(void) static int ioctl_querycap(struct file *file, void *fh, struct v4l2_capability *cap) { strcpy(cap->driver, KBUILD_MODNAME); - strcpy(cap->card, "dummy v4l2 dev"); + strcpy(cap->card, "Dummy V4L2 device"); strcpy(cap->bus_info, "nobus"); cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; @@ -222,6 +233,28 @@ static int ioctl_set_fmt(struct file *file, void *fh, struct v4l2_format *fmt) return ioctl_get_fmt(file, fh, fmt); } +static int ioctl_try_fmt(struct file *file, void *fh, struct v4l2_format *fmt) +{ + if(fmt->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { + return -EINVAL; + } + if(fmt->fmt.pix.width <= 0) + fmt->fmt.pix.width = width; + if(fmt->fmt.pix.height <= 0) + fmt->fmt.pix.height = height; + fmt->fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24; + fmt->fmt.pix.field = V4L2_FIELD_NONE; + fmt->fmt.pix.bytesperline = 0; + fmt->fmt.pix.sizeimage = frame_size; + fmt->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; + fmt->fmt.pix.priv = 0; + fmt->fmt.pix.flags = 0; + fmt->fmt.pix.ycbcr_enc = 0; + fmt->fmt.pix.quantization = V4L2_QUANTIZATION_FULL_RANGE; + fmt->fmt.pix.xfer_func = V4L2_XFER_FUNC_NONE; + return 0; +} + static int ioctl_get_parm(struct file *file, void *fh, struct v4l2_streamparm *parm) { if(parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { @@ -230,7 +263,7 @@ static int ioctl_get_parm(struct file *file, void *fh, struct v4l2_streamparm *p parm->parm.capture.capability = 0; parm->parm.capture.capturemode = 0; parm->parm.capture.timeperframe.numerator = 1; - parm->parm.capture.timeperframe.denominator = 30; + parm->parm.capture.timeperframe.denominator = framerate; parm->parm.capture.extendedmode = 0; parm->parm.capture.readbuffers = 1; return 0; @@ -238,9 +271,14 @@ static int ioctl_get_parm(struct file *file, void *fh, struct v4l2_streamparm *p static int ioctl_set_parm(struct file *file, void *fh, struct v4l2_streamparm *parm) { + int new_framerate; if(parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) { return -EINVAL; } + + new_framerate = parm->parm.capture.timeperframe.denominator / parm->parm.capture.timeperframe.numerator; + framerate = new_framerate < 1 ? 1 : (new_framerate > 60 ? 60 : new_framerate); + return ioctl_get_parm(file, fh, parm); } @@ -268,7 +306,6 @@ static int buf_prepare(struct vb2_buffer *vb) printk(KERN_ALERT "vdummy: buffer too small\n"); return -EINVAL; } - vb2_set_plane_payload(vb, 0, frame_size); return 0; } @@ -293,7 +330,7 @@ static void clear_queue(enum vb2_buffer_state st) while(buflist) { struct buffer *buf = buflist; buflist = buflist->next; - vb2_buffer_done(&buf->vb, st); + vb2_buffer_done(&buf->vb.vb2_buf, st); } buflist = buflist_tail = 0; spin_unlock(&blist_lock); @@ -301,15 +338,26 @@ static void clear_queue(enum vb2_buffer_state st) static int start_streaming(struct vb2_queue *vbq, unsigned int count) { + ktime_t frame_interval; + streaming = 1; seqno = 0; - gen_frame(); + /* calculate frame interval in nanoseconds */ + if(framerate <= 1) { + frame_interval = ktime_set(1, 0); + } else { + frame_interval = ktime_set(0, 1000000000ul / (unsigned long)framerate); + } + + hrtimer_start(&timer, frame_interval, HRTIMER_MODE_REL); return 0; } static void stop_streaming(struct vb2_queue *vbq) { + hrtimer_cancel(&timer); + streaming = 0; clear_queue(VB2_BUF_STATE_ERROR); } @@ -363,13 +411,23 @@ static int gen_frame(void) spin_unlock(&blist_lock); if(buf) { - memcpy(vb2_plane_vaddr(&buf->vb, 0), frame, frame_size); - - /*v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp); - buf->vb.v4l2_buf.sequence = seqno++; - buf->vb.v4l2_buf.field = V4L2_FIELD_NONE;*/ - vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); + mutex_lock(&mutex); + memcpy(vb2_plane_vaddr(&buf->vb.vb2_buf, 0), frame, frame_size); + + buf->vb.vb2_buf.timestamp = ktime_get_ns(); + printk(KERN_INFO "vdummy: copying frame: %d ts: %lu\n", seqno, + (unsigned long)buf->vb.vb2_buf.timestamp); + buf->vb.sequence = seqno++; + buf->vb.field = V4L2_FIELD_NONE; + vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE); + vb2_set_plane_payload(&buf->vb.vb2_buf, 0, frame_size); + mutex_unlock(&mutex); } - return 0; } + +enum hrtimer_restart timer_func(struct hrtimer *timer) +{ + gen_frame(); + return streaming ? HRTIMER_RESTART : HRTIMER_NORESTART; +}