[artoolkit-commits] artoolkit/util/videoTest videoTest.c,1.6,1.7

[Hartmut S. <ret...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/videoTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/util/videoTest

Modified Files:
	videoTest.c 
Log Message:
added GStreamer support

Index: videoTest.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** videoTest.c	28 Jul 2005 21:58:42 -0000	1.6
--- videoTest.c	30 Jun 2006 04:38:40 -0000	1.7
***************
*** 21,25 ****
  char			*vconf = "Data\\WDM_camera_flipV.xml";
  #else
! char			*vconf = "";
  #endif
  
--- 21,35 ----
  char			*vconf = "Data\\WDM_camera_flipV.xml";
  #else
! 
! /*
! char			*vconf = "gst_arttoolkit.xml";
! */
! /* example for GStreamer based capture */
! char			*vconf = " videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! 
! /*
! char *vconf = "filesrc location=gstreamer_test_xvid.avi ! decodebin ! ffmpegcolorspace ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink";
! */
! 
  #endif
  
***************
*** 27,31 ****
  int             count = 0;
  
! char           *cparam_name    = "Data/camera_para.dat";
  ARParam         cparam;
  
--- 37,41 ----
  int             count = 0;
  
! char           *cparam_name = "Data/camera_para.dat";
  ARParam         cparam;
  
***************
*** 41,44 ****
--- 51,56 ----
  	//initialize applications
  	glutInit(&argc, argv);
+ 	
+ 	
      init();
  
***************
*** 92,95 ****
--- 104,108 ----
      /* open the video path */
      if( arVideoOpen( vconf ) < 0 ) exit(0);
+     
      /* find the size of the window */
      if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0);