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

Commit 1381fb3e authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] vivid: add 1080p capture at 2 fps and 5 fps to webcam emulation 



Use the VIVID_WEBCAM_SIZES constant where appropriate and add a
1920x1080 pixel frame size setting with frame rates of 2 fps and
5 fps.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 480856f3

drivers/media/platform/vivid/vivid-vid-cap.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ static const struct vivid_fmt formats_ovl[] = { 
};

};





/* The number of discrete webcam framesizes */

/* The number of discrete webcam framesizes */

#define VIVID_WEBCAM_SIZES 3

#define VIVID_WEBCAM_SIZES 4

/* The number of discrete webcam frameintervals */

/* The number of discrete webcam frameintervals */

#define VIVID_WEBCAM_IVALS (VIVID_WEBCAM_SIZES * 2)

#define VIVID_WEBCAM_IVALS (VIVID_WEBCAM_SIZES * 2)
@@ -75,6 +75,7 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { 
	{  320, 180 },

	{  320, 180 },

	{  640, 360 },

	{  640, 360 },

	{ 1280, 720 },

	{ 1280, 720 },

	{ 1920, 1080 },

};

};





/*

/*
@@ -82,6 +83,8 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { 
 * elements in this array as there are in webcam_sizes.

 * elements in this array as there are in webcam_sizes.

 */

 */

static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = {

static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = {

	{  1, 2 },

	{  1, 5 },

	{  1, 10 },

	{  1, 10 },

	{  1, 15 },

	{  1, 15 },

	{  1, 25 },

	{  1, 25 },
@@ -720,8 +723,8 @@ int vivid_s_fmt_vid_cap(struct file *file, void *priv, 
					webcam_sizes[i].height == mp->height)

					webcam_sizes[i].height == mp->height)

				break;

				break;

		dev->webcam_size_idx = i;

		dev->webcam_size_idx = i;

		if (dev->webcam_ival_idx >= 2 * (3 - i))

		if (dev->webcam_ival_idx >= 2 * (VIVID_WEBCAM_SIZES - i))

			dev->webcam_ival_idx = 2 * (3 - i) - 1;

			dev->webcam_ival_idx = 2 * (VIVID_WEBCAM_SIZES - i) - 1;

		vivid_update_format_cap(dev, false);

		vivid_update_format_cap(dev, false);

	} else {

	} else {

		struct v4l2_rect r = { 0, 0, mp->width, mp->height };

		struct v4l2_rect r = { 0, 0, mp->width, mp->height };
@@ -1768,7 +1771,7 @@ int vidioc_enum_frameintervals(struct file *file, void *priv, 
			break;

			break;

	if (i == ARRAY_SIZE(webcam_sizes))

	if (i == ARRAY_SIZE(webcam_sizes))

		return -EINVAL;

		return -EINVAL;

	if (fival->index >= 2 * (3 - i))

	if (fival->index >= 2 * (VIVID_WEBCAM_SIZES - i))

		return -EINVAL;

		return -EINVAL;

	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;

	fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;

	fival->discrete = webcam_intervals[fival->index];

	fival->discrete = webcam_intervals[fival->index];
@@ -1798,7 +1801,7 @@ int vivid_vid_cap_s_parm(struct file *file, void *priv, 
			  struct v4l2_streamparm *parm)

			  struct v4l2_streamparm *parm)

{

{

	struct vivid_dev *dev = video_drvdata(file);

	struct vivid_dev *dev = video_drvdata(file);

	unsigned ival_sz = 2 * (3 - dev->webcam_size_idx);

	unsigned ival_sz = 2 * (VIVID_WEBCAM_SIZES - dev->webcam_size_idx);

	struct v4l2_fract tpf;

	struct v4l2_fract tpf;

	unsigned i;

	unsigned i;