Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1731
Modified Files:
camera1394.cc
Log Message:
updated dc1394 driver to work with rc7 of the libdc1394 library
Index: camera1394.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** camera1394.cc 15 Nov 2006 19:01:34 -0000 1.31
--- camera1394.cc 24 Jul 2007 06:59:44 -0000 1.32
***************
*** 957,961 ****
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup_dma(camera,
this->num_dma_buffers))
DMA_Success = false;
}
--- 957,961 ----
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup(camera,
this->num_dma_buffers, DC1394_CAPTURE_FLAGS_DEFAULT))
DMA_Success = false;
}
***************
*** 1116,1120 ****
case methodRaw:
#if LIBDC1394_VERSION == 0200
! if (dc1394_capture(&this->camera, 1) != DC1394_SUCCESS)
#else
if (dc1394_single_capture(this->handle, &this->camera) != DC1394_SUCCESS)
--- 1116,1120 ----
case methodRaw:
#if LIBDC1394_VERSION == 0200
! if (1)
#else
if (dc1394_single_capture(this->handle, &this->camera) != DC1394_SUCCESS)
***************
*** 1127,1131 ****
case methodVideo:
#if LIBDC1394_VERSION == 0200
! frame = dc1394_capture_dequeue_dma (camera, DC1394_VIDEO1394_WAIT);
if (!frame)
#else
--- 1127,1131 ----
case methodVideo:
#if LIBDC1394_VERSION == 0200
! dc1394_capture_dequeue (camera, DC1394_CAPTURE_POLICY_WAIT, &frame);
if (!frame)
#else
***************
*** 1330,1334 ****
}
#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);
--- 1330,1334 ----
}
#if LIBDC1394_VERSION == 0200
! if (this->method == methodVideo) dc1394_capture_enqueue(camera, frame);
#else
if (this->method == methodVideo) dc1394_dma_done_with_buffer(&this->camera);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
