Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22326/server/drivers/camera/1394
Modified Files:
camera1394.cc
Log Message:
updated camera1394 to use libdc1394-rc4 as there was slight API change between
rc3 and rc4
Index: camera1394.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** camera1394.cc 19 Aug 2006 02:39:22 -0000 1.29
--- camera1394.cc 15 Nov 2006 00:05:58 -0000 1.30
***************
*** 167,171 ****
#include <libraw1394/raw1394.h>
#if DC1394_DMA_SETUP_CAPTURE_ARGS == 20
! #include <dc1394/dc1394_control.h>
#else
#include <libdc1394/dc1394_control.h>
--- 167,171 ----
#include <libraw1394/raw1394.h>
#if DC1394_DMA_SETUP_CAPTURE_ARGS == 20
! #include <dc1394/control.h>
#else
#include <libdc1394/dc1394_control.h>
***************
*** 957,961 ****
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup_dma(camera,
this->num_dma_buffers, DC1394_RING_BUFFER_LAST))
DMA_Success = false;
}
--- 957,961 ----
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup_dma(camera,
this->num_dma_buffers))
DMA_Success = false;
}
***************
*** 1109,1112 ****
--- 1109,1113 ----
int i, j;
unsigned char * ptr1, * ptr2, * dst;
+ dc1394video_frame_t * frame = NULL;
switch (this->method)
***************
*** 1125,1129 ****
case methodVideo:
#if LIBDC1394_VERSION == 0200
! if (dc1394_capture_dma(&this->camera,1,DC1394_VIDEO1394_WAIT) !=
DC1394_SUCCESS)
#else
if (dc1394_dma_single_capture(&this->camera) != DC1394_SUCCESS)
--- 1126,1131 ----
case methodVideo:
#if LIBDC1394_VERSION == 0200
! frame = dc1394_capture_dequeue_dma (camera, DC1394_VIDEO1394_WAIT);
! if (!frame)
#else
if (dc1394_dma_single_capture(&this->camera) != DC1394_SUCCESS)
***************
*** 1143,1149 ****
int * capture_buffer;
#if LIBDC1394_VERSION == 0200
! frame_width = dc1394_capture_get_width(camera);
! frame_height = dc1394_capture_get_height(camera);
! capture_buffer = (int *) dc1394_capture_get_dma_buffer(camera);
#else
frame_width = this->camera.frame_width;
--- 1145,1151 ----
int * capture_buffer;
#if LIBDC1394_VERSION == 0200
! frame_width = frame->size[0];
! frame_height = frame->size[1];
! capture_buffer = (int *) frame->image;
#else
frame_width = this->camera.frame_width;
***************
*** 1327,1331 ****
}
#if LIBDC1394_VERSION == 0200
! if (this->method == methodVideo)
dc1394_capture_dma_done_with_buffer(this->camera);
#else
if (this->method == methodVideo) dc1394_dma_done_with_buffer(&this->camera);
--- 1329,1333 ----
}
#if LIBDC1394_VERSION == 0200
! if (this->method == methodVideo) dc1394_capture_enqueue_dma(camera, frame);
#else
if (this->method == methodVideo) dc1394_dma_done_with_buffer(&this->camera);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
