Update of /cvsroot/artoolkit/artoolkit/examples/simple
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv30663/examples/simple
Modified Files:
simpleTest.c
Log Message:
Some cleanup of gstreamer addition, plus new fliph and flipv tokens for Mac video.
Index: simpleTest.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simple/simpleTest.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** simpleTest.c 30 Jun 2006 04:38:40 -0000 1.6
--- simpleTest.c 10 Jul 2006 04:35:17 -0000 1.7
***************
*** 16,33 ****
#include <AR/ar.h>
! /* set up the video format globals */
!
! #ifdef _WIN32
! char *vconf = "Data\\WDM_camera_flipV.xml";
! #else
! #ifdef AR_INPUT_GSTREAMER
! char *vconf = "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! /*
! char *vconf = "filesrc location=/home/joe_sample/Media/gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! videorate ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! */
!
#else
! char *vconf = "";
! #endif
#endif
--- 16,37 ----
#include <AR/ar.h>
! //
! // Camera configuration.
! //
! char *vconf =
! #if defined(_WIN32)
! "Data\\WDM_camera_flipV.xml";
! #elif defined(__APPLE__)
! "";
! #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
! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240";
! # endif
#else
! "";
#endif
|
