[artoolkit-commits] artoolkit/examples/simple simpleTest.c, 1.7, 1.8
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
From: Hartmut S. <ret...@us...> - 2006-08-04 06:40:52
|
Update of /cvsroot/artoolkit/artoolkit/examples/simple In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv18192/examples/simple Modified Files: simpleTest.c Log Message: added conditional preroll for the GStreamer pipeline if a V4L Version 2 source is used. This allows ARToolkit to use any V4L2 device out of the box as V4L1 is marked as deprecated in the Linux kernel. Minor update in the simpleTest example to document the usage of the gst-launch parameters with V4L2 Index: simpleTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** simpleTest.c 10 Jul 2006 04:35:17 -0000 1.7 --- simpleTest.c 4 Aug 2006 06:40:46 -0000 1.8 *************** *** 26,31 **** #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! //"gst_arttoolkit.xml"; ! //"filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; " videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; # else --- 26,33 ---- #elif defined(__linux) # if defined(AR_INPUT_GSTREAMER) ! /* possible streams ! "filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; ! "v4l2src device=/dev/video1 use-fixed-fps=false ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; ! */ " videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"; # else |