diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-09-01 18:34:48 -0300 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-09-01 18:34:48 -0300 |
| commit | efb6ed2c83300645cecca27f8b948d6e0380b52d (patch) | |
| tree | 56a51b1fb7b315a2047d66397a0cda0cbb302e66 /v4l2-apps/test/vbi-test.c | |
| parent | 81ff7db1a41de1a7dab9fc096780f8efbe2c19f4 (diff) | |
| download | mediapointer-dvb-s2-efb6ed2c83300645cecca27f8b948d6e0380b52d.tar.gz mediapointer-dvb-s2-efb6ed2c83300645cecca27f8b948d6e0380b52d.tar.bz2 | |
Add cropping support to v4l2-ctl, set buf_type in sliced_vbi_cap query.
From: Hans Verkuil <hverkuil@xs4all.nl>
VIDIOC_S/G_CROP is now handled by v4l2-ctl. The v4l2_buf_type is now filled in
in VIDIOC_G_SLICED_VBI_CAP. Several test tools now compile when v4l1 API is
disabled.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l2-apps/test/vbi-test.c')
| -rw-r--r-- | v4l2-apps/test/vbi-test.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/v4l2-apps/test/vbi-test.c b/v4l2-apps/test/vbi-test.c index c1a141bff..febd86d43 100644 --- a/v4l2-apps/test/vbi-test.c +++ b/v4l2-apps/test/vbi-test.c @@ -29,8 +29,10 @@ /* All possible parameters used on v4l ioctls */ union v4l_parms { +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* V4L1 structs */ struct vbi_format v1; +#endif /* V4L2 structs */ struct v4l2_format v2; @@ -38,9 +40,11 @@ union v4l_parms { /* All defined ioctls */ int ioctls[] = { +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* V4L ioctls */ VIDIOCGVBIFMT,/* struct vbi_format */ +#endif /* V4L2 ioctls */ @@ -61,6 +65,7 @@ int main (void) } +#ifdef CONFIG_VIDEO_V4L1_COMPAT /* V4L1 call */ memset(&p,0,sizeof(p)); ret=ioctl(fd,VIDIOCGVBIFMT, (void *) &p); @@ -69,6 +74,7 @@ int main (void) "sample_format=%d, start=%d/%d, count=%d/%d, flags=%d\n", ret, p.v1.sampling_rate,p.v1.samples_per_line, p.v1.sample_format, p.v1.start[0],p.v1.start[1],p.v1.count[0],p.v1.count[1],p.v1.flags); +#endif /* V4L2 call */ |