This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l2-ctl: Make --help output fit in 80 columns Author: Hans de Goede <[email protected]> Date: Sat Jun 2 14:07:51 2012 +0200 Signed-off-by: Hans de Goede <[email protected]> (cherry picked from commit 30ca0fbd77544ed35391d382a3adc93eb371ffe4) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-ctl/v4l2-ctl.cpp | 86 ++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 37 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=e8b79c3445a036592e2d40a25d0ded902e5c8d60 diff --git a/utils/v4l2-ctl/v4l2-ctl.cpp b/utils/v4l2-ctl/v4l2-ctl.cpp index 3190093..4d48dce 100644 --- a/utils/v4l2-ctl/v4l2-ctl.cpp +++ b/utils/v4l2-ctl/v4l2-ctl.cpp @@ -364,15 +364,15 @@ static void usage_common(void) " -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" + " set the value of the controls [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" " -h, --help display this help message\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" - " -w, --wrapper use the libv4l2 wrapper library.\n" + " display all controls and their menus [VIDIOC_QUERYMENU]\n" + " -w, --wrapper use the libv4l2 wrapper library.\n" " --list-devices list all v4l devices\n" " --log-status log the board status in the kernel log [VIDIOC_LOG_STATUS]\n" " --get-priority query the current access priority [VIDIOC_G_PRIORITY]\n" @@ -380,7 +380,7 @@ static void usage_common(void) " set the new access priority [VIDIOC_S_PRIORITY]\n" " <prio> is 1 (background), 2 (interactive) or 3 (record)\n" " --silent only set the result code, do not print any messages\n" - " --sleep=<secs> sleep for <secs> seconds, call QUERYCAP and close the file handle\n" + " --sleep=<secs> sleep <secs>, call QUERYCAP and close the file handle\n" " --verbose turn on verbose ioctl status reporting\n" ); } @@ -412,7 +412,7 @@ static void usage_tuner(void) " perform a hardware frequency seek [VIDIOC_S_HW_FREQ_SEEK]\n" " dir is 0 (seek downward) or 1 (seek upward)\n" " wrap is 0 (do not wrap around) or 1 (wrap around)\n" - " spacing is 0 (use default seek resolution) or sets the seek resolution\n", + " spacing sets the seek resolution (use 0 for default)\n", tcap2bands(-1).c_str()); } @@ -450,22 +450,22 @@ static void usage_stds(void) " 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" + " <num> a numerical v4l2_std value, or one of:\n" + " pal or pal-X (X = B/G/H/N/Nc/I/D/K/M/60) (V4L2_STD_PAL)\n" + " ntsc or ntsc-X (X = M/J/K) (V4L2_STD_NTSC)\n" + " secam or secam-X (X = B/G/H/D/K/L/Lc) (V4L2_STD_SECAM)\n" " --get-detected-standard\n" " display detected input video standard [VIDIOC_QUERYSTD]\n" - " --list-dv-presets list supported digital video presets [VIDIOC_ENUM_DV_PRESETS]\n" + " --list-dv-presets list supported dv presets [VIDIOC_ENUM_DV_PRESETS]\n" " --set-dv-preset=<num>\n" " set the digital video preset to <num> [VIDIOC_S_DV_PRESET]\n" " --get-dv-preset query the digital video preset in use [VIDIOC_G_DV_PRESET]\n" - " --query-dv-preset query the detected digital video preset [VIDIOC_QUERY_DV_PRESET]\n" - " --list-dv-timings list the standard supported digital video timings [VIDIOC_ENUM_DV_TIMINGS]\n" + " --query-dv-preset query the detected dv preset [VIDIOC_QUERY_DV_PRESET]\n" + " --list-dv-timings list supp. standard dv timings [VIDIOC_ENUM_DV_TIMINGS]\n" " --set-dv-bt-timings\n" " no arguments: use the output of VIDIOC_QUERY_DV_PRESET\n" - " index=<index>: use the index as provided by --list-dv-presets\n" - " or give a fully specified timings:\n" + " index=<index>: use the index as provided by\n" + " --list-dv-presets, or give a fully specified timings:\n" " width=<width>,height=<height>,interlaced=<0/1>,\n" " polarities=<polarities mask>,pixelclock=<pixelclock Hz>,\n" " hfp=<horizontal front porch>,hs=<horizontal sync>,\n" @@ -474,11 +474,12 @@ static void usage_stds(void) " il_vfp=<vertical front porch for bottom field>,\n" " il_vs=<vertical sync for bottom field>,\n" " il_vbp=<vertical back porch for bottom field>,\n" - " set the digital video timings according to the BT 656/1120 standard [VIDIOC_S_DV_TIMINGS]\n" + " set the digital video timings according to the BT 656/1120\n" + " standard [VIDIOC_S_DV_TIMINGS]\n" " --get-dv-timings get the digital video timings in use [VIDIOC_G_DV_TIMINGS]\n" - " --query-dv-timings query the detected digital video timings [VIDIOC_QUERY_DV_TIMINGS]\n" + " --query-dv-timings query the detected dv timings [VIDIOC_QUERY_DV_TIMINGS]\n" " --get-dv-timings-cap\n" - " get the digital video timings capabilities [VIDIOC_DV_TIMINGS_CAP]\n" + " get the dv timings capabilities [VIDIOC_DV_TIMINGS_CAP]\n" ); } @@ -487,7 +488,8 @@ static void usage_vidcap(void) printf("\nVideo Capture Formats options:\n" " --list-formats display supported video formats [VIDIOC_ENUM_FMT]\n" " --list-formats-mplane\n" - " display supported video multi-planar formats [VIDIOC_ENUM_FMT]\n" + " display supported video multi-planar formats\n" + " [VIDIOC_ENUM_FMT]\n" " --list-formats-ext display supported video formats including frame sizes\n" " and intervals\n" " --list-formats-ext-mplane\n" @@ -512,10 +514,12 @@ static void usage_vidcap(void) " pixelformat is either the format index as reported by\n" " --list-formats, or the fourcc value as a string\n" " --get-fmt-video-mplane\n" - " query the video capture format through the multi-planar API [VIDIOC_G_FMT]\n" + " query the video capture format through the multi-planar API\n" + " [VIDIOC_G_FMT]\n" " --set-fmt-video-mplane\n" " --try-fmt-video-mplane=width=<w>,height=<h>,pixelformat=<f>\n" - " set/try the video capture format using the multi-planar API [VIDIOC_S/TRY_FMT]\n" + " set/try the video capture format using the multi-planar API\n" + " [VIDIOC_S/TRY_FMT]\n" " pixelformat is either the format index as reported by\n" " --list-formats-mplane, or the fourcc value as a string\n" ); @@ -533,12 +537,15 @@ static void usage_vidout(void) " pixelformat is either the format index as reported by\n" " --list-formats-out, or the fourcc value as a string\n" " --list-formats-out-mplane\n" - " display supported video output multi-planar formats [VIDIOC_ENUM_FMT]\n" + " display supported video output multi-planar formats\n" + " [VIDIOC_ENUM_FMT]\n" " --get-fmt-video-out-mplane\n" - " query the video output format using the multi-planar API [VIDIOC_G_FMT]\n" + " query the video output format using the multi-planar API\n" + " [VIDIOC_G_FMT]\n" " --set-fmt-video-out-mplane\n" " --try-fmt-video-out-mplane=width=<w>,height=<h>,pixelformat=<f>\n" - " set/try the video output format with the multi-planar API [VIDIOC_S/TRY_FMT]\n" + " set/try the video output format with the multi-planar API\n" + " [VIDIOC_S/TRY_FMT]\n" " pixelformat is either the format index as reported by\n" " --list-formats-out-mplane, or the fourcc value as a string\n" ); @@ -558,13 +565,14 @@ static void usage_overlay(void) " --set-fmt-output-overlay\n" " --try-fmt-output-overlay=chromakey=<key>,global_alpha=<alpha>,\n" " top=<t>,left=<l>,width=<w>,height=<h>,field=<f>\n" - " set/try the video or video output overlay format [VIDIOC_S/TRY_FMT]\n" - " <f> can be one of:\n" - " any, none, top, bottom, interlaced, seq_tb, seq_bt, alternate,\n" - " interlaced_tb, interlaced_bt\n" + " set/try the video or video output overlay format\n" + " [VIDIOC_S/TRY_FMT], <f> can be one of:\n" + " any, none, top, bottom, interlaced, seq_tb, seq_bt,\n" + " alternate, interlaced_tb, interlaced_bt\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-fbuf=chromakey=<b>,global_alpha=<b>,local_alpha=<b>,local_inv_alpha=<b>\n" " set the overlay framebuffer [VIDIOC_S_FBUF]\n" + " b = 0 or 1\n" ); } @@ -572,9 +580,11 @@ static void usage_vbi(void) { printf("\nVBI Formats options:\n" " --get-sliced-vbi-cap\n" - " query the sliced VBI capture capabilities [VIDIOC_G_SLICED_VBI_CAP]\n" + " query the sliced VBI capture capabilities\n" + " [VIDIOC_G_SLICED_VBI_CAP]\n" " --get-sliced-vbi-out-cap\n" - " query the sliced VBI output capabilities [VIDIOC_G_SLICED_VBI_CAP]\n" + " query the sliced VBI output capabilities\n" + " [VIDIOC_G_SLICED_VBI_CAP]\n" " -B, --get-fmt-sliced-vbi\n" " query the sliced VBI capture format [VIDIOC_G_FMT]\n" " --get-fmt-sliced-vbi-out\n" @@ -583,9 +593,10 @@ static void usage_vbi(void) " --try-fmt-sliced-vbi\n" " --set-fmt-sliced-vbi-out\n" " --try-fmt-sliced-vbi-out=<mode>\n" - " set/try the sliced VBI capture/output format to <mode> [VIDIOC_S/TRY_FMT]\n" - " <mode> is a comma separated list of:\n" - " off: turn off sliced VBI (cannot be combined with other modes)\n" + " set/try the sliced VBI capture/output format to <mode>\n" + " [VIDIOC_S/TRY_FMT], <mode> is a comma separated list of:\n" + " off: turn off sliced VBI (cannot be combined with\n" + " other modes)\n" " teletext: teletext (PAL/SECAM)\n" " cc: closed caption (NTSC)\n" " wss: widescreen signal (PAL/SECAM)\n" @@ -603,17 +614,18 @@ static void usage_crop(void) " --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" + " query 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" + " query 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" + " query the crop capabilities for video output overlays\n" + " [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" @@ -641,7 +653,7 @@ static void usage_misc(void) " --get-jpeg-comp query the JPEG compression [VIDIOC_G_JPEGCOMP]\n" " --set-jpeg-comp=quality=<q>,markers=<markers>,comment=<c>,app<n>=<a>\n" " set the JPEG compression [VIDIOC_S_JPEGCOMP]\n" - " <n> is the app segment: 0-9 or a-f, <a> is the actual string.\n" + " <n> is the app segment: 0-9/a-f, <a> is the actual string.\n" " <markers> is a colon separated list of:\n" " dht: Define Huffman Tables\n" " dqt: Define Quantization Tables\n" _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
