diff -crB ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/doc/pics/.svn/entries ./OpenCV.trunk.original/trunk/opencv/modules/highgui/doc/pics/.svn/entries *** ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/doc/pics/.svn/entries 2011-03-26 00:10:38.600872847 +0200 --- ./OpenCV.trunk.original/trunk/opencv/modules/highgui/doc/pics/.svn/entries 2011-03-25 16:22:15.432797032 +0200 *************** *** 32,38 **** ! 2011-03-25T22:10:38.600872Z 01ea3f88dd0ebce6124de2ac72620266 2011-03-05T21:26:13.816034Z 4793 --- 32,38 ---- ! 2011-03-25T14:22:15.432797Z 01ea3f88dd0ebce6124de2ac72620266 2011-03-05T21:26:13.816034Z 4793 diff -crB ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/doc/.svn/entries ./OpenCV.trunk.original/trunk/opencv/modules/highgui/doc/.svn/entries *** ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/doc/.svn/entries 2011-03-26 00:10:38.600872847 +0200 --- ./OpenCV.trunk.original/trunk/opencv/modules/highgui/doc/.svn/entries 2011-03-25 16:22:15.432797032 +0200 *************** *** 32,38 **** ! 2011-03-25T22:10:38.600872Z b712750d6d84285fcd8237b914fdecff 2011-03-08T22:22:24.986780Z 4798 --- 32,38 ---- ! 2011-03-25T14:22:15.432797Z b712750d6d84285fcd8237b914fdecff 2011-03-08T22:22:24.986780Z 4798 *************** *** 66,72 **** ! 2011-03-25T22:10:38.600872Z e4f76661637b10a842a3cbccc2e2d63f 2011-03-08T22:22:24.986780Z 4798 --- 66,72 ---- ! 2011-03-25T14:22:15.432797Z e4f76661637b10a842a3cbccc2e2d63f 2011-03-08T22:22:24.986780Z 4798 *************** *** 100,106 **** ! 2011-03-25T22:10:38.600872Z ac696b7c2a24791f249445352ab5a5ca 2011-02-26T11:05:10.115815Z 4773 --- 100,106 ---- ! 2011-03-25T14:22:15.432797Z ac696b7c2a24791f249445352ab5a5ca 2011-02-26T11:05:10.115815Z 4773 *************** *** 134,140 **** ! 2011-03-25T22:10:38.600872Z 785a708e95515374501dd30a9baa8610 2011-03-08T22:22:24.986780Z 4798 --- 134,140 ---- ! 2011-03-25T14:22:15.432797Z 785a708e95515374501dd30a9baa8610 2011-03-08T22:22:24.986780Z 4798 diff -crB ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/include/opencv2/highgui/highgui_c.h ./OpenCV.trunk.original/trunk/opencv/modules/highgui/include/opencv2/highgui/highgui_c.h *** ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/include/opencv2/highgui/highgui_c.h 2011-03-26 00:10:37.033063269 +0200 --- ./OpenCV.trunk.original/trunk/opencv/modules/highgui/include/opencv2/highgui/highgui_c.h 2011-03-25 23:58:07.100869853 +0200 *************** *** 315,320 **** --- 315,326 ---- enum { + // modes of the controlling registers (can be: auto, manual, auto single push, absolute Latter allowed with any other mode) + // every feature can have only one mode turned on at a time + CV_CAP_PROP_DC1394_OFF = -4, //turn the feature off (not controlled manually nor automatically) + CV_CAP_PROP_DC1394_MODE_MANUAL = -3, //set automatically when a value of the feature is set by the user + CV_CAP_PROP_DC1394_MODE_AUTO = -2, + CV_CAP_PROP_DC1394_MODE_ONE_PUSH_AUTO = -1, CV_CAP_PROP_POS_MSEC =0, CV_CAP_PROP_POS_FRAMES =1, CV_CAP_PROP_POS_AVI_RATIO =2, *************** *** 332,351 **** CV_CAP_PROP_GAIN =14, CV_CAP_PROP_EXPOSURE =15, CV_CAP_PROP_CONVERT_RGB =16, ! CV_CAP_PROP_WHITE_BALANCE =17, CV_CAP_PROP_RECTIFICATION =18, CV_CAP_PROP_MONOCROME =19, ! // OpenNI map generators CV_CAP_OPENNI_DEPTH_GENERATOR = 0, CV_CAP_OPENNI_IMAGE_GENERATOR = 1 << 31, CV_CAP_OPENNI_GENERATORS_MASK = 1 << 31, // Properties of cameras avalible through OpenNI interfaces ! CV_CAP_PROP_OPENNI_OUTPUT_MODE = 20, ! CV_CAP_PROP_OPENNI_FRAME_MAX_DEPTH = 21, // in mm ! CV_CAP_PROP_OPENNI_BASELINE = 22, // in mm ! CV_CAP_PROP_OPENNI_FOCAL_LENGTH = 23, // in pixels CV_CAP_OPENNI_IMAGE_GENERATOR_OUTPUT_MODE = CV_CAP_OPENNI_IMAGE_GENERATOR + CV_CAP_PROP_OPENNI_OUTPUT_MODE, CV_CAP_OPENNI_DEPTH_GENERATOR_BASELINE = CV_CAP_OPENNI_DEPTH_GENERATOR + CV_CAP_PROP_OPENNI_BASELINE, CV_CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH = CV_CAP_OPENNI_DEPTH_GENERATOR + CV_CAP_PROP_OPENNI_FOCAL_LENGTH --- 338,364 ---- CV_CAP_PROP_GAIN =14, CV_CAP_PROP_EXPOSURE =15, CV_CAP_PROP_CONVERT_RGB =16, ! CV_CAP_PROP_WHITE_BALANCE_BLUE_U =17, CV_CAP_PROP_RECTIFICATION =18, CV_CAP_PROP_MONOCROME =19, ! CV_CAP_PROP_SHARPNESS =20, ! CV_CAP_PROP_AUTO_EXPOSURE =21, //exposure control done by camera, user can adjust refernce level using this feature ! CV_CAP_PROP_GAMMA =22, ! CV_CAP_PROP_TEMPERATURE =23, ! CV_CAP_PROP_TRIGGER =24, ! CV_CAP_PROP_TRIGGER_DELAY =26, ! CV_CAP_PROP_WHITE_BALANCE_RED_V =27, ! CV_CAP_PROP_MAX_DC1394 =28, // OpenNI map generators CV_CAP_OPENNI_DEPTH_GENERATOR = 0, CV_CAP_OPENNI_IMAGE_GENERATOR = 1 << 31, CV_CAP_OPENNI_GENERATORS_MASK = 1 << 31, // Properties of cameras avalible through OpenNI interfaces ! CV_CAP_PROP_OPENNI_OUTPUT_MODE = 100, ! CV_CAP_PROP_OPENNI_FRAME_MAX_DEPTH = 101, // in mm ! CV_CAP_PROP_OPENNI_BASELINE = 102, // in mm ! CV_CAP_PROP_OPENNI_FOCAL_LENGTH = 103, // in pixels CV_CAP_OPENNI_IMAGE_GENERATOR_OUTPUT_MODE = CV_CAP_OPENNI_IMAGE_GENERATOR + CV_CAP_PROP_OPENNI_OUTPUT_MODE, CV_CAP_OPENNI_DEPTH_GENERATOR_BASELINE = CV_CAP_OPENNI_DEPTH_GENERATOR + CV_CAP_PROP_OPENNI_BASELINE, CV_CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH = CV_CAP_OPENNI_DEPTH_GENERATOR + CV_CAP_PROP_OPENNI_FOCAL_LENGTH diff -crB ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/include/opencv2/highgui/.svn/entries ./OpenCV.trunk.original/trunk/opencv/modules/highgui/include/opencv2/highgui/.svn/entries *** ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/include/opencv2/highgui/.svn/entries 2011-03-26 00:10:37.033063269 +0200 --- ./OpenCV.trunk.original/trunk/opencv/modules/highgui/include/opencv2/highgui/.svn/entries 2011-03-25 16:22:13.832791306 +0200 *************** *** 32,38 **** ! 2011-03-25T22:10:37.033063Z d995bdaebc81361b7eb305d5b5b23cd9 2010-11-02T17:58:22.309902Z 3860 --- 32,38 ---- ! 2011-03-25T14:22:13.822791Z d995bdaebc81361b7eb305d5b5b23cd9 2010-11-02T17:58:22.309902Z 3860 *************** *** 66,72 **** ! 2011-03-25T22:10:37.033063Z e339de01604a2ac8543109b57eef000f 2011-02-04T13:41:10.776354Z 4638 --- 66,72 ---- ! 2011-03-25T14:22:13.832791Z e339de01604a2ac8543109b57eef000f 2011-02-04T13:41:10.776354Z 4638 diff -crB ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/src/cap_dc1394_v2.cpp ./OpenCV.trunk.original/trunk/opencv/modules/highgui/src/cap_dc1394_v2.cpp *** ./OpenCV.trunk.midnight/trunk/opencv/modules/highgui/src/cap_dc1394_v2.cpp 2011-03-26 00:10:44.770875586 +0200 --- ./OpenCV.trunk.original/trunk/opencv/modules/highgui/src/cap_dc1394_v2.cpp 2011-03-26 00:06:59.631495839 +0200 *************** *** 190,195 **** --- 190,196 ---- class CvCaptureCAM_DC1394_v2_CPP : public CvCapture { public: + static int dc1394properties[CV_CAP_PROP_MAX_DC1394]; CvCaptureCAM_DC1394_v2_CPP(); virtual ~CvCaptureCAM_DC1394_v2_CPP() { *************** *** 236,243 **** bool rectify; bool init_rectify; IplImage *maps[NIMG][2]; }; - CvCaptureCAM_DC1394_v2_CPP::CvCaptureCAM_DC1394_v2_CPP() { guid = 0; --- 237,266 ---- bool rectify; bool init_rectify; IplImage *maps[NIMG][2]; + dc1394featureset_t feature_set; + }; + //mapping CV_CAP_PROP_ to DC1394_FEATUREs + int CvCaptureCAM_DC1394_v2_CPP::dc1394properties[CV_CAP_PROP_MAX_DC1394] = { + -1, //no corresponding feature for CV_CAP_PROP_POS_MSEC + -1,-1,-1,-1, + DC1394_FEATURE_FRAME_RATE, //CV_CAP_PROP_FPS - fps can be set for format 7 only! + -1,-1,-1,-1, + DC1394_FEATURE_BRIGHTNESS,//CV_CAP_PROP_BRIGHTNESS + -1, + DC1394_FEATURE_SATURATION,//CV_CAP_PROP_SATURATION + DC1394_FEATURE_HUE, + DC1394_FEATURE_GAIN, + DC1394_FEATURE_SHUTTER, //CV_CAP_PROP_EXPOSURE + -1,//CV_CAP_PROP_CONVERT_RGB + DC1394_FEATURE_WHITE_BALANCE, //corresponds to CV_CAP_PROP_WHITE_BALANCE_BLUE_U and CV_CAP_PROP_WHITE_BALANCE_RED_V, see set function to check these props are set + -1,-1, + DC1394_FEATURE_SHARPNESS, + DC1394_FEATURE_EXPOSURE, //CV_CAP_PROP_AUTO_EXPOSURE - this is auto exposure according to the IIDC standard + DC1394_FEATURE_GAMMA, //CV_CAP_PROP_GAMMA + DC1394_FEATURE_TEMPERATURE, //CV_CAP_PROP_TEMPERATURE + DC1394_FEATURE_TRIGGER, //CV_CAP_PROP_TRIGGER + DC1394_FEATURE_TRIGGER_DELAY //CV_CAP_PROP_TRIGGER_DELAY }; CvCaptureCAM_DC1394_v2_CPP::CvCaptureCAM_DC1394_v2_CPP() { guid = 0; *************** *** 579,591 **** return fps; case CV_CAP_PROP_RECTIFICATION: return rectify ? 1 : 0; ! // case CV_CAP_PROP_BRIGHTNESS : ! // case CV_CAP_PROP_CONTRAST : ! // case CV_CAP_PROP_WHITE_BALANCE : default: ! ; } ! return 0; } bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value) --- 602,628 ---- return fps; case CV_CAP_PROP_RECTIFICATION: return rectify ? 1 : 0; ! case CV_CAP_PROP_WHITE_BALANCE_BLUE_U: ! if (dc1394_feature_whitebalance_get_value(dcCam, ! &feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].BU_value, ! &feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].RV_value) == DC1394_SUCCESS) ! return feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].BU_value; ! break; ! case CV_CAP_PROP_WHITE_BALANCE_RED_V: ! if (dc1394_feature_whitebalance_get_value(dcCam, ! &feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].BU_value, ! &feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].RV_value) == DC1394_SUCCESS) ! return feature_set.feature[DC1394_FEATURE_WHITE_BALANCE-DC1394_FEATURE_MIN].RV_value; ! break; default: ! if (propId