[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

부모
ecc2fe20e6
커밋
df9ecb0cad
@@ -1898,7 +1898,6 @@ static void vpfe_calculate_offsets(struct vpfe_device *vpfe)
|
||||
/*
|
||||
* vpfe_queue_setup - Callback function for buffer setup.
|
||||
* @vq: vb2_queue ptr
|
||||
* @fmt: v4l2 format
|
||||
* @nbuffers: ptr to number of buffers requested by application
|
||||
* @nplanes:: contains number of distinct video planes needed to hold a frame
|
||||
* @sizes[]: contains the size (in bytes) of each plane.
|
||||
@@ -1908,22 +1907,24 @@ static void vpfe_calculate_offsets(struct vpfe_device *vpfe)
|
||||
* the buffer count and buffer size
|
||||
*/
|
||||
static int vpfe_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 vpfe_device *vpfe = vb2_get_drv_priv(vq);
|
||||
|
||||
if (fmt && fmt->fmt.pix.sizeimage < vpfe->fmt.fmt.pix.sizeimage)
|
||||
return -EINVAL;
|
||||
unsigned size = vpfe->fmt.fmt.pix.sizeimage;
|
||||
|
||||
if (vq->num_buffers + *nbuffers < 3)
|
||||
*nbuffers = 3 - vq->num_buffers;
|
||||
alloc_ctxs[0] = vpfe->alloc_ctx;
|
||||
|
||||
if (*nplanes) {
|
||||
if (sizes[0] < size)
|
||||
return -EINVAL;
|
||||
size = sizes[0];
|
||||
}
|
||||
|
||||
*nplanes = 1;
|
||||
sizes[0] = fmt ? fmt->fmt.pix.sizeimage : vpfe->fmt.fmt.pix.sizeimage;
|
||||
alloc_ctxs[0] = vpfe->alloc_ctx;
|
||||
sizes[0] = size;
|
||||
|
||||
vpfe_dbg(1, vpfe,
|
||||
"nbuffers=%d, size=%u\n", *nbuffers, sizes[0]);
|
||||
|
Reference in New Issue
Block a user