projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a646f7
)
dc1394-2: support for operation mode 1394b added
author
Dominik Rose
<mya@server.fake>
Thu, 27 Jun 2013 13:05:32 +0000
(15:05 +0200)
committer
Dominik Rose
<mya@server.fake>
Thu, 27 Jun 2013 13:05:32 +0000
(15:05 +0200)
modules/highgui/src/cap_dc1394_v2.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_dc1394_v2.cpp
b/modules/highgui/src/cap_dc1394_v2.cpp
index
2aa494f
..
f197337
100644
(file)
--- a/
modules/highgui/src/cap_dc1394_v2.cpp
+++ b/
modules/highgui/src/cap_dc1394_v2.cpp
@@
-295,6
+295,11
@@
bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
return false;
if (isoSpeed > 0)
{
+ // if capable set operation mode to 1394b for iso speeds above 400
+ if (isoSpeed > 400 && dcCam->bmode_capable == DC1394_TRUE)
+ {
+ dc1394_video_set_operation_mode(dcCam, DC1394_OPERATION_MODE_1394B);
+ }
code = dc1394_video_set_iso_speed(dcCam,
isoSpeed <= 100 ? DC1394_ISO_SPEED_100 :
isoSpeed <= 200 ? DC1394_ISO_SPEED_200 :