merge: http://linuxtv.org/hg/~jfrancois/gspca/

From: Mauro Carvalho Chehab <mchehab@infradead.org>

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 203 insertions, 183 deletions

diff --git a/v4l2-apps/test/capture_example.c b/v4l2-apps/test/capture_example.c
index 7e967e891..a15ef3c09 100644
--- a/v4l2-apps/test/capture_example.c
+++ b/v4l2-apps/test/capture_example.c
@@ -36,22 +36,21 @@ typedef enum {
 } io_method;
 
 struct buffer {
-	void *                  start;
-	size_t                  length;
+	void   *start;
+	size_t  length;
 };
 
-static char *           dev_name        = NULL;
-static io_method        io              = IO_METHOD_MMAP;
-static int              fd              = -1;
-struct buffer *         buffers         = NULL;
-static unsigned int     n_buffers       = 0;
-static int		out_buf		= 0;
+static char            *dev_name;
+static io_method        io = IO_METHOD_MMAP;
+static int              fd = -1;
+struct buffer          *buffers;
+static unsigned int     n_buffers;
+static int		out_buf;
+static int              force_format;
 
 static void errno_exit(const char *s)
 {
-	fprintf(stderr, "%s error %d, %s\n",
-		 s, errno, strerror(errno));
-
+	fprintf(stderr, "%s error %d, %s\n", s, errno, strerror(errno));
 	exit(EXIT_FAILURE);
 }
 
@@ -99,7 +98,6 @@ static int read_frame(void)
 		}
 
 		process_image(buffers[0].start, buffers[0].length);
-
 		break;
 
 	case IO_METHOD_MMAP:
@@ -129,7 +127,6 @@ static int read_frame(void)
 
 		if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
 			errno_exit("VIDIOC_QBUF");
-
 		break;
 
 	case IO_METHOD_USERPTR:
@@ -154,17 +151,16 @@ static int read_frame(void)
 		}
 
 		for (i = 0; i < n_buffers; ++i)
-			if (buf.m.userptr == (unsigned long) buffers[i].start
+			if (buf.m.userptr == (unsigned long)buffers[i].start
 			    && buf.length == buffers[i].length)
 				break;
 
 		assert(i < n_buffers);
 
-		process_image((void *) buf.m.userptr, buf.bytesused);
+		process_image((void *)buf.m.userptr, buf.bytesused);
 
 		if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
 			errno_exit("VIDIOC_QBUF");
-
 		break;
 	}
 
@@ -195,7 +191,6 @@ static void mainloop(void)
 			if (-1 == r) {
 				if (EINTR == errno)
 					continue;
-
 				errno_exit("select");
 			}
 
@@ -206,7 +201,6 @@ static void mainloop(void)
 
 			if (read_frame())
 				break;
-
 			/* EAGAIN - continue select loop. */
 		}
 	}
@@ -224,10 +218,8 @@ static void stop_capturing(void)
 	case IO_METHOD_MMAP:
 	case IO_METHOD_USERPTR:
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
 		if (-1 == xioctl(fd, VIDIOC_STREAMOFF, &type))
 			errno_exit("VIDIOC_STREAMOFF");
-
 		break;
 	}
 }
@@ -247,20 +239,16 @@ static void start_capturing(void)
 			struct v4l2_buffer buf;
 
 			CLEAR(buf);
-
-			buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-			buf.memory      = V4L2_MEMORY_MMAP;
-			buf.index       = i;
+			buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+			buf.memory = V4L2_MEMORY_MMAP;
+			buf.index = i;
 
 			if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
 				errno_exit("VIDIOC_QBUF");
 		}
-
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
 		if (-1 == xioctl(fd, VIDIOC_STREAMON, &type))
 			errno_exit("VIDIOC_STREAMON");
-
 		break;
 
 	case IO_METHOD_USERPTR:
@@ -268,22 +256,18 @@ static void start_capturing(void)
 			struct v4l2_buffer buf;
 
 			CLEAR(buf);
-
-			buf.type        = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-			buf.memory      = V4L2_MEMORY_USERPTR;
-			buf.index       = i;
-			buf.m.userptr   = (unsigned long) buffers[i].start;
-			buf.length      = buffers[i].length;
+			buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+			buf.memory = V4L2_MEMORY_USERPTR;
+			buf.index = i;
+			buf.m.userptr = (unsigned long)buffers[i].start;
+			buf.length = buffers[i].length;
 
 			if (-1 == xioctl(fd, VIDIOC_QBUF, &buf))
 				errno_exit("VIDIOC_QBUF");
 		}
-
 		type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
 		if (-1 == xioctl(fd, VIDIOC_STREAMON, &type))
 			errno_exit("VIDIOC_STREAMON");
-
 		break;
 	}
 }
@@ -336,9 +320,9 @@ static void init_mmap(void)
 
 	CLEAR(req);
 
-	req.count               = 4;
-	req.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	req.memory              = V4L2_MEMORY_MMAP;
+	req.count = 4;
+	req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	req.memory = V4L2_MEMORY_MMAP;
 
 	if (-1 == xioctl(fd, VIDIOC_REQBUFS, &req)) {
 		if (EINVAL == errno) {
@@ -457,7 +441,6 @@ static void init_device(void)
 				 dev_name);
 			exit(EXIT_FAILURE);
 		}
-
 		break;
 
 	case IO_METHOD_MMAP:
@@ -467,7 +450,6 @@ static void init_device(void)
 				 dev_name);
 			exit(EXIT_FAILURE);
 		}
-
 		break;
 	}
 
@@ -500,16 +482,22 @@ static void init_device(void)
 
 	CLEAR(fmt);
 
-	fmt.type                = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	fmt.fmt.pix.width       = 640;
-	fmt.fmt.pix.height      = 480;
-	fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
-	fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
+	fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+	if (force_format) {
+		fmt.fmt.pix.width       = 640;
+		fmt.fmt.pix.height      = 480;
+		fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
+		fmt.fmt.pix.field       = V4L2_FIELD_INTERLACED;
 
-	if (-1 == xioctl(fd, VIDIOC_S_FMT, &fmt))
-		errno_exit("VIDIOC_S_FMT");
+		if (-1 == xioctl(fd, VIDIOC_S_FMT, &fmt))
+			errno_exit("VIDIOC_S_FMT");
 
-	/* Note VIDIOC_S_FMT may change width and height. */
+		/* Note VIDIOC_S_FMT may change width and height. */
+	} else {
+		/* Preserve original settings as set by v4l2-ctl for example */
+		if (-1 == xioctl(fd, VIDIOC_G_FMT, &fmt))
+			errno_exit("VIDIOC_G_FMT");
+	}
 
 	/* Buggy driver paranoia. */
 	min = fmt.fmt.pix.width * 2;
@@ -577,20 +565,22 @@ static void usage(FILE *fp, int argc, char **argv)
 		 "-r | --read          Use read() calls\n"
 		 "-u | --userp         Use application allocated buffers\n"
 		 "-o | --output        Outputs stream to stdout\n"
+		 "-f | --format        Force format to 640x480 YUYV\n"
 		 "",
 		 argv[0]);
 }
 
-static const char short_options [] = "d:hmruo";
+static const char short_options[] = "d:hmruof";
 
 static const struct option
-long_options [] = {
-	{ "device",     required_argument,      NULL,           'd' },
-	{ "help",       no_argument,            NULL,           'h' },
-	{ "mmap",       no_argument,            NULL,           'm' },
-	{ "read",       no_argument,            NULL,           'r' },
-	{ "userp",      no_argument,            NULL,           'u' },
-	{ "output",     no_argument,            NULL,           'o' },
+long_options[] = {
+	{ "device", required_argument, NULL, 'd' },
+	{ "help",   no_argument,       NULL, 'h' },
+	{ "mmap",   no_argument,       NULL, 'm' },
+	{ "read",   no_argument,       NULL, 'r' },
+	{ "userp",  no_argument,       NULL, 'u' },
+	{ "output", no_argument,       NULL, 'o' },
+	{ "format", no_argument,       NULL, 'f' },
 	{ 0, 0, 0, 0 }
 };
 
@@ -603,8 +593,7 @@ int main(int argc, char **argv)
 		int c;
 
 		c = getopt_long(argc, argv,
-				 short_options, long_options,
-				 &idx);
+				short_options, long_options, &idx);
 
 		if (-1 == c)
 			break;
@@ -637,6 +626,10 @@ int main(int argc, char **argv)
 			out_buf++;
 			break;
 
+		case 'f':
+			force_format++;
+			break;
+
 		default:
 			usage(stderr, argc, argv);
 			exit(EXIT_FAILURE);
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp
index 5d70ed9f3..ae9293414 100644
--- a/v4l2-apps/util/v4l2-ctl.cpp
+++ b/v4l2-apps/util/v4l2-ctl.cpp
@@ -160,6 +160,7 @@ static const flag_def service_def[] = {
 #define FmtHeight		(1L<<1)
 #define FmtChromaKey		(1L<<2)
 #define FmtGlobalAlpha		(1L<<3)
+#define FmtPixelFormat		(1L<<4)
 
 /* crop specified */
 #define CropWidth		(1L<<0)
@@ -236,126 +237,128 @@ static struct option long_options[] = {
 static void usage(void)
 {
 	printf("Usage:\n");
-	printf("Common options:\n");
-	printf("  --all              display all information available\n");
-	printf("  -B, --get-fmt-sliced-vbi\n");
-	printf("		     query the sliced VBI capture format [VIDIOC_G_FMT]\n");
-	printf("  -b, --set-fmt-sliced-vbi=<mode>\n");
-	printf("                     set the sliced VBI capture format to <mode> [VIDIOC_S_FMT]\n");
-	printf("                     <mode> is a comma separated list of:\n");
-	printf("                     off:      turn off sliced VBI (cannot be combined with other modes)\n");
-	printf("                     teletext: teletext (PAL/SECAM)\n");
-	printf("                     cc:       closed caption (NTSC)\n");
-	printf("                     wss:      widescreen signal (PAL/SECAM)\n");
-	printf("                     vps:      VPS (PAL/SECAM)\n");
-	printf("  -C, --get-ctrl=<ctrl>[,<ctrl>...]\n");
-	printf("                     get the value of the controls [VIDIOC_G_EXT_CTRLS]\n");
-	printf("  -c, --set-ctrl=<ctrl>=<val>[,<ctrl>=<val>...]\n");
-	printf("                     set the controls to the values specified [VIDIOC_S_EXT_CTRLS]\n");
-	printf("  -D, --info         show driver info [VIDIOC_QUERYCAP]\n");
-	printf("  -d, --device=<dev> use device <dev> instead of /dev/video0\n");
-	printf("                     if <dev> is a single digit, then /dev/video<dev> is used\n");
-	printf("  -F, --get-freq     query the frequency [VIDIOC_G_FREQUENCY]\n");
-	printf("  -f, --set-freq=<freq>\n");
-	printf("                     set the frequency to <freq> MHz [VIDIOC_S_FREQUENCY]\n");
-	printf("  -h, --help         display this help message\n");
-	printf("  -I, --get-input    query the video input [VIDIOC_G_INPUT]\n");
-	printf("  -i, --set-input=<num>\n");
-	printf("                     set the video input to <num> [VIDIOC_S_INPUT]\n");
-	printf("  -l, --list-ctrls   display all controls and their values [VIDIOC_QUERYCTRL]\n");
-	printf("  -L, --list-ctrls-menus\n");
-	printf("		     display all controls, their values and the menus [VIDIOC_QUERYMENU]\n");
-	printf("  -N, --list-outputs display video outputs [VIDIOC_ENUMOUTPUT]\n");
-	printf("  -n, --list-inputs  display video inputs [VIDIOC_ENUMINPUT]\n");
-	printf("  -O, --get-output   query the video output [VIDIOC_G_OUTPUT]\n");
-	printf("  -o, --set-output=<num>\n");
-	printf("                     set the video output to <num> [VIDIOC_S_OUTPUT]\n");
-	printf("  -S, --get-standard\n");
-	printf("                     query the video standard [VIDIOC_G_STD]\n");
-	printf("  -s, --set-standard=<num>\n");
-	printf("                     set the video standard to <num> [VIDIOC_S_STD]\n");
-	printf("                     <num> can be a numerical v4l2_std value, or it can be one of:\n");
-	printf("                     pal-X (X = B/G/H/N/Nc/I/D/K/M/60) or just 'pal' (V4L2_STD_PAL)\n");
-	printf("                     ntsc-X (X = M/J/K) or just 'ntsc' (V4L2_STD_NTSC)\n");
-	printf("                     secam-X (X = B/G/H/D/K/L/Lc) or just 'secam' (V4L2_STD_SECAM)\n");
-	printf("  --list-standards   display supported video standards [VIDIOC_ENUMSTD]\n");
-	printf("  -T, --get-tuner    query the tuner settings [VIDIOC_G_TUNER]\n");
-	printf("  -t, --set-tuner=<mode>\n");
-	printf("                     set the audio mode of the tuner [VIDIOC_S_TUNER]\n");
-	printf("                     Possible values: mono, stereo, lang2, lang1, bilingual\n");
-	printf("  --list-formats     display supported video formats [VIDIOC_ENUM_FMT]\n");
-	printf("  -V, --get-fmt-video\n");
-	printf("     		     query the video capture format [VIDIOC_G_FMT]\n");
-	printf("  -v, --set-fmt-video=width=<w>,height=<h>\n");
-	printf("                     set the video capture format [VIDIOC_S_FMT]\n");
-	printf("  --verbose          turn on verbose ioctl error reporting.\n");
-	printf("\n");
-	printf("Uncommon options:\n");
-	printf("  --get-fmt-video-out\n");
-	printf("     		     query the video output format [VIDIOC_G_FMT]\n");
-	printf("  --set-fmt-video-out=width=<w>,height=<h>\n");
-	printf("                     set the video output format [VIDIOC_S_FMT]\n");
-	printf("  --get-fmt-overlay\n");
-	printf("     		     query the video overlay format [VIDIOC_G_FMT]\n");
-	printf("  --get-fmt-output-overlay\n");
-	printf("     		     query the video output overlay format [VIDIOC_G_FMT]\n");
-	printf("  --set-fmt-output-overlay=chromakey=<key>,global_alpha=<alpha>\n");
-	printf("     		     set the video output overlay format [VIDIOC_S_FMT]\n");
-	printf("  --get-sliced-vbi-cap\n");
-	printf("		     query the sliced VBI capture capabilities [VIDIOC_G_SLICED_VBI_CAP]\n");
-	printf("  --get-sliced-vbi-out-cap\n");
-	printf("		     query the sliced VBI output capabilities [VIDIOC_G_SLICED_VBI_CAP]\n");
-	printf("  --get-fmt-sliced-vbi-out\n");
-	printf("		     query the sliced VBI output format [VIDIOC_G_FMT]\n");
-	printf("  --set-fmt-sliced-vbi-out=<mode>\n");
-	printf("                     set the sliced VBI output format to <mode> [VIDIOC_S_FMT]\n");
-	printf("                     <mode> is a comma separated list of:\n");
-	printf("                     off:      turn off sliced VBI (cannot be combined with other modes)\n");
-	printf("                     teletext: teletext (PAL/SECAM)\n");
-	printf("                     cc:       closed caption (NTSC)\n");
-	printf("                     wss:      widescreen signal (PAL/SECAM)\n");
-	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");
-	printf("  --get-cropcap      query the crop capabilities [VIDIOC_CROPCAP]\n");
-	printf("  --get-crop	     query the video capture crop window [VIDIOC_G_CROP]\n");
-	printf("  --set-crop=top=<x>,left=<y>,width=<w>,height=<h>\n");
-	printf("                     set the video capture crop window [VIDIOC_S_CROP]\n");
-	printf("  --get-cropcap-output\n");
-	printf("                     query the crop capabilities for video output [VIDIOC_CROPCAP]\n");
-	printf("  --get-crop-output  query the video output crop window [VIDIOC_G_CROP]\n");
-	printf("  --set-crop-output=top=<x>,left=<y>,width=<w>,height=<h>\n");
-	printf("                     set the video output crop window [VIDIOC_S_CROP]\n");
-	printf("  --get-cropcap-overlay\n");
-	printf("                     query the crop capabilities for video overlay [VIDIOC_CROPCAP]\n");
-	printf("  --get-crop-overlay query the video overlay crop window [VIDIOC_G_CROP]\n");
-	printf("  --set-crop-overlay=top=<x>,left=<y>,width=<w>,height=<h>\n");
-	printf("                     set the video overlay crop window [VIDIOC_S_CROP]\n");
-	printf("  --get-cropcap-output-overlay\n");
-	printf("                     query the crop capabilities for video output overlays [VIDIOC_CROPCAP]\n");
-	printf("  --get-crop-output-overlay\n");
-	printf("                     query the video output overlay crop window [VIDIOC_G_CROP]\n");
-	printf("  --set-crop-output-overlay=top=<x>,left=<y>,width=<w>,height=<h>\n");
-	printf("                     set the video output overlay crop window [VIDIOC_S_CROP]\n");
-	printf("  --get-audio-input  query the audio input [VIDIOC_G_AUDIO]\n");
-	printf("  --set-audio-input=<num>\n");
-	printf("                     set the audio input to <num> [VIDIOC_S_AUDIO]\n");
-	printf("  --get-audio-output query the audio output [VIDIOC_G_AUDOUT]\n");
-	printf("  --set-audio-output=<num>\n");
-	printf("                     set the audio output to <num> [VIDIOC_S_AUDOUT]\n");
-	printf("  --list-audio-outputs\n");
-	printf("                     display audio outputs [VIDIOC_ENUMAUDOUT]\n");
-	printf("  --list-audio-inputs\n");
-	printf("                     display audio inputs [VIDIOC_ENUMAUDIO]\n");
-	printf("\n");
-	printf("Expert options:\n");
-	printf("  --streamoff        turn the stream off [VIDIOC_STREAMOFF]\n");
-	printf("  --streamon         turn the stream on [VIDIOC_STREAMOFF]\n");
-	printf("  --log-status       log the board status in the kernel log [VIDIOC_LOG_STATUS]\n");
+	printf("Common options:\n"
+	       "  --all              display all information available\n"
+	       "  -B, --get-fmt-sliced-vbi\n"
+	       "		     query the sliced VBI capture format [VIDIOC_G_FMT]\n"
+	       "  -b, --set-fmt-sliced-vbi=<mode>\n"
+	       "                     set the sliced VBI capture format to <mode> [VIDIOC_S_FMT]\n"
+	       "                     <mode> is a comma separated list of:\n"
+	       "                     off:      turn off sliced VBI (cannot be combined with other modes)\n"
+	       "                     teletext: teletext (PAL/SECAM)\n"
+	       "                     cc:       closed caption (NTSC)\n"
+	       "                     wss:      widescreen signal (PAL/SECAM)\n"
+	       "                     vps:      VPS (PAL/SECAM)\n"
+	       "  -C, --get-ctrl=<ctrl>[,<ctrl>...]\n"
+	       "                     get the value of the controls [VIDIOC_G_EXT_CTRLS]\n"
+	       "  -c, --set-ctrl=<ctrl>=<val>[,<ctrl>=<val>...]\n"
+	       "                     set the controls to the values specified [VIDIOC_S_EXT_CTRLS]\n"
+	       "  -D, --info         show driver info [VIDIOC_QUERYCAP]\n"
+	       "  -d, --device=<dev> use device <dev> instead of /dev/video0\n"
+	       "                     if <dev> is a single digit, then /dev/video<dev> is used\n"
+	       "  -F, --get-freq     query the frequency [VIDIOC_G_FREQUENCY]\n"
+	       "  -f, --set-freq=<freq>\n"
+	       "                     set the frequency to <freq> MHz [VIDIOC_S_FREQUENCY]\n"
+	       "  -h, --help         display this help message\n"
+	       "  -I, --get-input    query the video input [VIDIOC_G_INPUT]\n"
+	       "  -i, --set-input=<num>\n"
+	       "                     set the video input to <num> [VIDIOC_S_INPUT]\n"
+	       "  -l, --list-ctrls   display all controls and their values [VIDIOC_QUERYCTRL]\n"
+	       "  -L, --list-ctrls-menus\n"
+	       "		     display all controls, their values and the menus [VIDIOC_QUERYMENU]\n"
+	       "  -N, --list-outputs display video outputs [VIDIOC_ENUMOUTPUT]\n"
+	       "  -n, --list-inputs  display video inputs [VIDIOC_ENUMINPUT]\n"
+	       "  -O, --get-output   query the video output [VIDIOC_G_OUTPUT]\n"
+	       "  -o, --set-output=<num>\n"
+	       "                     set the video output to <num> [VIDIOC_S_OUTPUT]\n"
+	       "  -S, --get-standard\n"
+	       "                     query the video standard [VIDIOC_G_STD]\n"
+	       "  -s, --set-standard=<num>\n"
+	       "                     set the video standard to <num> [VIDIOC_S_STD]\n"
+	       "                     <num> can be a numerical v4l2_std value, or it can be one of:\n"
+	       "                     pal-X (X = B/G/H/N/Nc/I/D/K/M/60) or just 'pal' (V4L2_STD_PAL)\n"
+	       "                     ntsc-X (X = M/J/K) or just 'ntsc' (V4L2_STD_NTSC)\n"
+	       "                     secam-X (X = B/G/H/D/K/L/Lc) or just 'secam' (V4L2_STD_SECAM)\n"
+	       "  --list-standards   display supported video standards [VIDIOC_ENUMSTD]\n"
+	       "  -T, --get-tuner    query the tuner settings [VIDIOC_G_TUNER]\n"
+	       "  -t, --set-tuner=<mode>\n"
+	       "                     set the audio mode of the tuner [VIDIOC_S_TUNER]\n"
+	       "                     Possible values: mono, stereo, lang2, lang1, bilingual\n"
+	       "  --list-formats     display supported video formats [VIDIOC_ENUM_FMT]\n"
+	       "  -V, --get-fmt-video\n"
+	       "     		     query the video capture format [VIDIOC_G_FMT]\n"
+	       "  -v, --set-fmt-video=width=<w>,height=<h>,pixelformat=<f>\n"
+	       "                     set the video capture format [VIDIOC_S_FMT]\n"
+	       "                     pixelformat is either the format index as reported by\n"
+	       "                     --list-formats, or the fourcc value as a string\n"
+	       "  --verbose          turn on verbose ioctl error reporting.\n"
+	       "\n");
+	printf("Uncommon options:\n"
+	       "  --get-fmt-video-out\n"
+	       "     		     query the video output format [VIDIOC_G_FMT]\n"
+	       "  --set-fmt-video-out=width=<w>,height=<h>\n"
+	       "                     set the video output format [VIDIOC_S_FMT]\n"
+	       "  --get-fmt-overlay\n"
+	       "     		     query the video overlay format [VIDIOC_G_FMT]\n"
+	       "  --get-fmt-output-overlay\n"
+	       "     		     query the video output overlay format [VIDIOC_G_FMT]\n"
+	       "  --set-fmt-output-overlay=chromakey=<key>,global_alpha=<alpha>\n"
+	       "     		     set the video output overlay format [VIDIOC_S_FMT]\n"
+	       "  --get-sliced-vbi-cap\n"
+	       "		     query the sliced VBI capture capabilities [VIDIOC_G_SLICED_VBI_CAP]\n"
+	       "  --get-sliced-vbi-out-cap\n"
+	       "		     query the sliced VBI output capabilities [VIDIOC_G_SLICED_VBI_CAP]\n"
+	       "  --get-fmt-sliced-vbi-out\n"
+	       "		     query the sliced VBI output format [VIDIOC_G_FMT]\n"
+	       "  --set-fmt-sliced-vbi-out=<mode>\n"
+	       "                     set the sliced VBI output format to <mode> [VIDIOC_S_FMT]\n"
+	       "                     <mode> is a comma separated list of:\n"
+	       "                     off:      turn off sliced VBI (cannot be combined with other modes)\n"
+	       "                     teletext: teletext (PAL/SECAM)\n"
+	       "                     cc:       closed caption (NTSC)\n"
+	       "                     wss:      widescreen signal (PAL/SECAM)\n"
+	       "                     vps:      VPS (PAL/SECAM)\n"
+	       "  --get-fmt-vbi      query the VBI capture format [VIDIOC_G_FMT]\n"
+	       "  --get-fmt-vbi-out  query the VBI output format [VIDIOC_G_FMT]\n"
+	       "  --overlay=<on>     turn overlay on (1) or off (0) (VIDIOC_OVERLAY)\n"
+	       "  --get-fbuf         query the overlay framebuffer data [VIDIOC_G_FBUF]\n"
+	       "  --set-fbuf=chromakey=<0/1>,global_alpha=<0/1>,local_alpha=<0/1>,local_inv_alpha=<0/1>\n"
+	       "		     set the overlay framebuffer [VIDIOC_S_FBUF]\n"
+	       "  --get-cropcap      query the crop capabilities [VIDIOC_CROPCAP]\n"
+	       "  --get-crop	     query the video capture crop window [VIDIOC_G_CROP]\n"
+	       "  --set-crop=top=<x>,left=<y>,width=<w>,height=<h>\n"
+	       "                     set the video capture crop window [VIDIOC_S_CROP]\n"
+	       "  --get-cropcap-output\n"
+	       "                     query the crop capabilities for video output [VIDIOC_CROPCAP]\n"
+	       "  --get-crop-output  query the video output crop window [VIDIOC_G_CROP]\n"
+	       "  --set-crop-output=top=<x>,left=<y>,width=<w>,height=<h>\n"
+	       "                     set the video output crop window [VIDIOC_S_CROP]\n"
+	       "  --get-cropcap-overlay\n"
+	       "                     query the crop capabilities for video overlay [VIDIOC_CROPCAP]\n"
+	       "  --get-crop-overlay query the video overlay crop window [VIDIOC_G_CROP]\n"
+	       "  --set-crop-overlay=top=<x>,left=<y>,width=<w>,height=<h>\n"
+	       "                     set the video overlay crop window [VIDIOC_S_CROP]\n"
+	       "  --get-cropcap-output-overlay\n"
+	       "                     query the crop capabilities for video output overlays [VIDIOC_CROPCAP]\n"
+	       "  --get-crop-output-overlay\n"
+	       "                     query the video output overlay crop window [VIDIOC_G_CROP]\n"
+	       "  --set-crop-output-overlay=top=<x>,left=<y>,width=<w>,height=<h>\n"
+	       "                     set the video output overlay crop window [VIDIOC_S_CROP]\n"
+	       "  --get-audio-input  query the audio input [VIDIOC_G_AUDIO]\n"
+	       "  --set-audio-input=<num>\n"
+	       "                     set the audio input to <num> [VIDIOC_S_AUDIO]\n"
+	       "  --get-audio-output query the audio output [VIDIOC_G_AUDOUT]\n"
+	       "  --set-audio-output=<num>\n"
+	       "                     set the audio output to <num> [VIDIOC_S_AUDOUT]\n"
+	       "  --list-audio-outputs\n"
+	       "                     display audio outputs [VIDIOC_ENUMAUDOUT]\n"
+	       "  --list-audio-inputs\n"
+	       "                     display audio inputs [VIDIOC_ENUMAUDIO]\n"
+	       "\n");
+	printf("Expert options:\n"
+	       "  --streamoff        turn the stream off [VIDIOC_STREAMOFF]\n"
+	       "  --streamon         turn the stream on [VIDIOC_STREAMOFF]\n"
+	       "  --log-status       log the board status in the kernel log [VIDIOC_LOG_STATUS]\n");
 	exit(0);
 }
 
@@ -701,7 +704,7 @@ static void printfbuf(const struct v4l2_framebuffer &fb)
 		printf("\tBase          : 0x%p\n", fb.base);
 	printf("\tWidth         : %d\n", fb.fmt.width);
 	printf("\tHeight        : %d\n", fb.fmt.height);
-	printf("\tPixel Format  : %s\n", fcc2s(fb.fmt.pixelformat).c_str());
+	printf("\tPixel Format  : '%s'\n", fcc2s(fb.fmt.pixelformat).c_str());
 	if (!is_ext) {
 		printf("\tBytes per Line: %d\n", fb.fmt.bytesperline);
 		printf("\tSize image    : %d\n", fb.fmt.sizeimage);
@@ -740,7 +743,7 @@ static void printfmt(struct v4l2_format vfmt)
 	case V4L2_BUF_TYPE_VIDEO_CAPTURE:
 	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
 		printf("\tWidth/Height  : %u/%u\n", vfmt.fmt.pix.width, vfmt.fmt.pix.height);
-		printf("\tPixel Format  : %s\n", fcc2s(vfmt.fmt.pix.pixelformat).c_str());
+		printf("\tPixel Format  : '%s'\n", fcc2s(vfmt.fmt.pix.pixelformat).c_str());
 		printf("\tField         : %s\n", field2s(vfmt.fmt.pix.field).c_str());
 		printf("\tBytes per Line: %u\n", vfmt.fmt.pix.bytesperline);
 		printf("\tSize Image    : %u\n", vfmt.fmt.pix.sizeimage);
@@ -798,8 +801,9 @@ static void print_video_formats(int fd, enum v4l2_buf_type type)
 	fmt.index = 0;
 	fmt.type = type;
 	while (ioctl(fd, VIDIOC_ENUM_FMT, &fmt) >= 0) {
+		printf("\tIndex       : %d\n", fmt.index);
 		printf("\tType        : %s\n", buftype2s(type).c_str());
-		printf("\tPixelformat : %s", fcc2s(fmt.pixelformat).c_str());
+		printf("\tPixel Format: '%s'", fcc2s(fmt.pixelformat).c_str());
 		if (fmt.flags)
 			printf(" (compressed)");
 		printf("\n");
@@ -1239,6 +1243,7 @@ int main(int argc, char **argv)
 				static const char *const subopts[] = {
 					"width",
 					"height",
+					"pixelformat",
 					NULL
 				};
 
@@ -1251,6 +1256,15 @@ int main(int argc, char **argv)
 					vfmt.fmt.pix.height = strtol(value, 0L, 0);
 					set_fmts |= FmtHeight;
 					break;
+				case 2:
+					if (strlen(value) == 4)
+						vfmt.fmt.pix.pixelformat =
+						    v4l2_fourcc(value[0], value[1],
+							    value[2], value[3]);
+					else
+						vfmt.fmt.pix.pixelformat = strtol(value, 0L, 0);
+					set_fmts |= FmtPixelFormat;
+					break;
 				}
 			}
 			break;
@@ -1627,9 +1641,22 @@ int main(int argc, char **argv)
 				in_vfmt.fmt.pix.width = vfmt.fmt.pix.width;
 			if (set_fmts & FmtHeight)
 				in_vfmt.fmt.pix.height = vfmt.fmt.pix.height;
+			if (set_fmts & FmtPixelFormat) {
+				in_vfmt.fmt.pix.pixelformat = vfmt.fmt.pix.pixelformat;
+				if (in_vfmt.fmt.pix.pixelformat < 256) {
+					struct v4l2_fmtdesc fmt;
+
+					fmt.index = in_vfmt.fmt.pix.pixelformat;
+					fmt.type = in_vfmt.type;
+					if (doioctl(fd, VIDIOC_ENUM_FMT, &fmt, "VIDIOC_ENUM_FMT"))
+						goto set_vid_fmt_error;
+					in_vfmt.fmt.pix.pixelformat = fmt.pixelformat;
+				}
+			}
 			doioctl(fd, VIDIOC_S_FMT, &in_vfmt, "VIDIOC_S_FMT");
 		}
 	}
+set_vid_fmt_error:
 
 	if (options[OptSetVideoOutFormat]) {
 		struct v4l2_format in_vfmt;
@@ -2119,7 +2146,7 @@ int main(int argc, char **argv)
 		while (ioctl(fd, VIDIOC_ENUMSTD, &vs) >= 0) {
 			if (vs.index)
 				printf("\n");
-			printf("\tindex       : %d\n", vs.index);
+			printf("\tIndex       : %d\n", vs.index);
 			printf("\tID          : 0x%016llX\n", (unsigned long long)vs.id);
 			printf("\tName        : %s\n", vs.name);
 			printf("\tFrame period: %d/%d\n",