Commit 6f0c460f authored by Jorge Maidana's avatar Jorge Maidana Committed by Mauro Carvalho Chehab
Browse files

media: cx88: Fix PAL-Nc standard 

* Fix PAL-Nc horizontal parameters according to DScaler:
https://github.com/JohnAdders/DScaler/blob/f7d92b76678e/DScaler/TVFormats.cpp#L88-L94


* Add PAL-Nc TV audio support.
* Tested with CVBS and RF on a Pinnacle PCTV HD 800i.

Signed-off-by: default avatarJorge Maidana <jorgem.linux@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent aabcc21d

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

+17 −5
Original line number Diff line number Diff line
@@ -618,12 +618,24 @@ EXPORT_SYMBOL(cx88_reset); 


static inline unsigned int norm_swidth(v4l2_std_id norm)

{

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 754 : 922;

	if (norm & (V4L2_STD_NTSC | V4L2_STD_PAL_M))

		return 754;



	if (norm & V4L2_STD_PAL_Nc)

		return 745;



	return 922;

}



static inline unsigned int norm_hdelay(v4l2_std_id norm)

{

	return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 135 : 186;

	if (norm & (V4L2_STD_NTSC | V4L2_STD_PAL_M))

		return 135;



	if (norm & V4L2_STD_PAL_Nc)

		return 149;



	return 186;

}



static inline unsigned int norm_vdelay(v4l2_std_id norm)
@@ -636,7 +648,7 @@ static inline unsigned int norm_fsc8(v4l2_std_id norm) 
	if (norm & V4L2_STD_PAL_M)

		return 28604892;      // 3.575611 MHz



	if (norm & (V4L2_STD_PAL_Nc))

	if (norm & V4L2_STD_PAL_Nc)

		return 28656448;      // 3.582056 MHz



	if (norm & V4L2_STD_NTSC) // All NTSC/M and variants
@@ -841,8 +853,8 @@ static int set_tvaudio(struct cx88_core *core) 
	} else if (V4L2_STD_SECAM_DK & norm) {

		core->tvaudio = WW_DK;



	} else if ((V4L2_STD_NTSC_M & norm) ||

		   (V4L2_STD_PAL_M  & norm)) {

	} else if ((V4L2_STD_NTSC_M | V4L2_STD_PAL_M | V4L2_STD_PAL_Nc) &

		   norm) {

		core->tvaudio = WW_BTSC;



	} else if (V4L2_STD_NTSC_M_JP & norm) {