[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>
このコミットが含まれているのは:
@@ -39,39 +39,36 @@
|
||||
#include "fimc-is-param.h"
|
||||
|
||||
static int isp_video_capture_queue_setup(struct vb2_queue *vq,
|
||||
const void *parg,
|
||||
unsigned int *num_buffers, unsigned int *num_planes,
|
||||
unsigned int sizes[], void *allocators[])
|
||||
{
|
||||
const struct v4l2_format *pfmt = parg;
|
||||
struct fimc_isp *isp = vb2_get_drv_priv(vq);
|
||||
struct v4l2_pix_format_mplane *vid_fmt = &isp->video_capture.pixfmt;
|
||||
const struct v4l2_pix_format_mplane *pixm = NULL;
|
||||
const struct fimc_fmt *fmt;
|
||||
const struct fimc_fmt *fmt = isp->video_capture.format;
|
||||
unsigned int wh, i;
|
||||
|
||||
if (pfmt) {
|
||||
pixm = &pfmt->fmt.pix_mp;
|
||||
fmt = fimc_isp_find_format(&pixm->pixelformat, NULL, -1);
|
||||
wh = pixm->width * pixm->height;
|
||||
} else {
|
||||
fmt = isp->video_capture.format;
|
||||
wh = vid_fmt->width * vid_fmt->height;
|
||||
}
|
||||
wh = vid_fmt->width * vid_fmt->height;
|
||||
|
||||
if (fmt == NULL)
|
||||
return -EINVAL;
|
||||
|
||||
*num_buffers = clamp_t(u32, *num_buffers, FIMC_ISP_REQ_BUFS_MIN,
|
||||
FIMC_ISP_REQ_BUFS_MAX);
|
||||
if (*num_planes) {
|
||||
if (*num_planes != fmt->memplanes)
|
||||
return -EINVAL;
|
||||
for (i = 0; i < *num_planes; i++) {
|
||||
if (sizes[i] < (wh * fmt->depth[i]) / 8)
|
||||
return -EINVAL;
|
||||
allocators[i] = isp->alloc_ctx;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
*num_planes = fmt->memplanes;
|
||||
|
||||
for (i = 0; i < fmt->memplanes; i++) {
|
||||
unsigned int size = (wh * fmt->depth[i]) / 8;
|
||||
if (pixm)
|
||||
sizes[i] = max(size, pixm->plane_fmt[i].sizeimage);
|
||||
else
|
||||
sizes[i] = size;
|
||||
sizes[i] = (wh * fmt->depth[i]) / 8;
|
||||
allocators[i] = isp->alloc_ctx;
|
||||
}
|
||||
|
||||
|
新しいイシューから参照
ユーザーをブロックする