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

Commit 419ac5d4 authored by Michael Schimek's avatar Michael Schimek Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4001): Cx88 NTSC VBI fixes 



VBI (Closed Caption, CC) capturing never worked in NTSC mode with the
cx88 driver.
They were tested with libzvbi and a patched version of tvtime.

Signed-off-by: default avatarMichael H. Schimek <mschimek@gmx.at>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 7f2c8a9c

drivers/media/video/cx88/cx88-core.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static unsigned int inline norm_htotal(struct cx88_tvnorm *norm) 


static unsigned int inline norm_vbipack(struct cx88_tvnorm *norm)

{

	return (norm->id & V4L2_STD_625_50) ? 511 : 288;

	return (norm->id & V4L2_STD_625_50) ? 511 : 400;

}



int cx88_set_scale(struct cx88_core *core, unsigned int width, unsigned int height,

drivers/media/video/cx88/cx88-vbi.c

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f) 
	if (dev->core->tvnorm->id & V4L2_STD_525_60) {

		/* ntsc */

		f->fmt.vbi.sampling_rate = 28636363;

		f->fmt.vbi.start[0] = 10 -1;

		f->fmt.vbi.start[1] = 273 -1;

		f->fmt.vbi.start[0] = 10;

		f->fmt.vbi.start[1] = 273;



	} else if (dev->core->tvnorm->id & V4L2_STD_625_50) {

		/* pal */

drivers/media/video/cx88/cx88.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


#include <linux/version.h>

#include <linux/mutex.h>

#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)

#define CX88_VERSION_CODE KERNEL_VERSION(0,0,6)



#ifndef TRUE

# define TRUE (1==1)