[artoolkit-commits] artoolkit/util/calib_camera2 main.c,1.14,1.15
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Hartmut S. <ret...@us...> - 2007-02-22 21:53:15
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12725/util/calib_camera2 Modified Files: main.c Log Message: Fixed bug in GStreamer video capture. Using GST_STATE_PAUSED instead of GST_STATE_NULL for stopping the stream. Removed hard coded video configuration for GStreamer in calib_camera2 - instead using ARTOOLKIT_CONFIG environment variable. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** main.c 3 Oct 2006 21:35:27 -0000 1.14 --- main.c 22 Feb 2007 21:53:13 -0000 1.15 *************** *** 62,66 **** #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! char *vconf = "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; # elif defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; --- 62,66 ---- #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! char *vconf = ""; # elif defined(AR_INPUT_V4L) static char *vconf = "-width=640 -height=480"; |