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

Commit 8caec72e authored by Keiichi Watanabe's avatar Keiichi Watanabe Committed by Mauro Carvalho Chehab
Browse files

media: vivid: Support 480p for webcam capture 



Support 640x480 as a frame size for video input devices of vivid.

Signed-off-by: default avatarKeiichi Watanabe <keiichiw@chromium.org>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 250854ee

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

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static const struct vivid_fmt formats_ovl[] = { 
};



/* The number of discrete webcam framesizes */

#define VIVID_WEBCAM_SIZES 5

#define VIVID_WEBCAM_SIZES 6

/* The number of discrete webcam frameintervals */

#define VIVID_WEBCAM_IVALS (VIVID_WEBCAM_SIZES * 2)
@@ -59,6 +59,7 @@ static const struct vivid_fmt formats_ovl[] = { 
static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = {

	{  320, 180 },

	{  640, 360 },

	{  640, 480 },

	{ 1280, 720 },

	{ 1920, 1080 },

	{ 3840, 2160 },
@@ -74,9 +75,11 @@ static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = { 
	{  1, 4 },

	{  1, 5 },

	{  1, 10 },

	{  2, 25 },

	{  1, 15 },

	{  1, 25 },

	{  1, 30 },

	{  1, 40 },

	{  1, 50 },

	{  1, 60 },

};