generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added user mode selection (thanks to tito for the patch, ticket #563)

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-11-24 22:54:52 +00:00
parent beee6f2f70
commit 334ac49d34
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/highgui/src/cap_dc1394_v2.cpp
View File

@ -219,6 +219,7 @@ protected:
double fps; double fps;
int nDMABufs; int nDMABufs;
bool started; bool started;
int userMode;
enum { VIDERE = 0x5505 }; enum { VIDERE = 0x5505 };
@ -257,6 +258,7 @@ CvCaptureCAM_DC1394_v2_CPP::CvCaptureCAM_DC1394_v2_CPP()
frameC = 0; frameC = 0;
nimages = 1; nimages = 1;
rectify = false; rectify = false;
userMode = -1;
} }
@ -277,7 +279,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
DC1394_ISO_SPEED_3200); DC1394_ISO_SPEED_3200);
} }
if (frameWidth > 0 || frameHeight > 0) if (userMode == -1 && (frameWidth > 0 || frameHeight > 0))
{ {
dc1394video_mode_t bestMode = (dc1394video_mode_t) - 1; dc1394video_mode_t bestMode = (dc1394video_mode_t) - 1;
dc1394video_modes_t videoModes; dc1394video_modes_t videoModes;
@ -321,6 +323,17 @@ bool CvCaptureCAM_DC1394_v2_CPP::startCapture()
if ((int)bestMode >= 0) if ((int)bestMode >= 0)
code = dc1394_video_set_mode(dcCam, bestMode); code = dc1394_video_set_mode(dcCam, bestMode);
} }
if (userMode > 0)
{
dc1394video_modes_t videoModes;
dc1394_video_get_supported_modes(dcCam, &videoModes);
if (userMode < videoModes.num)
{
dc1394video_mode_t mode = videoModes.modes[userMode];
code = dc1394_video_set_mode(dcCam, mode);
}
}
if (fps > 0) if (fps > 0)
{ {
@ -601,6 +614,9 @@ bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value)
return false; return false;
rectify = fabs(value) > FLT_EPSILON; rectify = fabs(value) > FLT_EPSILON;
break; break;
case CV_CAP_PROP_MODE:
userMode = cvRound(value);
break;
default: default:
return false; return false;
} }