diff --git a/modules/highgui/doc/reading_and_writing_images_and_video.rst b/modules/highgui/doc/reading_and_writing_images_and_video.rst index 1d6c9164b0..89859f9d5a 100644 --- a/modules/highgui/doc/reading_and_writing_images_and_video.rst +++ b/modules/highgui/doc/reading_and_writing_images_and_video.rst @@ -406,10 +406,14 @@ Returns the specified ``VideoCapture`` property * **CV_CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted to RGB. - * **CV_CAP_PROP_WHITE_BALANCE** Currently not supported + * **CV_CAP_PROP_WHITE_BALANCE_U** The U value of the whitebalance setting (note: only supported by DC1394 v 2.x backend currently) + + * **CV_CAP_PROP_WHITE_BALANCE_V** The V value of the whitebalance setting (note: only supported by DC1394 v 2.x backend currently) * **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently) + * **CV_CAP_PROP_ISO_SPEED** The ISO speed of the camera (note: only supported by DC1394 v 2.x backend currently) + * **CV_CAP_PROP_BUFFERSIZE** Amount of frames stored in internal buffer memory (note: only supported by DC1394 v 2.x backend currently) @@ -463,10 +467,14 @@ Sets a property in the ``VideoCapture``. * **CV_CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted to RGB. - * **CV_CAP_PROP_WHITE_BALANCE** Currently unsupported + * **CV_CAP_PROP_WHITE_BALANCE_U** The U value of the whitebalance setting (note: only supported by DC1394 v 2.x backend currently) + + * **CV_CAP_PROP_WHITE_BALANCE_V** The V value of the whitebalance setting (note: only supported by DC1394 v 2.x backend currently) * **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently) + * **CV_CAP_PROP_ISO_SPEED** The ISO speed of the camera (note: only supported by DC1394 v 2.x backend currently) + * **CV_CAP_PROP_BUFFERSIZE** Amount of frames stored in internal buffer memory (note: only supported by DC1394 v 2.x backend currently) :param value: Value of the property. diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h index 71b28d1df9..e56b56bbf5 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_c.h +++ b/modules/highgui/include/opencv2/highgui/highgui_c.h @@ -362,7 +362,7 @@ enum 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_WHITE_BALANCE_U =17, CV_CAP_PROP_RECTIFICATION =18, CV_CAP_PROP_MONOCROME =19, CV_CAP_PROP_SHARPNESS =20, @@ -373,7 +373,7 @@ enum CV_CAP_PROP_TEMPERATURE =23, CV_CAP_PROP_TRIGGER =24, CV_CAP_PROP_TRIGGER_DELAY =25, - CV_CAP_PROP_WHITE_BALANCE_RED_V =26, + CV_CAP_PROP_WHITE_BALANCE_V =26, CV_CAP_PROP_ZOOM =27, CV_CAP_PROP_FOCUS =28, CV_CAP_PROP_GUID =29, diff --git a/modules/highgui/src/cap_dc1394_v2.cpp b/modules/highgui/src/cap_dc1394_v2.cpp index c8781ca311..f4eb7a9deb 100644 --- a/modules/highgui/src/cap_dc1394_v2.cpp +++ b/modules/highgui/src/cap_dc1394_v2.cpp @@ -665,13 +665,13 @@ double CvCaptureCAM_DC1394_v2_CPP::getProperty(int propId) return fps; case CV_CAP_PROP_RECTIFICATION: return rectify ? 1 : 0; - case CV_CAP_PROP_WHITE_BALANCE_BLUE_U: + case CV_CAP_PROP_WHITE_BALANCE_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: + case CV_CAP_PROP_WHITE_BALANCE_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) @@ -795,7 +795,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value) else act_feature->current_mode=DC1394_FEATURE_MODE_MANUAL; // if property is one of the white balance features treat it in different way - if (propId == CV_CAP_PROP_WHITE_BALANCE_BLUE_U) + if (propId == CV_CAP_PROP_WHITE_BALANCE_U) { if (dc1394_feature_whitebalance_set_value(dcCam,cvRound(value), act_feature->RV_value)!=DC1394_SUCCESS) return false; @@ -805,7 +805,7 @@ bool CvCaptureCAM_DC1394_v2_CPP::setProperty(int propId, double value) return true; } } - if (propId == CV_CAP_PROP_WHITE_BALANCE_RED_V) + if (propId == CV_CAP_PROP_WHITE_BALANCE_V) { if (dc1394_feature_whitebalance_set_value(dcCam, act_feature->BU_value, cvRound(value))!=DC1394_SUCCESS) return false; diff --git a/modules/highgui/src/cap_dshow.cpp b/modules/highgui/src/cap_dshow.cpp index 6cc29443d7..78026b88e6 100644 --- a/modules/highgui/src/cap_dshow.cpp +++ b/modules/highgui/src/cap_dshow.cpp @@ -2249,7 +2249,7 @@ int videoInput::getVideoPropertyFromCV(int cv_property){ case CV_CAP_PROP_MONOCROME: return VideoProcAmp_ColorEnable; - case CV_CAP_PROP_WHITE_BALANCE_BLUE_U: + case CV_CAP_PROP_WHITE_BALANCE_U: return VideoProcAmp_WhiteBalance; case CV_CAP_PROP_BACKLIGHT: @@ -3246,7 +3246,7 @@ double CvCaptureCAM_DShow::getProperty( int property_id ) case CV_CAP_PROP_SHARPNESS: case CV_CAP_PROP_GAMMA: case CV_CAP_PROP_MONOCROME: - case CV_CAP_PROP_WHITE_BALANCE_BLUE_U: + case CV_CAP_PROP_WHITE_BALANCE_U: case CV_CAP_PROP_BACKLIGHT: case CV_CAP_PROP_GAIN: if (VI.getVideoSettingFilter(index,VI.getVideoPropertyFromCV(property_id),min_value,max_value,stepping_delta,current_value,flags,defaultValue) ) return (double)current_value; @@ -3350,7 +3350,7 @@ bool CvCaptureCAM_DShow::setProperty( int property_id, double value ) case CV_CAP_PROP_SHARPNESS: case CV_CAP_PROP_GAMMA: case CV_CAP_PROP_MONOCROME: - case CV_CAP_PROP_WHITE_BALANCE_BLUE_U: + case CV_CAP_PROP_WHITE_BALANCE_U: case CV_CAP_PROP_BACKLIGHT: case CV_CAP_PROP_GAIN: return VI.setVideoSettingFilter(index,VI.getVideoPropertyFromCV(property_id),(long)value); diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py index c0aaed1918..fce172fdc2 100755 --- a/modules/java/generator/gen_java.py +++ b/modules/java/generator/gen_java.py @@ -71,7 +71,7 @@ const_ignore_list = ( "CV_CAP_PROP_GAIN", "CV_CAP_PROP_EXPOSURE", "CV_CAP_PROP_CONVERT_RGB", - "CV_CAP_PROP_WHITE_BALANCE_BLUE_U", + "CV_CAP_PROP_WHITE_BALANCE_U", "CV_CAP_PROP_RECTIFICATION", "CV_CAP_PROP_MONOCROME", "CV_CAP_PROP_SHARPNESS", @@ -80,7 +80,7 @@ const_ignore_list = ( "CV_CAP_PROP_TEMPERATURE", "CV_CAP_PROP_TRIGGER", "CV_CAP_PROP_TRIGGER_DELAY", - "CV_CAP_PROP_WHITE_BALANCE_RED_V", + "CV_CAP_PROP_WHITE_BALANCE_V", "CV_CAP_PROP_MAX_DC1394", "CV_CAP_GSTREAMER_QUEUE_LENGTH", "CV_CAP_PROP_PVAPI_MULTICASTIP",