Update of /cvsroot/artoolkit/artoolkit/include/AR
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11247/include/AR
Modified Files:
config.h.in video.h
Log Message:
added GStreamer support
Index: video.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/video.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** video.h 22 May 2006 22:17:53 -0000 1.6
--- video.h 30 Jun 2006 04:38:40 -0000 1.7
***************
*** 27,31 ****
* The actual supported platforms (and the driver/library used) are:
* - Windows: with Microsoft DirectShow (VFW obsolete).
! * - Linux: with Video4Linux library, IEEE1394 camera library, and DV camera library.
* - Macintosh: with QuickTime.
* - SGI: with VL.
--- 27,31 ----
* The actual supported platforms (and the driver/library used) are:
* - Windows: with Microsoft DirectShow (VFW obsolete).
! * - Linux: with Video4Linux library, GStreamer, IEEE1394 camera library and DV camera library.
* - Macintosh: with QuickTime.
* - SGI: with VL.
***************
*** 45,48 ****
--- 45,50 ----
* modified by Thomas Pintaric (pin...@im...) to add
* a fully transparent DirectShow Driver.
+ * modified by Hartmut Seichter (ha...@te...) to add
+ * GStreamer video support
*
* \author Hirokazu Kato ka...@sy...
***************
*** 50,57 ****
* \author Thomas Pintaric pin...@im... (Windows DirectShow video support).
* \author Philip Lamb ph...@ed... (Macintosh Quicktime video support).
* \version 4.3b
* \date 03/02/02
*
- *
*/
/* --------------------------------------------------------------------------
--- 52,59 ----
* \author Thomas Pintaric pin...@im... (Windows DirectShow video support).
* \author Philip Lamb ph...@ed... (Macintosh Quicktime video support).
+ * \author Hartmut Seichter ha...@te... (GStreamer Video support)
* \version 4.3b
* \date 03/02/02
*
*/
/* --------------------------------------------------------------------------
***************
*** 106,109 ****
--- 108,114 ----
# include <AR/sys/videoLinux1394Cam.h>
# endif
+ # ifdef AR_INPUT_GSTREAMER
+ # include <AR/sys/videoGStreamer.h>
+ # endif
#endif
Index: config.h.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** config.h.in 14 Jun 2006 05:08:07 -0000 1.7
--- config.h.in 30 Jun 2006 04:38:40 -0000 1.8
***************
*** 13,28 ****
#define AR_PIXEL_FORMAT_YUY2 AR_PIXEL_FORMAT_yuvs
! /*------------------------------------------------------------*/
! /* */
! /* For Linux, you should define one of below 3 input method */
! /* AR_INPUT_V4L: use of standard Video4Linux Library */
! /* AR_INPUT_DV: use of DV Camera */
! /* AR_INPUT_1394CAM: use of 1394 Digital Camara */
! /* */
! /*------------------------------------------------------------*/
#ifdef __linux
#undef AR_INPUT_V4L
#undef AR_INPUT_DV
#undef AR_INPUT_1394CAM
# ifdef AR_INPUT_V4L
--- 13,30 ----
#define AR_PIXEL_FORMAT_YUY2 AR_PIXEL_FORMAT_yuvs
! /*--------------------------------------------------------------*/
! /* */
! /* For Linux, you should define one of below 4 input method */
! /* AR_INPUT_V4L: use of standard Video4Linux Library */
! /* AR_INPUT_GSTREAMER: use of GStreamer Media Framework */
! /* AR_INPUT_DV: use of DV Camera */
! /* AR_INPUT_1394CAM: use of 1394 Digital Camera */
! /* */
! /*--------------------------------------------------------------*/
#ifdef __linux
#undef AR_INPUT_V4L
#undef AR_INPUT_DV
#undef AR_INPUT_1394CAM
+ #undef AR_INPUT_GSTREAMER
# ifdef AR_INPUT_V4L
***************
*** 42,45 ****
--- 44,51 ----
# endif
+ # ifdef AR_INPUT_GSTREAMER
+ # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB
+ # endif
+
# undef AR_BIG_ENDIAN
# define AR_LITTLE_ENDIAN
|
