diff options
| author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2016-12-15 23:17:57 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-01-30 15:42:04 -0200 |
| commit | 6ab1a322dcafc2de6a2f9a5f876e661b4457d0c9 (patch) | |
| tree | ec4a7156fb77b37563b6b638a1d681c274d5c86e /drivers/media/platform | |
| parent | fc2cc75a20b7bb058e095b56c58f5075b9fc0f2e (diff) | |
| download | linux-6ab1a322dcafc2de6a2f9a5f876e661b4457d0c9.tar.gz linux-6ab1a322dcafc2de6a2f9a5f876e661b4457d0c9.tar.bz2 linux-6ab1a322dcafc2de6a2f9a5f876e661b4457d0c9.zip | |
[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: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-cap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c index c52dd8787794..a18e6fec219b 100644 --- a/drivers/media/platform/vivid/vivid-vid-cap.c +++ b/drivers/media/platform/vivid/vivid-vid-cap.c @@ -63,7 +63,7 @@ static const struct vivid_fmt formats_ovl[] = { }; /* The number of discrete webcam framesizes */ -#define VIVID_WEBCAM_SIZES 4 +#define VIVID_WEBCAM_SIZES 5 /* The number of discrete webcam frameintervals */ #define VIVID_WEBCAM_IVALS (VIVID_WEBCAM_SIZES * 2) @@ -73,6 +73,7 @@ static const struct v4l2_frmsize_discrete webcam_sizes[VIVID_WEBCAM_SIZES] = { { 640, 360 }, { 1280, 720 }, { 1920, 1080 }, + { 3840, 2160 }, }; /* @@ -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. */ static const struct v4l2_fract webcam_intervals[VIVID_WEBCAM_IVALS] = { + { 1, 1 }, { 1, 2 }, + { 1, 4 }, { 1, 5 }, { 1, 10 }, { 1, 15 }, |