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

Commit 96eb729a authored by Daniel Drake's avatar Daniel Drake Committed by Mauro Carvalho Chehab
Browse files

[media] cafe_ccic: Implement VIDIOC_ENUM_FRAMEINTERVALS and ENUM_FRAMESIZES 



This allows GStreamer to pick appropriate framerates and resolutions
based on desired capture parameters.

Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b0326b7f

drivers/media/video/cafe_ccic.c

+26 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,30 @@ static int cafe_vidioc_g_chip_ident(struct file *file, void *priv, 
	return sensor_call(cam, core, g_chip_ident, chip);

}



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

		struct v4l2_frmsizeenum *sizes)

{

	struct cafe_camera *cam = priv;

	int ret;



	mutex_lock(&cam->s_mutex);

	ret = sensor_call(cam, video, enum_framesizes, sizes);

	mutex_unlock(&cam->s_mutex);

	return ret;

}



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

		struct v4l2_frmivalenum *interval)

{

	struct cafe_camera *cam = priv;

	int ret;



	mutex_lock(&cam->s_mutex);

	ret = sensor_call(cam, video, enum_frameintervals, interval);

	mutex_unlock(&cam->s_mutex);

	return ret;

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int cafe_vidioc_g_register(struct file *file, void *priv,

		struct v4l2_dbg_register *reg)
@@ -1773,6 +1797,8 @@ static const struct v4l2_ioctl_ops cafe_v4l_ioctl_ops = { 
	.vidioc_s_ctrl		= cafe_vidioc_s_ctrl,

	.vidioc_g_parm		= cafe_vidioc_g_parm,

	.vidioc_s_parm		= cafe_vidioc_s_parm,

	.vidioc_enum_framesizes = cafe_vidioc_enum_framesizes,

	.vidioc_enum_frameintervals = cafe_vidioc_enum_frameintervals,

	.vidioc_g_chip_ident    = cafe_vidioc_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.vidioc_g_register 	= cafe_vidioc_g_register,