Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26073/camera/1394
Modified Files:
camera1394.cc
Log Message:
updated libdc1394 to support pre7 version on libdc1394 v2, pre6 will no
longer work
misc warning cleaned up as well
Index: camera1394.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** camera1394.cc 16 Apr 2006 23:55:51 -0000 1.26
--- camera1394.cc 9 Jul 2006 01:12:11 -0000 1.27
***************
*** 653,661 ****
{
case methodRaw:
! dc1394_release_camera(this->camera);
break;
case methodVideo:
//dc1394_dma_unlisten(this->camera);
! dc1394_dma_release_camera(this->camera);
}
dc1394_free_camera(this->camera);
--- 653,662 ----
{
case methodRaw:
! //dc1394_release_camera(this->camera);
break;
case methodVideo:
//dc1394_dma_unlisten(this->camera);
! //dc1394_dma_release_camera(this->camera);
! break;
}
dc1394_free_camera(this->camera);
***************
*** 924,947 ****
#elif LIBDC1394_VERSION == 0200
// Set camera to use DMA, improves performance.
! bool DMA_Success = false;
if (!this->forceRaw)
{
! if (FORMAT_7 == format)
! {
! if (DC1394_SUCCESS == dc1394_dma_setup_format7_capture(camera, mode,
DC1394_COLOR_CODING_RAW8, speed,
! (uint_t)DC1394_QUERY_FROM_CAMERA,
(uint_t)DC1394_QUERY_FROM_CAMERA,
! (uint_t)DC1394_QUERY_FROM_CAMERA,
(uint_t)DC1394_QUERY_FROM_CAMERA,
! (uint_t)DC1394_QUERY_FROM_CAMERA, NUM_DMA_BUFFERS, 1)) {
! DMA_Success = true;
! }
! }
! else
! {
! if (DC1394_SUCCESS == dc1394_dma_setup_capture(this->camera,
this->mode, speed,
! this->frameRate, NUM_DMA_BUFFERS, 1))
! {
! DMA_Success = true;
! }
! }
}
if (DMA_Success)
--- 925,942 ----
#elif LIBDC1394_VERSION == 0200
// Set camera to use DMA, improves performance.
! bool DMA_Success = true;
if (!this->forceRaw)
{
! // first set parameters that are common between format 7 and other modes
! if (DC1394_SUCCESS == dc1394_video_set_framerate(camera,frameRate))
! DMA_Success = false;
! if (DC1394_SUCCESS == dc1394_video_set_iso_speed(camera,speed))
! DMA_Success = false;
! if (DC1394_SUCCESS == dc1394_video_set_mode(camera,mode))
! DMA_Success = false;
!
! // now start capture
! if (DC1394_SUCCESS == dc1394_capture_setup_dma(camera, NUM_DMA_BUFFERS,
1))
! DMA_Success = false;
}
if (DMA_Success)
***************
*** 1110,1114 ****
case methodVideo:
#if LIBDC1394_VERSION == 0200
! if (dc1394_dma_capture(&this->camera,1,DC1394_VIDEO1394_WAIT) !=
DC1394_SUCCESS)
#else
if (dc1394_dma_single_capture(&this->camera) != DC1394_SUCCESS)
--- 1105,1109 ----
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)
***************
*** 1312,1316 ****
}
#if LIBDC1394_VERSION == 0200
! if (this->method == methodVideo) dc1394_dma_done_with_buffer(this->camera);
#else
if (this->method == methodVideo) dc1394_dma_done_with_buffer(&this->camera);
--- 1307,1311 ----
}
#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);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
