On 10/09/18 15:43, Keiichi Watanabe wrote:
> Support 640x480 as a frame size for video input devices of vivid.
>
> Signed-off-by: Keiichi Watanabe <keiichiw@xxxxxxxxxxxx>
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Regards,
Hans
> ---
> drivers/media/platform/vivid/vivid-vid-cap.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
> index 58e14dd1dcd3..6cf910a60ecf 100644
> --- a/drivers/media/platform/vivid/vivid-vid-cap.c
> +++ b/drivers/media/platform/vivid/vivid-vid-cap.c
> @@ -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 },
> };
>
