mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
media: atmel: atmel-isc-base: report frame sizes as full supported range
[ Upstream commit 72802a86e1
]
The ISC supports a full broad range of frame sizes.
Until now, the subdevice was queried for possible frame sizes and these
were reported to the user space.
However, the ISC should not care about which frame sizes the subdev
supports, as long as this frame size is supported.
Thus, report a continuous range from smallest frame size up to the max
resolution.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
2abe6b4589
commit
cec06ce393
1 changed files with 10 additions and 12 deletions
|
@ -1369,14 +1369,12 @@ static int isc_enum_framesizes(struct file *file, void *fh,
|
|||
struct v4l2_frmsizeenum *fsize)
|
||||
{
|
||||
struct isc_device *isc = video_drvdata(file);
|
||||
struct v4l2_subdev_frame_size_enum fse = {
|
||||
.code = isc->config.sd_format->mbus_code,
|
||||
.index = fsize->index,
|
||||
.which = V4L2_SUBDEV_FORMAT_ACTIVE,
|
||||
};
|
||||
int ret = -EINVAL;
|
||||
int i;
|
||||
|
||||
if (fsize->index)
|
||||
return -EINVAL;
|
||||
|
||||
for (i = 0; i < isc->num_user_formats; i++)
|
||||
if (isc->user_formats[i]->fourcc == fsize->pixel_format)
|
||||
ret = 0;
|
||||
|
@ -1388,14 +1386,14 @@ static int isc_enum_framesizes(struct file *file, void *fh,
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = v4l2_subdev_call(isc->current_subdev->sd, pad, enum_frame_size,
|
||||
NULL, &fse);
|
||||
if (ret)
|
||||
return ret;
|
||||
fsize->type = V4L2_FRMSIZE_TYPE_CONTINUOUS;
|
||||
|
||||
fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
|
||||
fsize->discrete.width = fse.max_width;
|
||||
fsize->discrete.height = fse.max_height;
|
||||
fsize->stepwise.min_width = 16;
|
||||
fsize->stepwise.max_width = isc->max_width;
|
||||
fsize->stepwise.min_height = 16;
|
||||
fsize->stepwise.max_height = isc->max_height;
|
||||
fsize->stepwise.step_width = 1;
|
||||
fsize->stepwise.step_height = 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue