From efb6ed2c83300645cecca27f8b948d6e0380b52d Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 1 Sep 2006 18:34:48 -0300 Subject: Add cropping support to v4l2-ctl, set buf_type in sliced_vbi_cap query. From: Hans Verkuil 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 --- v4l2-apps/test/vbi-test.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'v4l2-apps/test/vbi-test.c') 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 */ -- cgit v1.2.3