korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 02:04:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] usbtv: fix v4l2-compliance issues

Browse Source 
Running v4l2-compliance on my usbtv stick revealed two failures:

1) Correct handling of CREATE_BUFS in usbtv_queue_setup was missing. Added this.
2) The sequence counter wasn't reset to 0 when starting streaming.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-04-24 04:26:01 -03:00 committed by Mauro Carvalho Chehab
parent 2b4fd3ede3
commit a988410ad1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/usb/usbtv/usbtv-video.c
View File

@ -599,15 +599,18 @@ static struct v4l2_file_operations usbtv_fops = {
}; };
static int usbtv_queue_setup(struct vb2_queue *vq, static int usbtv_queue_setup(struct vb2_queue *vq,
const struct v4l2_format *v4l_fmt, unsigned int *nbuffers, const struct v4l2_format *fmt, unsigned int *nbuffers,
unsigned int *nplanes, unsigned int sizes[], void *alloc_ctxs[]) unsigned int *nplanes, unsigned int sizes[], void *alloc_ctxs[])
{ {
struct usbtv *usbtv = vb2_get_drv_priv(vq); struct usbtv *usbtv = vb2_get_drv_priv(vq);
unsigned size = USBTV_CHUNK * usbtv->n_chunks * 2 * sizeof(u32);
if (*nbuffers < 2) if (vq->num_buffers + *nbuffers < 2)
*nbuffers = 2; *nbuffers = 2 - vq->num_buffers;
*nplanes = 1; *nplanes = 1;
sizes[0] = USBTV_CHUNK * usbtv->n_chunks * 2 * sizeof(u32); if (fmt && fmt->fmt.pix.sizeimage < size)
return -EINVAL;
sizes[0] = fmt ? fmt->fmt.pix.sizeimage : size;
return 0; return 0;
} }
@ -635,6 +638,7 @@ static int usbtv_start_streaming(struct vb2_queue *vq, unsigned int count)
if (usbtv->udev == NULL) if (usbtv->udev == NULL)
return -ENODEV; return -ENODEV;
usbtv->sequence = 0;
return usbtv_start(usbtv); return usbtv_start(usbtv);
} }