Commit 6ab1a322 authored by Soren Brinkmann's avatar Soren Brinkmann Committed by Mauro Carvalho Chehab

[media] vivid: Enable 4k resolution for webcam capture device

Add 3840x2160 as valid resolution for the webcam capture input and
adjust the webcam intervals accordingly.
Signed-off-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent fc2cc75a
...@@ -63,7 +63,7 @@ static const struct vivid_fmt formats_ovl[] = { ...@@ -63,7 +63,7 @@ static const struct vivid_fmt formats_ovl[] = {
}; };
/* The number of discrete webcam framesizes */ /* The number of discrete webcam framesizes */
#define VIVID_WEBCAM_SIZES 4 #define VIVID_WEBCAM_SIZES 5
/* 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)
...@@ -73,6 +73,7 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { ...@@ -73,6 +73,7 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = {
{ 640, 360 }, { 640, 360 },
{ 1280, 720 }, { 1280, 720 },
{ 1920, 1080 }, { 1920, 1080 },
{ 3840, 2160 },
}; };
/* /*
...@@ -80,7 +81,9 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { ...@@ -80,7 +81,9 @@ 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, 1 },
{ 1, 2 }, { 1, 2 },
{ 1, 4 },
{ 1, 5 }, { 1, 5 },
{ 1, 10 }, { 1, 10 },
{ 1, 15 }, { 1, 15 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment