Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32607/camera/1394
Modified Files:
camera1394.cc
Log Message:
updated camer1394 to use 2.0rc3 library for 2.0 support, added cfg parameter
for number of dma buffers
Index: camera1394.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** camera1394.cc 11 Jul 2006 03:12:31 -0000 1.28
--- camera1394.cc 19 Aug 2006 02:39:22 -0000 1.29
***************
*** 138,141 ****
--- 138,144 ----
- a string containing two suitable blue and red value unsigned integers
+ - dma_buffers
+ - Default: 4
+ - the number of DMA buffers to use
@par Example
***************
*** 324,327 ****
--- 327,334 ----
private: unsigned int mode;
#endif
+
+ // number of DMA buffers to use
+ private: unsigned int num_dma_buffers;
+
// Write frames to disk?
private: int save;
***************
*** 636,639 ****
--- 643,650 ----
this->save = cf->ReadInt(section, "save", 0);
+ // Number of DMA buffers?
+ this->num_dma_buffers = cf->ReadInt(section, "dma_buffers",
NUM_DMA_BUFFERS);
+
+
return;
}
***************
*** 914,918 ****
dc1394_dma_setup_capture(this->handle, this->camera.node, channel,
this->format, this->mode, speed,
! this->frameRate, NUM_DMA_BUFFERS, 1, NULL,
&this->camera) == DC1394_SUCCESS)
#elif DC1394_DMA_SETUP_CAPTURE_ARGS == 12
--- 925,929 ----
dc1394_dma_setup_capture(this->handle, this->camera.node, channel,
this->format, this->mode, speed,
! this->frameRate, this->num_dma_buffers, 1,
NULL,
&this->camera) == DC1394_SUCCESS)
#elif DC1394_DMA_SETUP_CAPTURE_ARGS == 12
***************
*** 921,925 ****
dc1394_dma_setup_capture(this->handle, this->camera.node, channel,
this->format, this->mode, speed,
! this->frameRate, NUM_DMA_BUFFERS, 1, 0, NULL,
&this->camera) == DC1394_SUCCESS)
#elif LIBDC1394_VERSION == 0200
--- 932,936 ----
dc1394_dma_setup_capture(this->handle, this->camera.node, channel,
this->format, this->mode, speed,
! this->frameRate, this->num_dma_buffers, 1, 0,
NULL,
&this->camera) == DC1394_SUCCESS)
#elif LIBDC1394_VERSION == 0200
***************
*** 946,950 ****
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup_dma(camera, NUM_DMA_BUFFERS,
1))
DMA_Success = false;
}
--- 957,961 ----
// now start capture
! if (DC1394_SUCCESS != dc1394_capture_setup_dma(camera,
this->num_dma_buffers, DC1394_RING_BUFFER_LAST))
DMA_Success = false;
}
***************
*** 1132,1138 ****
int * capture_buffer;
#if LIBDC1394_VERSION == 0200
! frame_width = camera->capture.frame_width;
! frame_height = camera->capture.frame_height;
! capture_buffer = (int *) camera->capture.capture_buffer;
#else
frame_width = this->camera.frame_width;
--- 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;
-------------------------------------------------------------------------
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
