lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: saa7127: support new vbi ops to set/get VBI format

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2010-03-14 10:54:47 -03:00
committed by Mauro Carvalho Chehab
parent 1585927de6
commit 1dbf85397a
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/media/video/saa7127.c
View File

@@ -625,29 +625,33 @@ static int saa7127_s_stream(struct v4l2_subdev *sd, int enable)
return saa7127_set_video_enable(sd, enable); return saa7127_set_video_enable(sd, enable);
} }
static int saa7127_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt) static int saa7127_g_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_format *fmt)
{ {
struct saa7127_state *state = to_state(sd); struct saa7127_state *state = to_state(sd);
if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE) memset(fmt, 0, sizeof(*fmt));
return -EINVAL;
memset(&fmt->fmt.sliced, 0, sizeof(fmt->fmt.sliced));
if (state->vps_enable) if (state->vps_enable)
fmt->fmt.sliced.service_lines[0][16] = V4L2_SLICED_VPS; fmt->service_lines[0][16] = V4L2_SLICED_VPS;
if (state->wss_enable) if (state->wss_enable)
fmt->fmt.sliced.service_lines[0][23] = V4L2_SLICED_WSS_625; fmt->service_lines[0][23] = V4L2_SLICED_WSS_625;
if (state->cc_enable) { if (state->cc_enable) {
fmt->fmt.sliced.service_lines[0][21] = V4L2_SLICED_CAPTION_525; fmt->service_lines[0][21] = V4L2_SLICED_CAPTION_525;
fmt->fmt.sliced.service_lines[1][21] = V4L2_SLICED_CAPTION_525; fmt->service_lines[1][21] = V4L2_SLICED_CAPTION_525;
} }
fmt->fmt.sliced.service_set = fmt->service_set =
(state->vps_enable ? V4L2_SLICED_VPS : 0) | (state->vps_enable ? V4L2_SLICED_VPS : 0) |
(state->wss_enable ? V4L2_SLICED_WSS_625 : 0) | (state->wss_enable ? V4L2_SLICED_WSS_625 : 0) |
(state->cc_enable ? V4L2_SLICED_CAPTION_525 : 0); (state->cc_enable ? V4L2_SLICED_CAPTION_525 : 0);
return 0; return 0;
} }
static int saa7127_g_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
{
if (fmt->type != V4L2_BUF_TYPE_SLICED_VBI_CAPTURE)
return -EINVAL;
return saa7127_g_sliced_fmt(sd, &fmt->fmt.sliced);
}
static int saa7127_s_vbi_data(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *data) static int saa7127_s_vbi_data(struct v4l2_subdev *sd, const struct v4l2_sliced_vbi_data *data)
{ {
switch (data->id) { switch (data->id) {
@@ -735,6 +739,7 @@ static const struct v4l2_subdev_video_ops saa7127_video_ops = {
static const struct v4l2_subdev_vbi_ops saa7127_vbi_ops = { static const struct v4l2_subdev_vbi_ops saa7127_vbi_ops = {
.s_vbi_data = saa7127_s_vbi_data, .s_vbi_data = saa7127_s_vbi_data,
.g_sliced_fmt = saa7127_g_sliced_fmt,
}; };
static const struct v4l2_subdev_ops saa7127_ops = { static const struct v4l2_subdev_ops saa7127_ops = {