Update of /cvsroot/artoolkit/artoolkit/include/AR
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6406/include/AR
Modified Files:
config.h.in
Log Message:
The DRAGONFLY flag in the Linux 1394 DC code was never implemented properly
or used for anything. Since we now have proper DragonFly camera support in the video
1394 code, I have removed this flag because otherwise it will be confusing for future
developers.
Index: config.h.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** config.h.in 30 Jun 2006 04:38:40 -0000 1.8
--- config.h.in 15 Sep 2006 03:08:18 -0000 1.9
***************
*** 124,128 ****
# ifdef AR_INPUT_1394CAM
- #undef DRAGONFLY
# define VIDEO_NODE_ANY -1
# define VIDEO_MODE_320x240_YUV422 32
--- 124,127 ----
***************
*** 140,148 ****
# define VIDEO_FRAME_RATE_60 6
# define DEFAULT_VIDEO_NODE VIDEO_NODE_ANY
! # ifndef DRAGONFLY
! # define DEFAULT_VIDEO_MODE VIDEO_MODE_640x480_YUV411_HALF
! # else
! # define DEFAULT_VIDEO_MODE VIDEO_MODE_640x480_MONO_COLOR_HALF
! # endif
# define DEFAULT_VIDEO_FRAME_RATE VIDEO_FRAME_RATE_30
# endif
--- 139,143 ----
# 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
# endif
|
