[artoolkit-commits] artoolkit/include/AR/sys videoMacOSX.h,1.2,1.3

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/include/AR/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23764

Modified Files:
	videoMacOSX.h 
Log Message:
Mac OS X video driver: support added for runtime specification of pixel format.

Index: videoMacOSX.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoMacOSX.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoMacOSX.h	22 Nov 2004 02:10:56 -0000	1.2
--- videoMacOSX.h	7 Dec 2004 04:46:10 -0000	1.3
***************
*** 1,62 ****
! /*
!  *	Video capture subrutine for Linux/libdc1394 devices
!  *	author: Kiyoshi Kiyokawa ( ki...@cr... )
!  *	        Hirokazu Kato ( ka...@sy... )
!  *
!  *	Revision: 1.0   Date: 2002/01/01
!  *
!  */
! /*
!  *	Copyright (c) 2003-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved.
!  *	
!  *	Rev		Date		Who		Changes
!  *	1.1.0	2003-09-09	PRL		Based on Apple "Son of MungGrab" sample code for QuickTime 6.
!  *								Added config option "-fps" to superimpose frame counter on video.
!  *								Returns aligned data in ARGB pixel format.
!  *  1.2.0   2004-04-28  PRL		Now one thread per video source. Versions of QuickTime
!  *								prior to 6.4 are NOT thread safe, and if using a non-thread
!  *								safe version, you should comment out AR_VIDEO_HAVE_THREADSAFE_QUICKTIME
!  *								so serialise access when there is more than one thread.
!  *	1.2.1   2004-06-28  PRL		Support for 2vuy and yuvs pixel formats.
!  *  1.3.0   2004-07-13  PRL		Code from Daniel Heckenberg to directly access vDig.
!  *
!  */
! /*
!  * 
!  * This file is part of ARToolKit.
!  * 
!  * ARToolKit is free software; you can redistribute it and/or modify
!  * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
!  * (at your option) any later version.
!  * 
!  * ARToolKit is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License
!  * along with ARToolKit; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  * 
!  */
! 
! #ifndef AR_VIDEO_MACOSX_H
! #define AR_VIDEO_MACOSX_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <Carbon/Carbon.h>
! #include <QuickTime/QuickTime.h>
! #include <pthread.h>
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! typedef struct _AR2VideoParamT AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif // AR_VIDEO_MACOSX_H
--- 1,64 ----
! /*
!  *	Video capture subrutine for Linux/libdc1394 devices
!  *	author: Kiyoshi Kiyokawa ( ki...@cr... )
!  *	        Hirokazu Kato ( ka...@sy... )
!  *
!  *	Revision: 1.0   Date: 2002/01/01
!  *
!  */
! /*
!  *	Copyright (c) 2003-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved.
!  *	
!  *	Rev		Date		Who		Changes
!  *	1.1.0	2003-09-09	PRL		Based on Apple "Son of MungGrab" sample code for QuickTime 6.
!  *								Added config option "-fps" to superimpose frame counter on video.
!  *								Returns aligned data in ARGB pixel format.
!  *  1.2.0   2004-04-28  PRL		Now one thread per video source. Versions of QuickTime
!  *								prior to 6.4 are NOT thread safe, and if using a non-thread
!  *								safe version, you should comment out AR_VIDEO_HAVE_THREADSAFE_QUICKTIME
!  *								so serialise access when there is more than one thread.
!  *	1.2.1   2004-06-28  PRL		Support for 2vuy and yuvs pixel formats.
!  *  1.3.0   2004-07-13  PRL		Code from Daniel Heckenberg to directly access vDig.
!  *  1.3.1   2004-12-07  PRL		Added config option "-pixelformat=" to support pixel format
!  *								specification at runtime, with default determined at compile time.
!  *
!  */
! /*
!  * 
!  * This file is part of ARToolKit.
!  * 
!  * ARToolKit is free software; you can redistribute it and/or modify
!  * it under the terms of the GNU General Public License as published by
!  * the Free Software Foundation; either version 2 of the License, or
!  * (at your option) any later version.
!  * 
!  * ARToolKit is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
!  * GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License
!  * along with ARToolKit; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  * 
!  */
! 
! #ifndef AR_VIDEO_MACOSX_H
! #define AR_VIDEO_MACOSX_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <Carbon/Carbon.h>
! #include <QuickTime/QuickTime.h>
! #include <pthread.h>
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! typedef struct _AR2VideoParamT AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif // AR_VIDEO_MACOSX_H