tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] v4l: saa7134 ntsc vbi fix

This patch fixes NTSC VBI capturing in the saa7134 driver.

Signed-off-by: Michael H. Schimek <mschimek@gmx.at>
Cc: <video4linux-list@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Michael Schimek and committed by
Linus Torvalds f246a817 93b43f13

+33 -29
unified split
+6 -6
drivers/media/video/saa7134/saa7134-vbi.c
··· 60 60 saa_writeb(SAA7134_VBI_H_START2(task), norm->h_start >> 8); 61 61 saa_writeb(SAA7134_VBI_H_STOP1(task), norm->h_stop & 0xff); 62 62 saa_writeb(SAA7134_VBI_H_STOP2(task), norm->h_stop >> 8); 63 - saa_writeb(SAA7134_VBI_V_START1(task), norm->vbi_v_start & 0xff); 64 - saa_writeb(SAA7134_VBI_V_START2(task), norm->vbi_v_start >> 8); 65 - saa_writeb(SAA7134_VBI_V_STOP1(task), norm->vbi_v_stop & 0xff); 66 - saa_writeb(SAA7134_VBI_V_STOP2(task), norm->vbi_v_stop >> 8); 63 + saa_writeb(SAA7134_VBI_V_START1(task), norm->vbi_v_start_0 & 0xff); 64 + saa_writeb(SAA7134_VBI_V_START2(task), norm->vbi_v_start_0 >> 8); 65 + saa_writeb(SAA7134_VBI_V_STOP1(task), norm->vbi_v_stop_0 & 0xff); 66 + saa_writeb(SAA7134_VBI_V_STOP2(task), norm->vbi_v_stop_0 >> 8); 67 67 68 68 saa_writeb(SAA7134_VBI_H_SCALE_INC1(task), VBI_SCALE & 0xff); 69 69 saa_writeb(SAA7134_VBI_H_SCALE_INC2(task), VBI_SCALE >> 8); ··· 127 127 unsigned int lines, llength, size; 128 128 int err; 129 129 130 - lines = norm->vbi_v_stop - norm->vbi_v_start +1; 130 + lines = norm->vbi_v_stop_0 - norm->vbi_v_start_0 +1; 131 131 if (lines > VBI_LINE_COUNT) 132 132 lines = VBI_LINE_COUNT; 133 133 #if 1 ··· 177 177 struct saa7134_dev *dev = fh->dev; 178 178 int llength,lines; 179 179 180 - lines = dev->tvnorm->vbi_v_stop - dev->tvnorm->vbi_v_start +1; 180 + lines = dev->tvnorm->vbi_v_stop_0 - dev->tvnorm->vbi_v_start_0 +1; 181 181 #if 1 182 182 llength = VBI_LINE_LENGTH; 183 183 #else
+23 -20
drivers/media/video/saa7134/saa7134-video.c
··· 158 158 .h_stop = 719, \ 159 159 .video_v_start = 24, \ 160 160 .video_v_stop = 311, \ 161 - .vbi_v_start = 7, \ 162 - .vbi_v_stop = 22, \ 161 + .vbi_v_start_0 = 7, \ 162 + .vbi_v_stop_0 = 22, \ 163 + .vbi_v_start_1 = 319, \ 163 164 .src_timing = 4 164 165 165 166 #define NORM_525_60 \ 166 167 .h_start = 0, \ 167 168 .h_stop = 703, \ 168 - .video_v_start = 22, \ 169 - .video_v_stop = 22+239, \ 170 - .vbi_v_start = 10, /* FIXME */ \ 171 - .vbi_v_stop = 21, /* FIXME */ \ 172 - .src_timing = 1 169 + .video_v_start = 23, \ 170 + .video_v_stop = 262, \ 171 + .vbi_v_start_0 = 10, \ 172 + .vbi_v_stop_0 = 21, \ 173 + .vbi_v_start_1 = 273, \ 174 + .src_timing = 7 173 175 174 176 static struct saa7134_tvnorm tvnorms[] = { 175 177 { ··· 276 274 277 275 .h_start = 0, 278 276 .h_stop = 719, 279 - .video_v_start = 22, 280 - .video_v_stop = 22+239, 281 - .vbi_v_start = 10, /* FIXME */ 282 - .vbi_v_stop = 21, /* FIXME */ 283 - .src_timing = 1, 277 + .video_v_start = 23, 278 + .video_v_stop = 262, 279 + .vbi_v_start_0 = 10, 280 + .vbi_v_stop_0 = 21, 281 + .vbi_v_start_1 = 273, 282 + .src_timing = 7, 284 283 285 284 .sync_control = 0x18, 286 285 .luma_control = 0x40, ··· 338 335 .default_value = 0, 339 336 .type = V4L2_CTRL_TYPE_INTEGER, 340 337 },{ 341 - .id = V4L2_CID_VFLIP, 342 - .name = "vertical flip", 338 + .id = V4L2_CID_HFLIP, 339 + .name = "Mirror", 343 340 .minimum = 0, 344 341 .maximum = 1, 345 342 .type = V4L2_CTRL_TYPE_BOOLEAN, ··· 485 482 dev->crop_bounds.width = norm->h_stop - norm->h_start +1; 486 483 dev->crop_defrect.width = norm->h_stop - norm->h_start +1; 487 484 488 - dev->crop_bounds.top = (norm->vbi_v_stop+1)*2; 485 + dev->crop_bounds.top = (norm->vbi_v_stop_0+1)*2; 489 486 dev->crop_defrect.top = norm->video_v_start*2; 490 487 dev->crop_bounds.height = ((norm->id & V4L2_STD_525_60) ? 524 : 624) 491 488 - dev->crop_bounds.top; ··· 1067 1064 case V4L2_CID_PRIVATE_INVERT: 1068 1065 c->value = dev->ctl_invert; 1069 1066 break; 1070 - case V4L2_CID_VFLIP: 1067 + case V4L2_CID_HFLIP: 1071 1068 c->value = dev->ctl_mirror; 1072 1069 break; 1073 1070 case V4L2_CID_PRIVATE_Y_EVEN: ··· 1142 1139 saa_writeb(SAA7134_DEC_CHROMA_SATURATION, 1143 1140 dev->ctl_invert ? -dev->ctl_saturation : dev->ctl_saturation); 1144 1141 break; 1145 - case V4L2_CID_VFLIP: 1142 + case V4L2_CID_HFLIP: 1146 1143 dev->ctl_mirror = c->value; 1147 1144 restart_overlay = 1; 1148 1145 break; ··· 1410 1407 f->fmt.vbi.samples_per_line = 2048 /* VBI_LINE_LENGTH */; 1411 1408 f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY; 1412 1409 f->fmt.vbi.offset = 64 * 4; 1413 - f->fmt.vbi.start[0] = norm->vbi_v_start; 1414 - f->fmt.vbi.count[0] = norm->vbi_v_stop - norm->vbi_v_start +1; 1415 - f->fmt.vbi.start[1] = norm->video_v_stop + norm->vbi_v_start +1; 1410 + f->fmt.vbi.start[0] = norm->vbi_v_start_0; 1411 + f->fmt.vbi.count[0] = norm->vbi_v_stop_0 - norm->vbi_v_start_0 +1; 1412 + f->fmt.vbi.start[1] = norm->vbi_v_start_1; 1416 1413 f->fmt.vbi.count[1] = f->fmt.vbi.count[0]; 1417 1414 f->fmt.vbi.flags = 0; /* VBI_UNSYNC VBI_INTERLACED */ 1418 1415
+4 -3
drivers/media/video/saa7134/saa7134.h
··· 21 21 */ 22 22 23 23 #include <linux/version.h> 24 - #define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,12) 24 + #define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,13) 25 25 26 26 #include <linux/pci.h> 27 27 #include <linux/i2c.h> ··· 91 91 unsigned int h_stop; 92 92 unsigned int video_v_start; 93 93 unsigned int video_v_stop; 94 - unsigned int vbi_v_start; 95 - unsigned int vbi_v_stop; 94 + unsigned int vbi_v_start_0; 95 + unsigned int vbi_v_stop_0; 96 96 unsigned int src_timing; 97 + unsigned int vbi_v_start_1; 97 98 }; 98 99 99 100 struct saa7134_tvaudio {