[media] vb2: drop v4l2_format argument from queue_setup
The queue_setup callback has a void pointer that is just for V4L2 and is the pointer to the v4l2_format struct that was passed to VIDIOC_CREATE_BUFS. The idea was that drivers would use the information from that struct to buffers suitable for the requested format. After the vb2 split series this pointer is now a void pointer, which is ugly, and the reality is that all existing drivers will effectively just look at the sizeimage field of v4l2_format. To make this more generic the queue_setup callback is changed: the void pointer is dropped, instead if the *num_planes argument is 0, then use the current format size, if it is non-zero, then it contains the number of requested planes and the sizes array contains the requested sizes. If either is unsupported, then return -EINVAL, otherwise use the requested size(s). Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:

committed by
Mauro Carvalho Chehab

parent
ecc2fe20e6
commit
df9ecb0cad
@@ -710,11 +710,9 @@ static const struct v4l2_ioctl_ops vim2m_ioctl_ops = {
|
||||
*/
|
||||
|
||||
static int vim2m_queue_setup(struct vb2_queue *vq,
|
||||
const void *parg,
|
||||
unsigned int *nbuffers, unsigned int *nplanes,
|
||||
unsigned int sizes[], void *alloc_ctxs[])
|
||||
{
|
||||
const struct v4l2_format *fmt = parg;
|
||||
struct vim2m_ctx *ctx = vb2_get_drv_priv(vq);
|
||||
struct vim2m_q_data *q_data;
|
||||
unsigned int size, count = *nbuffers;
|
||||
@@ -723,17 +721,14 @@ static int vim2m_queue_setup(struct vb2_queue *vq,
|
||||
|
||||
size = q_data->width * q_data->height * q_data->fmt->depth >> 3;
|
||||
|
||||
if (fmt) {
|
||||
if (fmt->fmt.pix.sizeimage < size)
|
||||
return -EINVAL;
|
||||
size = fmt->fmt.pix.sizeimage;
|
||||
}
|
||||
|
||||
while (size * count > MEM2MEM_VID_MEM_LIMIT)
|
||||
(count)--;
|
||||
*nbuffers = count;
|
||||
|
||||
if (*nplanes)
|
||||
return sizes[0] < size ? -EINVAL : 0;
|
||||
|
||||
*nplanes = 1;
|
||||
*nbuffers = count;
|
||||
sizes[0] = size;
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user