summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniels <niels@dyne.org>2012-12-29 23:15:56 (GMT)
committer niels <niels@dyne.org>2012-12-29 23:15:56 (GMT)
commit20c686851f6fe455fc4dfe3341dab3d4466e0ad3 (patch)
treef32802c55721a882df51de5c7aaeb453b3964409
parent58235584e839e15cd3164a8ef41a1e732c401c99 (diff)
update man page, bump version to .22v1.5.22
-rw-r--r--veejay-current/veejay-server/configure.ac4
-rw-r--r--veejay-current/veejay-server/man/veejay.123
2 files changed, 16 insertions, 11 deletions
diff --git a/veejay-current/veejay-server/configure.ac b/veejay-current/veejay-server/configure.ac
index 5d176d0..a6b048b 100644
--- a/veejay-current/veejay-server/configure.ac
+++ b/veejay-current/veejay-server/configure.ac
@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script.
dnl AC_INIT
-AC_INIT([veejay],[1.5.21],[http://www.veejayhq.net])
+AC_INIT([veejay],[1.5.22],[http://www.veejayhq.net])
AC_PREREQ(2.57)
AC_CONFIG_SRCDIR([veejay/veejay.c])
VEEJAY_MAJOR_VERSION=1
VEEJAY_MINOR_VERSION=5
-VEEJAY_MICRO_VERSION=21
+VEEJAY_MICRO_VERSION=22
VEEJAY_VERSION=$VEEJAY_MAJOR_VERSION.$VEEJAY_MINOR_VERSION.$VEEJAY_MICRO_VERSION
VEEJAY_CODENAME="Veejay Classic - build $VEEJAY_MINOR_VERSION $VEEJAY_MICRO_VERSION"
AC_CONFIG_HEADERS([config.h])
diff --git a/veejay-current/veejay-server/man/veejay.1 b/veejay-current/veejay-server/man/veejay.1
index 643a67d..a49fe18 100644
--- a/veejay-current/veejay-server/man/veejay.1
+++ b/veejay-current/veejay-server/man/veejay.1
@@ -73,8 +73,9 @@ Specify video output height for projection / on screen purposes
.B \-p/--port <num>
TCP port offset for communication with clients like 'reloaded' , 'sayVIMS' or sendVIMS for PD (default 3490)
.TP
-.B \-O/--output [01234]
-specify video output 0 = SDL (default) 1 = DirectFB 2 = SDL and DirectFB 3 = Open GL (requires ARB fragment shader), 4 = Silent (no visual output)
+.B \-O/--output [012345]
+specify video output 0 = SDL (default) 1 = DirectFB 2 = SDL and DirectFB 3 = Open GL (requires ARB fragment shader), 4 = YUV4MPEG, 5 = VLOOPBACK
+options 4 and fire require --output-file
.TP
.B \-s/--size NxN
Scaled video dimensions for SDL video output
@@ -178,10 +179,8 @@ Do not start with projection enabled.
You can set this environment variable to 'unicap' for capture
device detection and grabbing.
.TP
-.B VEEJAY_SET_CPU
-Tell veejay which CPU to use (and lock) for rendering. By default
-veejay will lock CPU #1 if running on a SMP machine.
-Use "0" to disable this behaviour. Use 1 for CPU#1, etc.
+.B VEEJAY_MULTITHREAD_TASKS
+You can set this environment variable to the number of threads you would like to spawn for veejay's pixel tasks. This option is automatically enabled if you run high resolution video.
.TP
.B VEEJAY_AUTO_SCALE_PIXELS
Tell veejay to automatically convert between CCIR 601 and JPEG
@@ -237,6 +236,9 @@ The second screen is 1024x768, the video window will appear fullscreen
.B VEEJAY_DEFAULT_CHANNEL
Set the Video4Linux Channel ID for veejay to use by default.
.TP
+.B VEEJAY_SHMID
+Set SHMID by environment variable (slave mode)
+.TP
.B VEEJAY_PAUSE_EVERYTHING
Pause behaviour; Set to 0 to pause only top sample (and keep playing FX chain) or to 1 to pause everything (default).
.TP
@@ -262,7 +264,7 @@ channel plugins.
Use '1' to capture in greyscale only
.TP
.B VEEJAY_V4L2_CAPTURE_METHOD
-Capturing method. Use 0 for read/write, 1 for memory mapping
+Capturing method. Use 0 for read/write, 1 for memory mapping.
.TP
.B VEEJAY_V4L2_MAX_RETRIES
Maximum number of attempts before giving up on capture device
@@ -286,8 +288,11 @@ and using PAL.
Startup veejay, using multicast protocol on port 5000 , with autolooping
and no colored verbose output
.TP
-.B veejay -O4 ~/my_video1.avi
-Startup veejay with openGL video window
+.B veejay --output 5 --output-file /dev/video1
+Startup veejay headless and write video output to a vloopback device
+.TP
+.B veejay --output 4 --output-file /tmp/video-yuv4mpeg.pipe
+Startup veejay headless and write yuv4mpeg video to a named fifo pipe
.TP
.SH INTERFACE COMMANDS (STDIN)
When you are running veejay with a SDL window you can use keybindings for