summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMichael Hunold <devnull@localhost>2003-06-26 09:46:24 +0000
committerMichael Hunold <devnull@localhost>2003-06-26 09:46:24 +0000
commit0c3fd11f85e7be94f4d388e5d93c83c4646055c1 (patch)
treee7e68be5b811a436ea1813e3a89daf3c021632c6 /linux/include
parent22dcd452c5380c304677847cfd871c67d056d029 (diff)
downloadmediapointer-dvb-s2-0c3fd11f85e7be94f4d388e5d93c83c4646055c1.tar.gz
mediapointer-dvb-s2-0c3fd11f85e7be94f4d388e5d93c83c4646055c1.tar.bz2
- fix usage of "v4l2_common_std()" from v4l2-common.c in saa7146_video.c
- change saa7146_vv.h the way described earlier - follow these changes in budget-av and hexium driver
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/saa7146_vv.h41
1 files changed, 6 insertions, 35 deletions
diff --git a/linux/include/media/saa7146_vv.h b/linux/include/media/saa7146_vv.h
index 9637dd259..2868ad089 100644
--- a/linux/include/media/saa7146_vv.h
+++ b/linux/include/media/saa7146_vv.h
@@ -39,13 +39,13 @@ struct saa7146_standard
char *name;
v4l2_std_id id;
- int v_offset;
- int v_field;
- int v_calc;
+ int v_offset; /* number of lines of vertical offset before processing */
+ int v_field; /* number of lines in a field for HPS to process */
+ int v_calc; /* number of vertical active lines */
- int h_offset;
- int h_pixels;
- int h_calc;
+ int h_offset; /* horizontal offset of processing window */
+ int h_pixels; /* number of horizontal pixels to process */
+ int h_calc; /* number of horizontal active pixels */
int v_max_out;
int h_max_out;
@@ -215,35 +215,6 @@ extern struct saa7146_use_ops saa7146_vbi_uops;
#define SAA7146_HPS_SYNC_PORT_A 0x00
#define SAA7146_HPS_SYNC_PORT_B 0x01
-/* number of vertical active lines */
-#define V_ACTIVE_LINES_PAL 576
-#define V_ACTIVE_LINES_NTSC 480
-#define V_ACTIVE_LINES_SECAM 576
-
-/* number of lines in a field for HPS to process */
-#define V_FIELD_PAL 288
-#define V_FIELD_NTSC 240
-#define V_FIELD_SECAM 288
-
-/* number of lines of vertical offset before processing */
-#define V_OFFSET_PAL 0x17
-#define V_OFFSET_NTSC 0x16
-#define V_OFFSET_SECAM 0x14
-
-/* number of horizontal pixels to process */
-#define H_PIXELS_PAL 680
-#define H_PIXELS_NTSC 708
-#define H_PIXELS_SECAM 720
-
-/* horizontal offset of processing window */
-#define H_OFFSET_PAL 0x14
-#define H_OFFSET_NTSC 0x06
-#define H_OFFSET_SECAM 0x14
-
-#define SAA7146_PAL_VALUES V_OFFSET_PAL, V_FIELD_PAL, V_ACTIVE_LINES_PAL, H_OFFSET_PAL, H_PIXELS_PAL, H_PIXELS_PAL+1, V_ACTIVE_LINES_PAL, 768
-#define SAA7146_NTSC_VALUES V_OFFSET_NTSC, V_FIELD_NTSC, V_ACTIVE_LINES_NTSC, H_OFFSET_NTSC, H_PIXELS_NTSC, H_PIXELS_NTSC+1, V_ACTIVE_LINES_NTSC, 640
-#define SAA7146_SECAM_VALUES V_OFFSET_SECAM, V_FIELD_SECAM, V_ACTIVE_LINES_SECAM, H_OFFSET_SECAM, H_PIXELS_SECAM, H_PIXELS_SECAM+1, V_ACTIVE_LINES_SECAM, 768
-
/* some memory sizes */
#define SAA7146_CLIPPING_MEM (14*PAGE_SIZE)