Commit 88d9ce34 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: sample: v4l: Stop direct calls to queue num_buffers field 



Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 11678528

samples/v4l/v4l2-pci-skeleton.c

+3 −2
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static int queue_setup(struct vb2_queue *vq, 
		       unsigned int sizes[], struct device *alloc_devs[])

{

	struct skeleton *skel = vb2_get_drv_priv(vq);

	unsigned int q_num_bufs = vb2_get_num_buffers(vq);



	skel->field = skel->format.field;

	if (skel->field == V4L2_FIELD_ALTERNATE) {
@@ -167,8 +168,8 @@ static int queue_setup(struct vb2_queue *vq, 
		skel->field = V4L2_FIELD_TOP;

	}



	if (vq->num_buffers + *nbuffers < 3)

		*nbuffers = 3 - vq->num_buffers;

	if (q_num_bufs + *nbuffers < 3)

		*nbuffers = 3 - q_num_bufs;



	if (*nplanes)

		return sizes[0] < skel->format.sizeimage ? -EINVAL : 0;