diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-20 11:10:31 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-20 11:10:31 -0300 |
| commit | 638acf07e1921e20c61cd6fa47effac3dd17960b (patch) | |
| tree | 25d9ef804621434a97f1c710f8013b64713712f5 /v4l2-apps/util/v4l2-ctl.cpp | |
| parent | 231c6131d555f40b849f0e7332b9f90a2568145a (diff) | |
| parent | e9f3de679c696aca2da479114ffac7389e0196e1 (diff) | |
| download | mediapointer-dvb-s2-638acf07e1921e20c61cd6fa47effac3dd17960b.tar.gz mediapointer-dvb-s2-638acf07e1921e20c61cd6fa47effac3dd17960b.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/v4l2-ctl.cpp')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index fda6eec48..4cee687bb 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -117,6 +117,7 @@ enum Option { OptGetOutputCropCap, OptGetOverlayCropCap, OptGetOutputOverlayCropCap, + OptOverlay, OptLast = 256 }; @@ -226,6 +227,7 @@ static struct option long_options[] = { {"get-cropcap-output-overlay", no_argument, 0, OptGetOutputOverlayCropCap}, {"get-crop-output-overlay", no_argument, 0, OptGetOutputOverlayCrop}, {"set-crop-output-overlay", required_argument, 0, OptSetOutputOverlayCrop}, + {"overlay", required_argument, 0, OptOverlay}, {0, 0, 0, 0} }; @@ -317,6 +319,7 @@ static void usage(void) printf(" vps: VPS (PAL/SECAM)\n"); printf(" --get-fmt-vbi query the VBI capture format [VIDIOC_G_FMT]\n"); printf(" --get-fmt-vbi-out query the VBI output format [VIDIOC_G_FMT]\n"); + printf(" --overlay=<on> turn overlay on (1) or off (0) (VIDIOC_OVERLAY)\n"); printf(" --get-fbuf query the overlay framebuffer data [VIDIOC_G_FBUF]\n"); printf(" --set-fbuf=chromakey=<0/1>,global_alpha=<0/1>,local_alpha=<0/1>,local_inv_alpha=<0/1>\n"); printf(" set the overlay framebuffer [VIDIOC_S_FBUF]\n"); @@ -1166,6 +1169,7 @@ int main(int argc, char **argv) double freq = 0; /* get/set frequency */ struct v4l2_frequency vf; /* get_freq/set_freq */ struct v4l2_standard vs; /* list_std */ + int overlay; /* overlay */ char short_options[26 * 2 * 2 + 1]; int idx = 0; @@ -1317,6 +1321,9 @@ int main(int argc, char **argv) } } break; + case OptOverlay: + overlay = strtol(optarg, 0L, 0); + break; case OptSetCrop: parse_crop(optarg, set_crop, vcrop); break; @@ -1692,6 +1699,10 @@ int main(int argc, char **argv) } } + if (options[OptOverlay]) { + doioctl(fd, VIDIOC_OVERLAY, &overlay, "VIDIOC_OVERLAY"); + } + if (options[OptSetCrop]) { do_crop(fd, set_crop, vcrop, V4L2_BUF_TYPE_VIDEO_CAPTURE); } |