Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ffe77f authored by Antonio Ospite's avatar Antonio Ospite Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13564): gspca - main: Implement vidioc_enum_frameintervals. 



Some drivers support multiple frameintervals (framerates), make gspca able to
enumerate them.

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Signed-off-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7bd330b4

drivers/media/video/gspca/gspca.c

+29 −0
Original line number Diff line number Diff line
@@ -982,6 +982,34 @@ static int vidioc_enum_framesizes(struct file *file, void *priv, 
	return -EINVAL;

}



static int vidioc_enum_frameintervals(struct file *filp, void *priv,

				      struct v4l2_frmivalenum *fival)

{

	struct gspca_dev *gspca_dev = priv;

	int mode = wxh_to_mode(gspca_dev, fival->width, fival->height);

	__u32 i;



	if (gspca_dev->cam.mode_framerates == NULL ||

			gspca_dev->cam.mode_framerates[mode].nrates == 0)

		return -EINVAL;



	if (fival->pixel_format !=

			gspca_dev->cam.cam_mode[mode].pixelformat)

		return -EINVAL;



	for (i = 0; i < gspca_dev->cam.mode_framerates[mode].nrates; i++) {

		if (fival->index == i) {

			fival->type = V4L2_FRMSIZE_TYPE_DISCRETE;

			fival->discrete.numerator = 1;

			fival->discrete.denominator =

				gspca_dev->cam.mode_framerates[mode].rates[i];

			return 0;

		}

	}



	return -EINVAL;

}



static void gspca_release(struct video_device *vfd)

{

	struct gspca_dev *gspca_dev = container_of(vfd, struct gspca_dev, vdev);
@@ -1973,6 +2001,7 @@ static const struct v4l2_ioctl_ops dev_ioctl_ops = { 
	.vidioc_g_parm		= vidioc_g_parm,

	.vidioc_s_parm		= vidioc_s_parm,

	.vidioc_enum_framesizes = vidioc_enum_framesizes,

	.vidioc_enum_frameintervals = vidioc_enum_frameintervals,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_register	= vidioc_g_register,

	.vidioc_s_register	= vidioc_s_register,

drivers/media/video/gspca/gspca.h

+9 −0
Original line number Diff line number Diff line
@@ -45,11 +45,20 @@ extern int gspca_debug; 
/* image transfers */

#define MAX_NURBS 4		/* max number of URBs */





/* used to list framerates supported by a camera mode (resolution) */

struct framerates {

	int *rates;

	int nrates;

};



/* device information - set at probe time */

struct cam {

	int bulk_size;		/* buffer size when image transfer by bulk */

	const struct v4l2_pix_format *cam_mode;	/* size nmodes */

	char nmodes;

	const struct framerates *mode_framerates; /* must have size nmode,

						   * just like cam_mode */

	__u8 bulk_nurbs;	/* number of URBs in bulk mode

				 * - cannot be > MAX_NURBS

				 * - when 0 and bulk_size != 0 means