diff options
| author | Hans Verkuil | 2006-06-24 19:36:02 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2006-06-26 14:21:45 +0200 |
| commit | 8cbde94be34f95c01515ba19ce32bcd51ab3949e (patch) | |
| tree | f01514f3cf11dcada4d9e9e68708c0292ebb7fcf /include | |
| parent | V4L/DVB (4222): Always switch tuner mode when calling VIDIOC_S_FREQUENCY. (diff) | |
| download | kernel-qcow2-linux-8cbde94be34f95c01515ba19ce32bcd51ab3949e.tar.gz kernel-qcow2-linux-8cbde94be34f95c01515ba19ce32bcd51ab3949e.tar.xz kernel-qcow2-linux-8cbde94be34f95c01515ba19ce32bcd51ab3949e.zip | |
V4L/DVB (4223): Add V4L2_CID_MPEG_STREAM_VBI_FMT control
V4L2_CID_MPEG_STREAM_VBI_FMT controls if and how VBI data is embedded in
an MPEG stream. Currently only one format is supported: the format designed
for the ivtv driver. This should be extended with new standard formats
(such as defined for DVB) in the future.
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 | 5 | ||||
| -rw-r--r-- | include/media/cx2341x.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 8b4745c5e975..a62673dad76e 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -822,6 +822,11 @@ enum v4l2_mpeg_stream_type { #define V4L2_CID_MPEG_STREAM_PID_PCR (V4L2_CID_MPEG_BASE+4) #define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO (V4L2_CID_MPEG_BASE+5) #define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO (V4L2_CID_MPEG_BASE+6) +#define V4L2_CID_MPEG_STREAM_VBI_FMT (V4L2_CID_MPEG_BASE+7) +enum v4l2_mpeg_stream_vbi_fmt { + V4L2_MPEG_STREAM_VBI_FMT_NONE = 0, /* No VBI in the MPEG stream */ + V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1, /* VBI in private packets, IVTV format */ +}; /* MPEG audio */ #define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (V4L2_CID_MPEG_BASE+100) diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h index 51fb06b4c394..074c4008ad52 100644 --- a/include/media/cx2341x.h +++ b/include/media/cx2341x.h @@ -25,8 +25,13 @@ enum cx2341x_port { CX2341X_PORT_SERIAL = 2 }; +enum cx2341x_cap { + CX2341X_CAP_HAS_SLICED_VBI = 1 << 0, +}; + struct cx2341x_mpeg_params { /* misc */ + u32 capabilities; enum cx2341x_port port; u16 width; u16 height; @@ -34,6 +39,7 @@ struct cx2341x_mpeg_params { /* stream */ enum v4l2_mpeg_stream_type stream_type; + enum v4l2_mpeg_stream_vbi_fmt stream_vbi_fmt; /* audio */ enum v4l2_mpeg_audio_sampling_freq audio_sampling_freq; |