[libcvd-members] libcvd/cvd videosource.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        09/10/26 18:10:03

Modified files:
        cvd            : videosource.h 

Log message:
        Doc update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/videosource.h?cvsroot=libcvd&r1=1.22&r2=1.23

Patches:
Index: videosource.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/videosource.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- videosource.h       26 Oct 2009 15:44:58 -0000      1.22
+++ videosource.h       26 Oct 2009 18:10:03 -0000      1.23
@@ -306,7 +306,7 @@
                        return makeV4LBuffer<T>(vs.identifier, size, input, 
interlaced, verbose);       
                } 
 #endif
-#if CVD_HAVE_DVBUFFER
+#if CVD_HAVE_DVBUFFER3
                else if (vs.protocol == "dc1394") {
                        int cam_no = atoi(vs.identifier.c_str());
                        ImageRef size, offset;
@@ -347,7 +347,7 @@
 #if CVD_HAVE_V4L1BUFFER
                                                                           
"v4l1, "
 #endif
-#if CVD_HAVE_DVBUFFER
+#if CVD_HAVE_DVBUFFER3
                                                                           
"dc1394, "
 #endif
 #if CVD_HAVE_QTBUFFER
@@ -380,7 +380,7 @@
 The url syntax is the following:
 @verbatim
 url             := protocol ':' [ '[' options ']' ] // identifier
-protocol := "files" | "file" | "v4l2" | "v4l1" | "jpegstream" | "dc1394" | "qt"
+protocol := "files" | "file" | "v4l2" | "v4l1" | "jpegstream" | "dc1394" | 
"qt" | "colourspace"
 options  := option [ ',' options ]
 option  := name [ '=' value ]
 @endverbatim
@@ -413,6 +413,11 @@
 dc1394://1
 @endverbatim
 
+Open firewire camera 1, capturing in YUV411, at 30fps:
address@hidden
+colourspace:[from=yuv411]//dc1394:[fps=30]//1
address@hidden
+
 Open an avi file relative to the current directory:
 @verbatim
 file://../../stuff/movie.avi
@@ -433,7 +438,7 @@
 @verbatim
 jpegstream:///tmp/video
 @endverbatim
-If the argument is provided from a ahell such as BASH, then then
+If the argument is provided from a shell such as BASH, then then
 redirection can be used:
 @verbatim
 jpegstream://<(wget http//my.camera/file_representing_video -O - )
@@ -476,6 +481,10 @@
 'jpegstream' protocol (ServerPushJpegBuffer): identifier is path to file
           read_ahead  [= <number>] (default is 50 if specified without value)
 
+'colourspace' protcol (ColourspaceBuffer): identifier is a video URL
+      from = byte | mono | gray | grey | yuv411 | yuv422 | rgb<byte> 
+                | rgb | bayer_bggr | bayer_gbrg | bayer_grbg | bayer_rggb  
(default mono)
+
 @endverbatim
 
 @ingroup gVideo