Merge pull request #1059 from dominikrose:dc1394_2-1394b

4b51b1e3 · Roman Donchenko · 1707b176 · d39aeeca · 4b51b1e3
Commit 4b51b1e3 authored Jun 28, 2013 by Roman Donchenko
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

cap_dc1394_v2.cpp modules/highgui/src/cap_dc1394_v2.cpp +5 -0

No files found.
--- a/modules/highgui/src/cap_dc1394_v2.cpp
+++ b/modules/highgui/src/cap_dc1394_v2.cpp
@@ -304,6 +304,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 :