[artoolkit-commits] artoolkit/include/AR/sys videoLinuxDV.h, 1.2, 1.3 videoLinuxV4L.h, 1.2, 1.3 videoLinux1394Cam.h, 1.2, 1.3 videoSGI.h, 1.2, 1.3

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

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

Modified Files:
	videoLinuxDV.h videoLinuxV4L.h videoLinux1394Cam.h videoSGI.h 
Log Message:
Change line endings from CR to LF.

Index: videoLinuxV4L.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoLinuxV4L.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoLinuxV4L.h	22 Nov 2004 02:10:56 -0000	1.2
--- videoLinuxV4L.h	20 Aug 2006 21:48:47 -0000	1.3
***************
*** 1,59 ****
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 4.5
!  * Date: 2002/01/01
!  * 
!  * 2004/11/17 Grasset  adding new parameters for better controls of
!  * V4L driver
!  * 2004/11/17 Grasset  adding patch done by XXX for supporting YUV 4:2:0
!  * (adding #define and videoBuffer encoding parameters)
! 
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_V4L_H
! #define AR_VIDEO_LINUX_V4L_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <stdlib.h>
! #include <linux/types.h>
! #include <linux/videodev.h>
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! typedef struct {
!   //device controls
!     char                dev[256];
!     int                 channel;
!     int                 width;
!     int                 height;
!     int			palette;
!   //image controls
!     double              brightness;
!     double              contrast;
!     double              saturation;
!     double              hue;
!     double              whiteness;
! 
!   //options controls
!     int                 mode;
! 
!     int                 debug;
! 
!     int                 fd;
!     int                 video_cont_num;
!     ARUint8             *map;
!     ARUint8             *videoBuffer;
!     struct video_mbuf   vm;
!     struct video_mmap   vmm;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif
--- 1,59 ----
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 4.5
!  * Date: 2002/01/01
!  * 
!  * 2004/11/17 Grasset  adding new parameters for better controls of
!  * V4L driver
!  * 2004/11/17 Grasset  adding patch done by XXX for supporting YUV 4:2:0
!  * (adding #define and videoBuffer encoding parameters)
! 
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_V4L_H
! #define AR_VIDEO_LINUX_V4L_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <stdlib.h>
! #include <linux/types.h>
! #include <linux/videodev.h>
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! typedef struct {
!   //device controls
!     char                dev[256];
!     int                 channel;
!     int                 width;
!     int                 height;
!     int			palette;
!   //image controls
!     double              brightness;
!     double              contrast;
!     double              saturation;
!     double              hue;
!     double              whiteness;
! 
!   //options controls
!     int                 mode;
! 
!     int                 debug;
! 
!     int                 fd;
!     int                 video_cont_num;
!     ARUint8             *map;
!     ARUint8             *videoBuffer;
!     struct video_mbuf   vm;
!     struct video_mmap   vmm;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif

Index: videoLinuxDV.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoLinuxDV.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoLinuxDV.h	22 Nov 2004 02:10:56 -0000	1.2
--- videoLinuxDV.h	20 Aug 2006 21:48:47 -0000	1.3
***************
*** 1,54 ****
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 1.1
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_DV_H
! #define AR_VIDEO_LINUX_DV_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! #include <stdio.h>
! #include <string.h>
! #include <unistd.h>
! #include <libraw1394/raw1394.h>
! #include <libdv/dv.h>
! 
! typedef struct {
!     int              size;
!     ARUint8         *buff_in;
!     ARUint8         *buff_wait;
!     ARUint8         *buff_out;
!     int              fill_size_in;
!     int              fill_size_wait;
!     int              fill_size_out;
!     int              read_size;
!     pthread_mutex_t  mutex;
!     int              init;
! } AR2VideoBufferT;
! 
! typedef struct {
!     int              mode;
!     int              debug;
!     int              status;
!     raw1394handle_t  handle;
!     pthread_t        capture;
!     AR2VideoBufferT *buffer;
!     int              packet_num;
!     dv_decoder_t    *dv_decoder;
!     ARUint8         *image;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif
--- 1,54 ----
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 1.1
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_DV_H
! #define AR_VIDEO_LINUX_DV_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! #include <stdio.h>
! #include <string.h>
! #include <unistd.h>
! #include <libraw1394/raw1394.h>
! #include <libdv/dv.h>
! 
! typedef struct {
!     int              size;
!     ARUint8         *buff_in;
!     ARUint8         *buff_wait;
!     ARUint8         *buff_out;
!     int              fill_size_in;
!     int              fill_size_wait;
!     int              fill_size_out;
!     int              read_size;
!     pthread_mutex_t  mutex;
!     int              init;
! } AR2VideoBufferT;
! 
! typedef struct {
!     int              mode;
!     int              debug;
!     int              status;
!     raw1394handle_t  handle;
!     pthread_t        capture;
!     AR2VideoBufferT *buffer;
!     int              packet_num;
!     dv_decoder_t    *dv_decoder;
!     ARUint8         *image;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif

Index: videoSGI.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoSGI.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoSGI.h	22 Nov 2004 02:10:56 -0000	1.2
--- videoSGI.h	20 Aug 2006 21:48:47 -0000	1.3
***************
*** 1,92 ****
! /*******************************************************
!  *
!  * Author: Hirokazu Kato, Atsishi Nakazawa
!  *
!  *         ka...@sy...
!  *         nak...@in...
!  *
!  * Revision: 4.2
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_SGI_H
! #define AR_VIDEO_SGI_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! 
! typedef enum{
!     AR_VIDEO_INTERLEAVED,
!     AR_VIDEO_NONINTERLEAVED,
!     AR_VIDEO_ODD,
!     AR_VIDEO_EVEN
! } ARVideoFormat;
! 
! typedef enum {
!     AR_VIDEO_RGB_8,
!     AR_VIDEO_RGB_332,
!     AR_VIDEO_MONO,
!     AR_VIDEO_YVYU
! } ARVideoPacking;
! 
! typedef enum {
!     AR_VIDEO_1_P_1,
!     AR_VIDEO_1_P_2,
!     AR_VIDEO_1_P_4,
!     AR_VIDEO_1_P_8
! } ARVideoZoom;
! 
! typedef enum {
!     AR_VIDEO_INDY,
!     AR_VIDEO_O2,
!     AR_VIDEO_GALILEO,
!     AR_VIDEO_OCTANE,
!     AR_VIDEO_IMPACT
! } ARVideoDeviceType;
! 
! #define ARVideoDeviceMax   4
! 
! typedef struct {
!     ARVideoDeviceType  type[ARVideoDeviceMax];
!     int                num;
! } ARVideoDeviceTypeList;
! 
! 
! typedef struct {
!     int             did;
!     int             width;
!     int             height;
!     ARVideoFormat   format;
!     ARVideoPacking  packing;
!     ARVideoZoom     zoom;
!     int             buf_size;
! } AR2VideoParamT;
! 
! int  arVideoOpen2( void );
! int  arVideoClose2( void );
! 
! int  arVideoInqDevice2( ARVideoDeviceTypeList *dev_list );
! int  arVideoInqSize2( int dev_id, int *x, int *y );
! 
! int  arVideoSetupDevice2( int             dev_id,
!                           ARVideoFormat   format,
!                           ARVideoPacking  packing,
!                           ARVideoZoom     zoom    );
! int  arVideoCleanupDevice2( int dev_id );
! 
! 
! int  arVideoStart2( int dev_id );
! int  arVideoStop2( int dev_id );
! 
! unsigned char *arVideoGetImage2( int dev_id );
! 
! int  arVideoSetBufferSize2( int dev_id, int size );
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif
--- 1,92 ----
! /*******************************************************
!  *
!  * Author: Hirokazu Kato, Atsishi Nakazawa
!  *
!  *         ka...@sy...
!  *         nak...@in...
!  *
!  * Revision: 4.2
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_SGI_H
! #define AR_VIDEO_SGI_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! 
! typedef enum{
!     AR_VIDEO_INTERLEAVED,
!     AR_VIDEO_NONINTERLEAVED,
!     AR_VIDEO_ODD,
!     AR_VIDEO_EVEN
! } ARVideoFormat;
! 
! typedef enum {
!     AR_VIDEO_RGB_8,
!     AR_VIDEO_RGB_332,
!     AR_VIDEO_MONO,
!     AR_VIDEO_YVYU
! } ARVideoPacking;
! 
! typedef enum {
!     AR_VIDEO_1_P_1,
!     AR_VIDEO_1_P_2,
!     AR_VIDEO_1_P_4,
!     AR_VIDEO_1_P_8
! } ARVideoZoom;
! 
! typedef enum {
!     AR_VIDEO_INDY,
!     AR_VIDEO_O2,
!     AR_VIDEO_GALILEO,
!     AR_VIDEO_OCTANE,
!     AR_VIDEO_IMPACT
! } ARVideoDeviceType;
! 
! #define ARVideoDeviceMax   4
! 
! typedef struct {
!     ARVideoDeviceType  type[ARVideoDeviceMax];
!     int                num;
! } ARVideoDeviceTypeList;
! 
! 
! typedef struct {
!     int             did;
!     int             width;
!     int             height;
!     ARVideoFormat   format;
!     ARVideoPacking  packing;
!     ARVideoZoom     zoom;
!     int             buf_size;
! } AR2VideoParamT;
! 
! int  arVideoOpen2( void );
! int  arVideoClose2( void );
! 
! int  arVideoInqDevice2( ARVideoDeviceTypeList *dev_list );
! int  arVideoInqSize2( int dev_id, int *x, int *y );
! 
! int  arVideoSetupDevice2( int             dev_id,
!                           ARVideoFormat   format,
!                           ARVideoPacking  packing,
!                           ARVideoZoom     zoom    );
! int  arVideoCleanupDevice2( int dev_id );
! 
! 
! int  arVideoStart2( int dev_id );
! int  arVideoStop2( int dev_id );
! 
! unsigned char *arVideoGetImage2( int dev_id );
! 
! int  arVideoSetBufferSize2( int dev_id, int size );
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif

Index: videoLinux1394Cam.h
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoLinux1394Cam.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoLinux1394Cam.h	22 Nov 2004 02:10:56 -0000	1.2
--- videoLinux1394Cam.h	20 Aug 2006 21:48:47 -0000	1.3
***************
*** 1,50 ****
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 1.0
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_1394CAM_H
! #define AR_VIDEO_LINUX_1394CAM_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! #include <stdlib.h>
! #include <linux/types.h>
! #include <linux/videodev.h>
! #include <libraw1394/raw1394.h>
! #include <libdc1394/dc1394_control.h>
! 
! 
! typedef struct {
!     int      node;
!     int      mode;
!     int      rate;
!     int      debug;  
!     int      card;
!     int      channel;
!     int      speed;
!     int      format;
!     int      dma_buf_num;
!     int      int_mode;
!     int      int_rate;
!     int      status;
! 
!     int                    internal_id;
!     dc1394_feature_set     features;
!     dc1394_cameracapture   camera;
!     ARUint8                *image;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif
--- 1,50 ----
! /*******************************************************
!  *
!  * Author: Hirokazu Kato
!  *
!  *         ka...@sy...
!  *
!  * Revision: 1.0
!  * Date: 2002/01/01
!  *
! *******************************************************/
! #ifndef AR_VIDEO_LINUX_1394CAM_H
! #define AR_VIDEO_LINUX_1394CAM_H
! #ifdef  __cplusplus
! extern "C" {
! #endif
! 
! #include <AR/config.h>
! #include <AR/ar.h>
! 
! #include <stdlib.h>
! #include <linux/types.h>
! #include <linux/videodev.h>
! #include <libraw1394/raw1394.h>
! #include <libdc1394/dc1394_control.h>
! 
! 
! typedef struct {
!     int      node;
!     int      mode;
!     int      rate;
!     int      debug;  
!     int      card;
!     int      channel;
!     int      speed;
!     int      format;
!     int      dma_buf_num;
!     int      int_mode;
!     int      int_rate;
!     int      status;
! 
!     int                    internal_id;
!     dc1394_feature_set     features;
!     dc1394_cameracapture   camera;
!     ARUint8                *image;
! } AR2VideoParamT;
! 
! #ifdef  __cplusplus
! }
! #endif
! #endif