[artoolkit-commits] artoolkit/lib/SRC/VideoLinuxDV video.c,1.1.1.1,1.2

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

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31424

Modified Files:
	video.c 
Log Message:
Move pixel format from gsub_lite into global namespace.

Index: video.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxDV/video.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** video.c	4 Nov 2004 08:51:49 -0000	1.1.1.1
--- video.c	5 Apr 2006 05:47:24 -0000	1.2
***************
*** 24,33 ****
  static void ar2VideoCapture(AR2VideoParamT *vid);
  static int ar2VideoRawISOHandler(raw1394handle_t handle, int channel, size_t length, quadlet_t *data);
! static int ar2VideBusResetHandler(raw1394handle_t handle, unsigned int generation);
  static int ar2VideoBufferInit(AR2VideoBufferT *buffer, int size);
  static int ar2VideoBufferClose(AR2VideoBufferT *buffer);
! static int ar2VideoBufferRaed(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag);
  static int ar2VideoBufferWrite(AR2VideoBufferT *buffer, ARUint8 *src, int size, int flag);
! static ARUint8 *ar2VideoBufferRaedDv(AR2VideoParamT *vid);
  
  int arVideoDispOption( void )
--- 24,33 ----
  static void ar2VideoCapture(AR2VideoParamT *vid);
  static int ar2VideoRawISOHandler(raw1394handle_t handle, int channel, size_t length, quadlet_t *data);
! static int ar2VideoBusResetHandler(raw1394handle_t handle, unsigned int generation);
  static int ar2VideoBufferInit(AR2VideoBufferT *buffer, int size);
  static int ar2VideoBufferClose(AR2VideoBufferT *buffer);
! static int ar2VideoBufferRead(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag);
  static int ar2VideoBufferWrite(AR2VideoBufferT *buffer, ARUint8 *src, int size, int flag);
! static ARUint8 *ar2VideoBufferReadDV(AR2VideoParamT *vid);
  
  int arVideoDispOption( void )
***************
*** 238,242 ****
  { 
      raw1394_set_userdata(vid->handle, vid);
!     raw1394_set_bus_reset_handler(vid->handle, ar2VideBusResetHandler);
      raw1394_set_iso_handler(vid->handle, 63, ar2VideoRawISOHandler);
      if( raw1394_start_iso_rcv(vid->handle, 63) < 0 ) {
--- 238,242 ----
  { 
      raw1394_set_userdata(vid->handle, vid);
!     raw1394_set_bus_reset_handler(vid->handle, ar2VideoBusResetHandler);
      raw1394_set_iso_handler(vid->handle, 63, ar2VideoRawISOHandler);
      if( raw1394_start_iso_rcv(vid->handle, 63) < 0 ) {
***************
*** 300,304 ****
  }
  
! static int ar2VideBusResetHandler(raw1394handle_t handle, unsigned int generation)
  {
      static int       i = 0;
--- 300,304 ----
  }
  
! static int ar2VideoBusResetHandler(raw1394handle_t handle, unsigned int generation)
  {
      static int       i = 0;
***************
*** 316,323 ****
  ARUint8 *ar2VideoGetImage( AR2VideoParamT *vid )
  {
!     return ar2VideoBufferRaedDv( vid );
  }
  
! static ARUint8 *ar2VideoBufferRaedDv(AR2VideoParamT *vid)
  {
      static int     f = 1;
--- 316,323 ----
  ARUint8 *ar2VideoGetImage( AR2VideoParamT *vid )
  {
!     return ar2VideoBufferReadDV( vid );
  }
  
! static ARUint8 *ar2VideoBufferReadDV(AR2VideoParamT *vid)
  {
      static int     f = 1;
***************
*** 362,371 ****
      }
  
!     pitches[0] = 720*AR_PIX_SIZE;
      pixels[0] =  vid->image;
! #ifdef AR_PIX_FORMAT_RGB
      dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches );
  #endif
! #ifdef AR_PIX_FORMAT_BGRA
      dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches );
  #endif
--- 362,371 ----
      }
  
!     pitches[0] = 720*AR_PIX_SIZE_DEFAULT;
      pixels[0] =  vid->image;
! #ifdef AR_PIXEL_FORMAT_DEFAULT_RGB
      dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_rgb, pixels, pitches );
  #endif
! #ifdef AR_PIXEL_FORMAT_DEFAULT_BGRA
      dv_decode_full_frame(vid->dv_decoder, vid->buffer->buff_out, e_dv_color_bgr0, pixels, pitches );
  #endif
***************
*** 434,438 ****
  }
  
! static int ar2VideoBufferRaed(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag)
  {
      ARUint8   *tmp;
--- 434,438 ----
  }
  
! static int ar2VideoBufferRead(AR2VideoBufferT *buffer, ARUint8 *dest, int size, int flag)
  {
      ARUint8   *tmp;