mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-06 01:06:41 +07:00
[media] cx231xx: fix vbi compliance issues
Various v4l2-compliance fixes: remove unused sliced VBI functions, zero the reserved fields of struct v4l2_vbi_format and implement the missing s_fmt_vbi_cap. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
0752d98e1a
commit
6264722c12
@ -1868,47 +1868,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Sliced VBI ioctls */
|
||||
static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct cx231xx_fh *fh = priv;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
int rc;
|
||||
|
||||
rc = check_dev(dev);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
f->fmt.sliced.service_set = 0;
|
||||
|
||||
call_all(dev, vbi, g_sliced_fmt, &f->fmt.sliced);
|
||||
|
||||
if (f->fmt.sliced.service_set == 0)
|
||||
rc = -EINVAL;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct cx231xx_fh *fh = priv;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
int rc;
|
||||
|
||||
rc = check_dev(dev);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
call_all(dev, vbi, g_sliced_fmt, &f->fmt.sliced);
|
||||
|
||||
if (f->fmt.sliced.service_set == 0)
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* RAW VBI ioctls */
|
||||
|
||||
static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
|
||||
@ -1916,6 +1875,7 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
|
||||
{
|
||||
struct cx231xx_fh *fh = priv;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
|
||||
f->fmt.vbi.sampling_rate = 6750000 * 4;
|
||||
f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
|
||||
f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
|
||||
@ -1927,6 +1887,7 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
|
||||
f->fmt.vbi.start[1] = (dev->norm & V4L2_STD_625_50) ?
|
||||
PAL_VBI_START_LINE + 312 : NTSC_VBI_START_LINE + 263;
|
||||
f->fmt.vbi.count[1] = f->fmt.vbi.count[0];
|
||||
memset(f->fmt.vbi.reserved, 0, sizeof(f->fmt.vbi.reserved));
|
||||
|
||||
return 0;
|
||||
|
||||
@ -1938,12 +1899,6 @@ static int vidioc_try_fmt_vbi_cap(struct file *file, void *priv,
|
||||
struct cx231xx_fh *fh = priv;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
|
||||
if (dev->vbi_stream_on && !fh->stream_on) {
|
||||
cx231xx_errdev("%s device in use by another fh\n", __func__);
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
f->type = V4L2_BUF_TYPE_VBI_CAPTURE;
|
||||
f->fmt.vbi.sampling_rate = 6750000 * 4;
|
||||
f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
|
||||
f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
|
||||
@ -1956,11 +1911,25 @@ static int vidioc_try_fmt_vbi_cap(struct file *file, void *priv,
|
||||
f->fmt.vbi.start[1] = (dev->norm & V4L2_STD_625_50) ?
|
||||
PAL_VBI_START_LINE + 312 : NTSC_VBI_START_LINE + 263;
|
||||
f->fmt.vbi.count[1] = f->fmt.vbi.count[0];
|
||||
memset(f->fmt.vbi.reserved, 0, sizeof(f->fmt.vbi.reserved));
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
|
||||
struct v4l2_format *f)
|
||||
{
|
||||
struct cx231xx_fh *fh = priv;
|
||||
struct cx231xx *dev = fh->dev;
|
||||
|
||||
if (dev->vbi_stream_on && !fh->stream_on) {
|
||||
cx231xx_errdev("%s device in use by another fh\n", __func__);
|
||||
return -EBUSY;
|
||||
}
|
||||
return vidioc_try_fmt_vbi_cap(file, priv, f);
|
||||
}
|
||||
|
||||
static int vidioc_reqbufs(struct file *file, void *priv,
|
||||
struct v4l2_requestbuffers *rb)
|
||||
{
|
||||
@ -2422,10 +2391,8 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
|
||||
.vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap,
|
||||
.vidioc_g_fmt_vbi_cap = vidioc_g_fmt_vbi_cap,
|
||||
.vidioc_try_fmt_vbi_cap = vidioc_try_fmt_vbi_cap,
|
||||
.vidioc_s_fmt_vbi_cap = vidioc_try_fmt_vbi_cap,
|
||||
.vidioc_s_fmt_vbi_cap = vidioc_s_fmt_vbi_cap,
|
||||
.vidioc_cropcap = vidioc_cropcap,
|
||||
.vidioc_g_fmt_sliced_vbi_cap = vidioc_g_fmt_sliced_vbi_cap,
|
||||
.vidioc_try_fmt_sliced_vbi_cap = vidioc_try_set_sliced_vbi_cap,
|
||||
.vidioc_reqbufs = vidioc_reqbufs,
|
||||
.vidioc_querybuf = vidioc_querybuf,
|
||||
.vidioc_qbuf = vidioc_qbuf,
|
||||
|
Loading…
Reference in New Issue
Block a user