[artoolkit-commits] artoolkit/lib/SRC/VideoLinux1394Cam video.c, 1.9, 1.10

[Wayne P. <ti...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv19162/lib/SRC/VideoLinux1394Cam

Modified Files:
	video.c 
Log Message:
There are a lot of constants which are internal to the video driver and there
is no need to have it in this generic high-level include file. I have moved
the 1394 related constants into the video.c file, and in the future we might
do the same to all the other drivers as well. This change makes new changes
easier to understand.


Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** video.c	15 Sep 2006 03:44:54 -0000	1.9
--- video.c	15 Sep 2006 03:55:22 -0000	1.10
***************
*** 118,121 ****
--- 118,145 ----
  
  
+ 
+ 
+ /* Defines that control various aspects of this code */
+ #define   VIDEO_NODE_ANY                      -1
+ #define   VIDEO_MODE_320x240_YUV422           32
+ #define   VIDEO_MODE_640x480_YUV411           33
+ #define   VIDEO_MODE_640x480_RGB              34
+ #define   VIDEO_MODE_640x480_YUV411_HALF      35
+ #define   VIDEO_MODE_640x480_MONO             36
+ #define   VIDEO_MODE_640x480_MONO_COLOR       37
+ #define   VIDEO_MODE_640x480_MONO_COLOR_HALF  38
+ #define   VIDEO_FRAME_RATE_1_875               1
+ #define   VIDEO_FRAME_RATE_3_75                2
+ #define   VIDEO_FRAME_RATE_7_5                 3
+ #define   VIDEO_FRAME_RATE_15                  4
+ #define   VIDEO_FRAME_RATE_30                  5
+ #define   VIDEO_FRAME_RATE_60                  6
+ #define   DEFAULT_VIDEO_NODE                   VIDEO_NODE_ANY
+ #define   DEFAULT_VIDEO_MODE                   VIDEO_MODE_640x480_YUV411_HALF
+ #define   DEFAULT_VIDEO_FRAME_RATE             VIDEO_FRAME_RATE_30
+ 
+ 
+ 
+ 
  /* Error checking to ensure we have a proper configuration, and put some debugging out */
  #ifdef LIBDC_8