diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-29 16:02:51 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:56:04 -0400 |
| commit | 9bc7400a9d01b1fe05c7f0200e7384e17794f6e4 (patch) | |
| tree | 7dad2e13853c3ba7c2e913e2ee40229b1474155a /include | |
| parent | 2868c41fc45399b0f0855eb760e1a81881ff0c3d (diff) | |
V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
The sliced VBI defines added in videodev2.h are removed since requires
more discussion.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/videodev2.h | 65 |
1 files changed, 8 insertions, 57 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index af2d6155d3fe..d7670ec1ec1e 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -966,66 +966,17 @@ struct v4l2_sliced_vbi_format | |||
| 966 | 966 | ||
| 967 | /* Teletext World System Teletext | 967 | /* Teletext World System Teletext |
| 968 | (WST), defined on ITU-R BT.653-2 */ | 968 | (WST), defined on ITU-R BT.653-2 */ |
| 969 | #define V4L2_SLICED_TELETEXT_PAL_B (0x000001) | 969 | #define V4L2_SLICED_TELETEXT_B (0x0001) |
| 970 | #define V4L2_SLICED_TELETEXT_PAL_C (0x000002) | ||
| 971 | #define V4L2_SLICED_TELETEXT_NTSC_B (0x000010) | ||
| 972 | #define V4L2_SLICED_TELETEXT_SECAM (0x000020) | ||
| 973 | |||
| 974 | /* Teletext North American Broadcast Teletext Specification | ||
| 975 | (NABTS), defined on ITU-R BT.653-2 */ | ||
| 976 | #define V4L2_SLICED_TELETEXT_NTSC_C (0x000040) | ||
| 977 | #define V4L2_SLICED_TELETEXT_NTSC_D (0x000080) | ||
| 978 | |||
| 979 | /* Video Program System, defined on ETS 300 231*/ | 970 | /* Video Program System, defined on ETS 300 231*/ |
| 980 | #define V4L2_SLICED_VPS (0x000400) | 971 | #define V4L2_SLICED_VPS (0x0400) |
| 981 | |||
| 982 | /* Closed Caption, defined on EIA-608 */ | 972 | /* Closed Caption, defined on EIA-608 */ |
| 983 | #define V4L2_SLICED_CAPTION_525 (0x001000) | 973 | #define V4L2_SLICED_CAPTION_525 (0x1000) |
| 984 | #define V4L2_SLICED_CAPTION_625 (0x002000) | ||
| 985 | |||
| 986 | /* Wide Screen System, defined on ITU-R BT1119.1 */ | 974 | /* Wide Screen System, defined on ITU-R BT1119.1 */ |
| 987 | #define V4L2_SLICED_WSS_625 (0x004000) | 975 | #define V4L2_SLICED_WSS_625 (0x4000) |
| 988 | 976 | ||
| 989 | /* Wide Screen System, defined on IEC 61880 */ | 977 | #define V4L2_SLICED_VBI_525 (V4L2_SLICED_CAPTION_525) |
| 990 | #define V4L2_SLICED_WSS_525 (0x008000) | 978 | #define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625) |
| 991 | 979 | ||
| 992 | /* Vertical Interval Timecode (VITC), defined on SMPTE 12M */ | ||
| 993 | #define V4l2_SLICED_VITC_625 (0x010000) | ||
| 994 | #define V4l2_SLICED_VITC_525 (0x020000) | ||
| 995 | |||
| 996 | #define V4L2_SLICED_TELETEXT_B (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 997 | V4L2_SLICED_TELETEXT_NTSC_B) | ||
| 998 | |||
| 999 | #define V4L2_SLICED_TELETEXT (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 1000 | V4L2_SLICED_TELETEXT_PAL_C |\ | ||
| 1001 | V4L2_SLICED_TELETEXT_SECAM |\ | ||
| 1002 | V4L2_SLICED_TELETEXT_NTSC_B |\ | ||
| 1003 | V4L2_SLICED_TELETEXT_NTSC_C |\ | ||
| 1004 | V4L2_SLICED_TELETEXT_NTSC_D) | ||
| 1005 | |||
| 1006 | #define V4L2_SLICED_CAPTION (V4L2_SLICED_CAPTION_525 |\ | ||
| 1007 | V4L2_SLICED_CAPTION_625) | ||
| 1008 | |||
| 1009 | #define V4L2_SLICED_WSS (V4L2_SLICED_WSS_525 |\ | ||
| 1010 | V4L2_SLICED_WSS_625) | ||
| 1011 | |||
| 1012 | #define V4L2_SLICED_VITC (V4L2_SLICED_VITC_525 |\ | ||
| 1013 | V4L2_SLICED_VITC_625) | ||
| 1014 | |||
| 1015 | #define V4L2_SLICED_VBI_525 (V4L2_SLICED_TELETEXT_NTSC_B |\ | ||
| 1016 | V4L2_SLICED_TELETEXT_NTSC_C |\ | ||
| 1017 | V4L2_SLICED_TELETEXT_NTSC_D |\ | ||
| 1018 | V4L2_SLICED_CAPTION_525 |\ | ||
| 1019 | V4L2_SLICED_WSS_525 |\ | ||
| 1020 | V4l2_SLICED_VITC_525) | ||
| 1021 | |||
| 1022 | #define V4L2_SLICED_VBI_625 (V4L2_SLICED_TELETEXT_PAL_B |\ | ||
| 1023 | V4L2_SLICED_TELETEXT_PAL_C |\ | ||
| 1024 | V4L2_SLICED_TELETEXT_SECAM |\ | ||
| 1025 | V4L2_SLICED_VPS |\ | ||
| 1026 | V4L2_SLICED_CAPTION_625 |\ | ||
| 1027 | V4L2_SLICED_WSS_625 |\ | ||
| 1028 | V4l2_SLICED_VITC_625) | ||
| 1029 | 980 | ||
| 1030 | struct v4l2_sliced_vbi_cap | 981 | struct v4l2_sliced_vbi_cap |
| 1031 | { | 982 | { |