Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adc0356e authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: Fix VBI parameters for sampling rate and offset 



The VBI sampling rate and offset were incorrectly specified, which resulted in
CC data not being rendered under zvbi or tvtime.

Set the fields correctly.

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dd067a8d

drivers/media/video/cx231xx/cx231xx-video.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -2020,12 +2020,10 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv, 
{

{

	struct cx231xx_fh *fh = priv;

	struct cx231xx_fh *fh = priv;

	struct cx231xx *dev = fh->dev;

	struct cx231xx *dev = fh->dev;



	f->fmt.vbi.sampling_rate = 6750000 * 4;

	f->fmt.vbi.sampling_rate = (dev->norm & V4L2_STD_625_50) ?

	    35468950 : 28636363;

	f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;

	f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;

	f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;

	f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;

	f->fmt.vbi.offset = 64 * 4;

	f->fmt.vbi.offset = 0;

	f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?

	f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?

	    PAL_VBI_START_LINE : NTSC_VBI_START_LINE;

	    PAL_VBI_START_LINE : NTSC_VBI_START_LINE;

	f->fmt.vbi.count[0] = (dev->norm & V4L2_STD_625_50) ?

	f->fmt.vbi.count[0] = (dev->norm & V4L2_STD_625_50) ?
@@ -2050,11 +2048,10 @@ static int vidioc_try_fmt_vbi_cap(struct file *file, void *priv, 
	}

	}





	f->type = V4L2_BUF_TYPE_VBI_CAPTURE;

	f->type = V4L2_BUF_TYPE_VBI_CAPTURE;

	f->fmt.vbi.sampling_rate = (dev->norm & V4L2_STD_625_50) ?

	f->fmt.vbi.sampling_rate = 6750000 * 4;

	    35468950 : 28636363;

	f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;

	f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;

	f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;

	f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;

	f->fmt.vbi.offset = 244;

	f->fmt.vbi.offset = 0;

	f->fmt.vbi.flags = 0;

	f->fmt.vbi.flags = 0;

	f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?

	f->fmt.vbi.start[0] = (dev->norm & V4L2_STD_625_50) ?

	    PAL_VBI_START_LINE : NTSC_VBI_START_LINE;

	    PAL_VBI_START_LINE : NTSC_VBI_START_LINE;