diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index ccd6c06378..cff796d997 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -254,30 +254,159 @@ enum { CAP_PVAPI_PIXELFORMAT_MONO8 = 1, // Mono8 CAP_PVAPI_PIXELFORMAT_BGRA32 = 8, // Bgra32 }; -// Properties of cameras available through XIMEA SDK interface -enum { CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping. - CAP_PROP_XI_DATA_FORMAT = 401, // Output data format. - CAP_PROP_XI_OFFSET_X = 402, // Horizontal offset from the origin to the area of interest (in pixels). - CAP_PROP_XI_OFFSET_Y = 403, // Vertical offset from the origin to the area of interest (in pixels). - CAP_PROP_XI_TRG_SOURCE = 404, // Defines source of trigger. - CAP_PROP_XI_TRG_SOFTWARE = 405, // Generates an internal trigger. PRM_TRG_SOURCE must be set to TRG_SOFTWARE. - CAP_PROP_XI_GPI_SELECTOR = 406, // Selects general purpose input - CAP_PROP_XI_GPI_MODE = 407, // Set general purpose input mode - CAP_PROP_XI_GPI_LEVEL = 408, // Get general purpose level - CAP_PROP_XI_GPO_SELECTOR = 409, // Selects general purpose output - CAP_PROP_XI_GPO_MODE = 410, // Set general purpose output mode - CAP_PROP_XI_LED_SELECTOR = 411, // Selects camera signalling LED - CAP_PROP_XI_LED_MODE = 412, // Define camera signalling LED functionality - CAP_PROP_XI_MANUAL_WB = 413, // Calculates White Balance(must be called during acquisition) - CAP_PROP_XI_AUTO_WB = 414, // Automatic white balance - CAP_PROP_XI_AEAG = 415, // Automatic exposure/gain - CAP_PROP_XI_EXP_PRIORITY = 416, // Exposure priority (0.5 - exposure 50%, gain 50%). - CAP_PROP_XI_AE_MAX_LIMIT = 417, // Maximum limit of exposure in AEAG procedure - CAP_PROP_XI_AG_MAX_LIMIT = 418, // Maximum limit of gain in AEAG procedure - CAP_PROP_XI_AEAG_LEVEL = 419, // Average intensity of output signal AEAG should achieve(in %) - CAP_PROP_XI_TIMEOUT = 420 // Image capture timeout in milliseconds + // Properties of cameras available through XIMEA SDK interface +enum { CAP_PROP_XI_DOWNSAMPLING = 400, // Change image resolution by binning or skipping. + CAP_PROP_XI_DATA_FORMAT = 401, // Output data format. + CAP_PROP_XI_OFFSET_X = 402, // Horizontal offset from the origin to the area of interest (in pixels). + CAP_PROP_XI_OFFSET_Y = 403, // Vertical offset from the origin to the area of interest (in pixels). + CAP_PROP_XI_TRG_SOURCE = 404, // Defines source of trigger. + CAP_PROP_XI_TRG_SOFTWARE = 405, // Generates an internal trigger. PRM_TRG_SOURCE must be set to TRG_SOFTWARE. + CAP_PROP_XI_GPI_SELECTOR = 406, // Selects general purpose input + CAP_PROP_XI_GPI_MODE = 407, // Set general purpose input mode + CAP_PROP_XI_GPI_LEVEL = 408, // Get general purpose level + CAP_PROP_XI_GPO_SELECTOR = 409, // Selects general purpose output + CAP_PROP_XI_GPO_MODE = 410, // Set general purpose output mode + CAP_PROP_XI_LED_SELECTOR = 411, // Selects camera signalling LED + CAP_PROP_XI_LED_MODE = 412, // Define camera signalling LED functionality + CAP_PROP_XI_MANUAL_WB = 413, // Calculates White Balance(must be called during acquisition) + CAP_PROP_XI_AUTO_WB = 414, // Automatic white balance + CAP_PROP_XI_AEAG = 415, // Automatic exposure/gain + CAP_PROP_XI_EXP_PRIORITY = 416, // Exposure priority (0.5 - exposure 50%, gain 50%). + CAP_PROP_XI_AE_MAX_LIMIT = 417, // Maximum limit of exposure in AEAG procedure + CAP_PROP_XI_AG_MAX_LIMIT = 418, // Maximum limit of gain in AEAG procedure + CAP_PROP_XI_AEAG_LEVEL = 419, // Average intensity of output signal AEAG should achieve(in %) + CAP_PROP_XI_TIMEOUT = 420, // Image capture timeout in milliseconds + CAP_PROP_XI_EXPOSURE = 421, // Exposure time in microseconds + CAP_PROP_XI_EXPOSURE_BURST_COUNT = 422, // Sets the number of times of exposure in one frame. + CAP_PROP_XI_GAIN_SELECTOR = 423, // Gain selector for parameter Gain allows to select different type of gains. + CAP_PROP_XI_GAIN = 424, // Gain in dB + CAP_PROP_XI_DOWNSAMPLING_TYPE = 426, // Change image downsampling type. + CAP_PROP_XI_BINNING_SELECTOR = 427, // Binning engine selector. + CAP_PROP_XI_BINNING_VERTICAL = 428, // Vertical Binning - number of vertical photo-sensitive cells to combine together. + CAP_PROP_XI_BINNING_HORIZONTAL = 429, // Horizontal Binning - number of horizontal photo-sensitive cells to combine together. + CAP_PROP_XI_BINNING_PATTERN = 430, // Binning pattern type. + CAP_PROP_XI_DECIMATION_SELECTOR = 431, // Decimation engine selector. + CAP_PROP_XI_DECIMATION_VERTICAL = 432, // Vertical Decimation - vertical sub-sampling of the image - reduces the vertical resolution of the image by the specified vertical decimation factor. + CAP_PROP_XI_DECIMATION_HORIZONTAL = 433, // Horizontal Decimation - horizontal sub-sampling of the image - reduces the horizontal resolution of the image by the specified vertical decimation factor. + CAP_PROP_XI_DECIMATION_PATTERN = 434, // Decimation pattern type. + CAP_PROP_XI_TEST_PATTERN_GENERATOR_SELECTOR = 587, // Selects which test pattern generator is controlled by the TestPattern feature. + CAP_PROP_XI_TEST_PATTERN = 588, // Selects which test pattern type is generated by the selected generator. + CAP_PROP_XI_IMAGE_DATA_FORMAT = 435, // Output data format. + CAP_PROP_XI_SHUTTER_TYPE = 436, // Change sensor shutter type(CMOS sensor). + CAP_PROP_XI_SENSOR_TAPS = 437, // Number of taps + CAP_PROP_XI_AEAG_ROI_OFFSET_X = 439, // Automatic exposure/gain ROI offset X + CAP_PROP_XI_AEAG_ROI_OFFSET_Y = 440, // Automatic exposure/gain ROI offset Y + CAP_PROP_XI_AEAG_ROI_WIDTH = 441, // Automatic exposure/gain ROI Width + CAP_PROP_XI_AEAG_ROI_HEIGHT = 442, // Automatic exposure/gain ROI Height + CAP_PROP_XI_BPC = 445, // Correction of bad pixels + CAP_PROP_XI_WB_KR = 448, // White balance red coefficient + CAP_PROP_XI_WB_KG = 449, // White balance green coefficient + CAP_PROP_XI_WB_KB = 450, // White balance blue coefficient + CAP_PROP_XI_WIDTH = 451, // Width of the Image provided by the device (in pixels). + CAP_PROP_XI_HEIGHT = 452, // Height of the Image provided by the device (in pixels). + CAP_PROP_XI_REGION_SELECTOR = 589, // Selects Region in Multiple ROI which parameters are set by width, height, ... ,region mode + CAP_PROP_XI_REGION_MODE = 595, // Activates/deactivates Region selected by Region Selector + CAP_PROP_XI_LIMIT_BANDWIDTH = 459, // Set/get bandwidth(datarate)(in Megabits) + CAP_PROP_XI_SENSOR_DATA_BIT_DEPTH = 460, // Sensor output data bit depth. + CAP_PROP_XI_OUTPUT_DATA_BIT_DEPTH = 461, // Device output data bit depth. + CAP_PROP_XI_IMAGE_DATA_BIT_DEPTH = 462, // bitdepth of data returned by function xiGetImage + CAP_PROP_XI_OUTPUT_DATA_PACKING = 463, // Device output data packing (or grouping) enabled. Packing could be enabled if output_data_bit_depth > 8 and packing capability is available. + CAP_PROP_XI_OUTPUT_DATA_PACKING_TYPE = 464, // Data packing type. Some cameras supports only specific packing type. + CAP_PROP_XI_IS_COOLED = 465, // Returns 1 for cameras that support cooling. + CAP_PROP_XI_COOLING = 466, // Start camera cooling. + CAP_PROP_XI_TARGET_TEMP = 467, // Set sensor target temperature for cooling. + CAP_PROP_XI_CHIP_TEMP = 468, // Camera sensor temperature + CAP_PROP_XI_HOUS_TEMP = 469, // Camera housing tepmerature + CAP_PROP_XI_HOUS_BACK_SIDE_TEMP = 590, // Camera housing back side tepmerature + CAP_PROP_XI_CMS = 470, // Mode of color management system. + CAP_PROP_XI_APPLY_CMS = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). + CAP_PROP_XI_IMAGE_IS_COLOR = 474, // Returns 1 for color cameras. + CAP_PROP_XI_COLOR_FILTER_ARRAY = 475, // Returns color filter array type of RAW data. + CAP_PROP_XI_GAMMAY = 476, // Luminosity gamma + CAP_PROP_XI_GAMMAC = 477, // Chromaticity gamma + CAP_PROP_XI_SHARPNESS = 478, // Sharpness Strenght + CAP_PROP_XI_CC_MATRIX_00 = 479, // Color Correction Matrix element [0][0] + CAP_PROP_XI_CC_MATRIX_01 = 480, // Color Correction Matrix element [0][1] + CAP_PROP_XI_CC_MATRIX_02 = 481, // Color Correction Matrix element [0][2] + CAP_PROP_XI_CC_MATRIX_03 = 482, // Color Correction Matrix element [0][3] + CAP_PROP_XI_CC_MATRIX_10 = 483, // Color Correction Matrix element [1][0] + CAP_PROP_XI_CC_MATRIX_11 = 484, // Color Correction Matrix element [1][1] + CAP_PROP_XI_CC_MATRIX_12 = 485, // Color Correction Matrix element [1][2] + CAP_PROP_XI_CC_MATRIX_13 = 486, // Color Correction Matrix element [1][3] + CAP_PROP_XI_CC_MATRIX_20 = 487, // Color Correction Matrix element [2][0] + CAP_PROP_XI_CC_MATRIX_21 = 488, // Color Correction Matrix element [2][1] + CAP_PROP_XI_CC_MATRIX_22 = 489, // Color Correction Matrix element [2][2] + CAP_PROP_XI_CC_MATRIX_23 = 490, // Color Correction Matrix element [2][3] + CAP_PROP_XI_CC_MATRIX_30 = 491, // Color Correction Matrix element [3][0] + CAP_PROP_XI_CC_MATRIX_31 = 492, // Color Correction Matrix element [3][1] + CAP_PROP_XI_CC_MATRIX_32 = 493, // Color Correction Matrix element [3][2] + CAP_PROP_XI_CC_MATRIX_33 = 494, // Color Correction Matrix element [3][3] + CAP_PROP_XI_DEFAULT_CC_MATRIX = 495, // Set default Color Correction Matrix + CAP_PROP_XI_TRG_SELECTOR = 498, // Selects the type of trigger. + CAP_PROP_XI_ACQ_FRAME_BURST_COUNT = 499, // Sets number of frames acquired by burst. This burst is used only if trigger is set to FrameBurstStart + CAP_PROP_XI_DEBOUNCE_EN = 507, // Enable/Disable debounce to selected GPI + CAP_PROP_XI_DEBOUNCE_T0 = 508, // Debounce time (x * 10us) + CAP_PROP_XI_DEBOUNCE_T1 = 509, // Debounce time (x * 10us) + CAP_PROP_XI_DEBOUNCE_POL = 510, // Debounce polarity (pol = 1 t0 - falling edge, t1 - rising edge) + CAP_PROP_XI_LENS_MODE = 511, // Status of lens control interface. This shall be set to XI_ON before any Lens operations. + CAP_PROP_XI_LENS_APERTURE_VALUE = 512, // Current lens aperture value in stops. Examples: 2.8, 4, 5.6, 8, 11 + CAP_PROP_XI_LENS_FOCUS_MOVEMENT_VALUE = 513, // Lens current focus movement value to be used by XI_PRM_LENS_FOCUS_MOVE in motor steps. + CAP_PROP_XI_LENS_FOCUS_MOVE = 514, // Moves lens focus motor by steps set in XI_PRM_LENS_FOCUS_MOVEMENT_VALUE. + CAP_PROP_XI_LENS_FOCUS_DISTANCE = 515, // Lens focus distance in cm. + CAP_PROP_XI_LENS_FOCAL_LENGTH = 516, // Lens focal distance in mm. + CAP_PROP_XI_LENS_FEATURE_SELECTOR = 517, // Selects the current feature which is accessible by XI_PRM_LENS_FEATURE. + CAP_PROP_XI_LENS_FEATURE = 518, // Allows access to lens feature value currently selected by XI_PRM_LENS_FEATURE_SELECTOR. + CAP_PROP_XI_DEVICE_MODEL_ID = 521, // Return device model id + CAP_PROP_XI_DEVICE_SN = 522, // Return device serial number + CAP_PROP_XI_IMAGE_DATA_FORMAT_RGB32_ALPHA = 529, // The alpha channel of RGB32 output image format. + CAP_PROP_XI_IMAGE_PAYLOAD_SIZE = 530, // Buffer size in bytes sufficient for output image returned by xiGetImage + CAP_PROP_XI_TRANSPORT_PIXEL_FORMAT = 531, // Current format of pixels on transport layer. + CAP_PROP_XI_SENSOR_CLOCK_FREQ_HZ = 532, // Sensor clock frequency in Hz. + CAP_PROP_XI_SENSOR_CLOCK_FREQ_INDEX = 533, // Sensor clock frequency index. Sensor with selected frequencies have possibility to set the frequency only by this index. + CAP_PROP_XI_SENSOR_OUTPUT_CHANNEL_COUNT = 534, // Number of output channels from sensor used for data transfer. + CAP_PROP_XI_FRAMERATE = 535, // Define framerate in Hz + CAP_PROP_XI_COUNTER_SELECTOR = 536, // Select counter + CAP_PROP_XI_COUNTER_VALUE = 537, // Counter status + CAP_PROP_XI_ACQ_TIMING_MODE = 538, // Type of sensor frames timing. + CAP_PROP_XI_AVAILABLE_BANDWIDTH = 539, // Calculate and return available interface bandwidth(int Megabits) + CAP_PROP_XI_BUFFER_POLICY = 540, // Data move policy + CAP_PROP_XI_LUT_EN = 541, // Activates LUT. + CAP_PROP_XI_LUT_INDEX = 542, // Control the index (offset) of the coefficient to access in the LUT. + CAP_PROP_XI_LUT_VALUE = 543, // Value at entry LUTIndex of the LUT + CAP_PROP_XI_TRG_DELAY = 544, // Specifies the delay in microseconds (us) to apply after the trigger reception before activating it. + CAP_PROP_XI_TS_RST_MODE = 545, // Defines how time stamp reset engine will be armed + CAP_PROP_XI_TS_RST_SOURCE = 546, // Defines which source will be used for timestamp reset. Writing this parameter will trigger settings of engine (arming) + CAP_PROP_XI_IS_DEVICE_EXIST = 547, // Returns 1 if camera connected and works properly. + CAP_PROP_XI_ACQ_BUFFER_SIZE = 548, // Acquisition buffer size in buffer_size_unit. Default bytes. + CAP_PROP_XI_ACQ_BUFFER_SIZE_UNIT = 549, // Acquisition buffer size unit in bytes. Default 1. E.g. Value 1024 means that buffer_size is in KiBytes + CAP_PROP_XI_ACQ_TRANSPORT_BUFFER_SIZE = 550, // Acquisition transport buffer size in bytes + CAP_PROP_XI_BUFFERS_QUEUE_SIZE = 551, // Queue of field/frame buffers + CAP_PROP_XI_ACQ_TRANSPORT_BUFFER_COMMIT = 552, // Number of buffers to commit to low level + CAP_PROP_XI_RECENT_FRAME = 553, // GetImage returns most recent frame + CAP_PROP_XI_DEVICE_RESET = 554, // Resets the camera to default state. + CAP_PROP_XI_COLUMN_FPN_CORRECTION = 555, // Correction of column FPN + CAP_PROP_XI_ROW_FPN_CORRECTION = 591, // Correction of row FPN + CAP_PROP_XI_SENSOR_MODE = 558, // Current sensor mode. Allows to select sensor mode by one integer. Setting of this parameter affects: image dimensions and downsampling. + CAP_PROP_XI_HDR = 559, // Enable High Dynamic Range feature. + CAP_PROP_XI_HDR_KNEEPOINT_COUNT = 560, // The number of kneepoints in the PWLR. + CAP_PROP_XI_HDR_T1 = 561, // position of first kneepoint(in % of XI_PRM_EXPOSURE) + CAP_PROP_XI_HDR_T2 = 562, // position of second kneepoint (in % of XI_PRM_EXPOSURE) + CAP_PROP_XI_KNEEPOINT1 = 563, // value of first kneepoint (% of sensor saturation) + CAP_PROP_XI_KNEEPOINT2 = 564, // value of second kneepoint (% of sensor saturation) + CAP_PROP_XI_IMAGE_BLACK_LEVEL = 565, // Last image black level counts. Can be used for Offline processing to recall it. + CAP_PROP_XI_HW_REVISION = 571, // Returns hardware revision number. + CAP_PROP_XI_DEBUG_LEVEL = 572, // Set debug level + CAP_PROP_XI_AUTO_BANDWIDTH_CALCULATION = 573, // Automatic bandwidth calculation, + CAP_PROP_XI_FFS_FILE_ID = 594, // File number. + CAP_PROP_XI_FFS_FILE_SIZE = 580, // Size of file. + CAP_PROP_XI_FREE_FFS_SIZE = 581, // Size of free camera FFS. + CAP_PROP_XI_USED_FFS_SIZE = 582, // Size of used camera FFS. + CAP_PROP_XI_FFS_ACCESS_KEY = 583, // Setting of key enables file operations on some cameras. + CAP_PROP_XI_SENSOR_FEATURE_SELECTOR = 585, // Selects the current feature which is accessible by XI_PRM_SENSOR_FEATURE_VALUE. + CAP_PROP_XI_SENSOR_FEATURE_VALUE = 586, // Allows access to sensor feature value currently selected by XI_PRM_SENSOR_FEATURE_SELECTOR. }; + // Properties of cameras available through AVFOUNDATION interface enum { CAP_PROP_IOS_DEVICE_FOCUS = 9001, CAP_PROP_IOS_DEVICE_EXPOSURE = 9002, diff --git a/modules/videoio/include/opencv2/videoio/videoio_c.h b/modules/videoio/include/opencv2/videoio/videoio_c.h index 47f46fa76a..8d2af30210 100644 --- a/modules/videoio/include/opencv2/videoio/videoio_c.h +++ b/modules/videoio/include/opencv2/videoio/videoio_c.h @@ -274,6 +274,8 @@ enum CV_CAP_PROP_XI_DECIMATION_VERTICAL = 432, // Vertical Decimation - vertical sub-sampling of the image - reduces the vertical resolution of the image by the specified vertical decimation factor. CV_CAP_PROP_XI_DECIMATION_HORIZONTAL = 433, // Horizontal Decimation - horizontal sub-sampling of the image - reduces the horizontal resolution of the image by the specified vertical decimation factor. CV_CAP_PROP_XI_DECIMATION_PATTERN = 434, // Decimation pattern type. + CV_CAP_PROP_XI_TEST_PATTERN_GENERATOR_SELECTOR = 587, // Selects which test pattern generator is controlled by the TestPattern feature. + CV_CAP_PROP_XI_TEST_PATTERN = 588, // Selects which test pattern type is generated by the selected generator. CV_CAP_PROP_XI_IMAGE_DATA_FORMAT = 435, // Output data format. CV_CAP_PROP_XI_SHUTTER_TYPE = 436, // Change sensor shutter type(CMOS sensor). CV_CAP_PROP_XI_SENSOR_TAPS = 437, // Number of taps @@ -287,6 +289,8 @@ enum CV_CAP_PROP_XI_WB_KB = 450, // White balance blue coefficient CV_CAP_PROP_XI_WIDTH = 451, // Width of the Image provided by the device (in pixels). CV_CAP_PROP_XI_HEIGHT = 452, // Height of the Image provided by the device (in pixels). + CV_CAP_PROP_XI_REGION_SELECTOR = 589, // Selects Region in Multiple ROI which parameters are set by width, height, ... ,region mode + CV_CAP_PROP_XI_REGION_MODE = 595, // Activates/deactivates Region selected by Region Selector CV_CAP_PROP_XI_LIMIT_BANDWIDTH = 459, // Set/get bandwidth(datarate)(in Megabits) CV_CAP_PROP_XI_SENSOR_DATA_BIT_DEPTH = 460, // Sensor output data bit depth. CV_CAP_PROP_XI_OUTPUT_DATA_BIT_DEPTH = 461, // Device output data bit depth. @@ -298,6 +302,7 @@ enum CV_CAP_PROP_XI_TARGET_TEMP = 467, // Set sensor target temperature for cooling. CV_CAP_PROP_XI_CHIP_TEMP = 468, // Camera sensor temperature CV_CAP_PROP_XI_HOUS_TEMP = 469, // Camera housing tepmerature + CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP = 590, // Camera housing back side tepmerature CV_CAP_PROP_XI_CMS = 470, // Mode of color management system. CV_CAP_PROP_XI_APPLY_CMS = 471, // Enable applying of CMS profiles to xiGetImage (see XI_PRM_INPUT_CMS_PROFILE, XI_PRM_OUTPUT_CMS_PROFILE). CV_CAP_PROP_XI_IMAGE_IS_COLOR = 474, // Returns 1 for color cameras. @@ -365,6 +370,7 @@ enum CV_CAP_PROP_XI_RECENT_FRAME = 553, // GetImage returns most recent frame CV_CAP_PROP_XI_DEVICE_RESET = 554, // Resets the camera to default state. CV_CAP_PROP_XI_COLUMN_FPN_CORRECTION = 555, // Correction of column FPN + CV_CAP_PROP_XI_ROW_FPN_CORRECTION = 591, // Correction of row FPN CV_CAP_PROP_XI_SENSOR_MODE = 558, // Current sensor mode. Allows to select sensor mode by one integer. Setting of this parameter affects: image dimensions and downsampling. CV_CAP_PROP_XI_HDR = 559, // Enable High Dynamic Range feature. CV_CAP_PROP_XI_HDR_KNEEPOINT_COUNT = 560, // The number of kneepoints in the PWLR. @@ -376,6 +382,8 @@ enum CV_CAP_PROP_XI_HW_REVISION = 571, // Returns hardware revision number. CV_CAP_PROP_XI_DEBUG_LEVEL = 572, // Set debug level CV_CAP_PROP_XI_AUTO_BANDWIDTH_CALCULATION = 573, // Automatic bandwidth calculation, + CV_CAP_PROP_XI_FFS_FILE_ID = 594, // File number. + CV_CAP_PROP_XI_FFS_FILE_SIZE = 580, // Size of file. CV_CAP_PROP_XI_FREE_FFS_SIZE = 581, // Size of free camera FFS. CV_CAP_PROP_XI_USED_FFS_SIZE = 582, // Size of used camera FFS. CV_CAP_PROP_XI_FFS_ACCESS_KEY = 583, // Setting of key enables file operations on some cameras. diff --git a/modules/videoio/src/cap_ximea.cpp b/modules/videoio/src/cap_ximea.cpp index e111e69b7a..cf0a016fb7 100644 --- a/modules/videoio/src/cap_ximea.cpp +++ b/modules/videoio/src/cap_ximea.cpp @@ -399,6 +399,16 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) value_type = xiTypeEnum; doAcqReset = true; break; + case CV_CAP_PROP_XI_TEST_PATTERN_GENERATOR_SELECTOR: + ximea_param = "test_pattern_generator_selector"; + value_type = xiTypeEnum; + doAcqReset = true; + break; + case CV_CAP_PROP_XI_TEST_PATTERN: + ximea_param = "test_pattern"; + value_type = xiTypeEnum; + doAcqReset = true; + break; case CV_CAP_PROP_XI_IMAGE_DATA_FORMAT: ximea_param = "imgdataformat"; value_type = xiTypeEnum; @@ -478,6 +488,16 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) value_type = xiTypeInteger; doAcqReset = true; break; + case CV_CAP_PROP_XI_REGION_SELECTOR : + ximea_param = "region_selector"; + value_type = xiTypeInteger; + doAcqReset = true; + break; + case CV_CAP_PROP_XI_REGION_MODE : + ximea_param = "region_mode"; + value_type = xiTypeInteger; + doAcqReset = true; + break; case CV_CAP_PROP_XI_EXP_PRIORITY: ximea_param = "exp_priority"; value_type = xiTypeFloat; @@ -544,6 +564,10 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) ximea_param = "hous_temp"; value_type = xiTypeFloat; break; + case CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP: + ximea_param = "hous_back_side_temp"; + value_type = xiTypeFloat; + break; case CV_CAP_PROP_XI_CMS: ximea_param = "cms"; value_type = xiTypeEnum; @@ -820,22 +844,27 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) case CV_CAP_PROP_XI_ACQ_BUFFER_SIZE: ximea_param = "acq_buffer_size"; value_type = xiTypeInteger; + doAcqReset = true; break; case CV_CAP_PROP_XI_ACQ_BUFFER_SIZE_UNIT: ximea_param = "acq_buffer_size_unit"; value_type = xiTypeInteger; + doAcqReset = true; break; case CV_CAP_PROP_XI_ACQ_TRANSPORT_BUFFER_SIZE: ximea_param = "acq_transport_buffer_size"; value_type = xiTypeInteger; + doAcqReset = true; break; case CV_CAP_PROP_XI_BUFFERS_QUEUE_SIZE: ximea_param = "buffers_queue_size"; value_type = xiTypeInteger; + doAcqReset = true; break; case CV_CAP_PROP_XI_ACQ_TRANSPORT_BUFFER_COMMIT: ximea_param = "acq_transport_buffer_commit"; value_type = xiTypeInteger; + doAcqReset = true; break; case CV_CAP_PROP_XI_RECENT_FRAME: ximea_param = "recent_frame"; @@ -850,6 +879,10 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) ximea_param = "column_fpn_correction"; value_type = xiTypeEnum; break; + case CV_CAP_PROP_XI_ROW_FPN_CORRECTION: + ximea_param = "row_fpn_correction"; + value_type = xiTypeEnum; + break; case CV_CAP_PROP_XI_SENSOR_MODE: ximea_param = "sensor_mode"; value_type = xiTypeEnum; @@ -894,6 +927,14 @@ bool CvCaptureCAM_XIMEA::setProperty( int property_id, double value ) ximea_param = "auto_bandwidth_calculation"; value_type = xiTypeBoolean; break; + case CV_CAP_PROP_XI_FFS_FILE_ID: + ximea_param = "ffs_file_id"; + value_type = xiTypeInteger; + break; + case CV_CAP_PROP_XI_FFS_FILE_SIZE: + ximea_param = "ffs_file_size"; + value_type = xiTypeInteger; + break; case CV_CAP_PROP_XI_FREE_FFS_SIZE: ximea_param = "free_ffs_size"; value_type = xiTypeInteger; @@ -1042,6 +1083,14 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const ximea_param = "decimation_pattern"; value_type = xiTypeEnum; break; + case CV_CAP_PROP_XI_TEST_PATTERN_GENERATOR_SELECTOR: + ximea_param = "test_pattern_generator_selector"; + value_type = xiTypeEnum; + break; + case CV_CAP_PROP_XI_TEST_PATTERN: + ximea_param = "test_pattern"; + value_type = xiTypeEnum; + break; case CV_CAP_PROP_XI_IMAGE_DATA_FORMAT: ximea_param = "imgdataformat"; value_type = xiTypeEnum; @@ -1114,6 +1163,14 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const ximea_param = "offsetY"; value_type = xiTypeInteger; break; + case CV_CAP_PROP_XI_REGION_SELECTOR : + ximea_param = "region_selector"; + value_type = xiTypeInteger; + break; + case CV_CAP_PROP_XI_REGION_MODE : + ximea_param = "region_mode"; + value_type = xiTypeInteger; + break; case CV_CAP_PROP_XI_EXP_PRIORITY: ximea_param = "exp_priority"; value_type = xiTypeFloat; @@ -1174,6 +1231,10 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const ximea_param = "hous_temp"; value_type = xiTypeFloat; break; + case CV_CAP_PROP_XI_HOUS_BACK_SIDE_TEMP: + ximea_param = "hous_back_side_temp"; + value_type = xiTypeFloat; + break; case CV_CAP_PROP_XI_CMS: ximea_param = "cms"; value_type = xiTypeEnum; @@ -1478,6 +1539,10 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const ximea_param = "column_fpn_correction"; value_type = xiTypeEnum; break; + case CV_CAP_PROP_XI_ROW_FPN_CORRECTION: + ximea_param = "row_fpn_correction"; + value_type = xiTypeEnum; + break; case CV_CAP_PROP_XI_SENSOR_MODE: ximea_param = "sensor_mode"; value_type = xiTypeEnum; @@ -1522,6 +1587,14 @@ double CvCaptureCAM_XIMEA::getProperty( int property_id ) const ximea_param = "auto_bandwidth_calculation"; value_type = xiTypeBoolean; break; + case CV_CAP_PROP_XI_FFS_FILE_ID: + ximea_param = "ffs_file_id"; + value_type = xiTypeInteger; + break; + case CV_CAP_PROP_XI_FFS_FILE_SIZE: + ximea_param = "ffs_file_size"; + value_type = xiTypeInteger; + break; case CV_CAP_PROP_XI_FREE_FFS_SIZE: ximea_param = "free_ffs_size"; value_type = xiTypeInteger; @@ -1640,6 +1713,7 @@ void CvCaptureCAM_XIMEA::errMsg(const char* msg, int errNum) const case XI_BUFFER_SIZE_TOO_SMALL : error_message = "Buffer provided by user is too small"; break; case XI_COULDNT_INIT_PROCESSOR : error_message = "Couldnt initialize processor."; break; case XI_NOT_INITIALIZED : error_message = "The object/module/procedure/process being referred to has not been started."; break; + case XI_RESOURCE_NOT_FOUND : error_message = "Resource not found(could be processor, file, item..)."; break; case XI_UNKNOWN_PARAM : error_message = "Unknown parameter"; break; case XI_WRONG_PARAM_VALUE : error_message = "Wrong parameter value"; break; case XI_WRONG_PARAM_TYPE : error_message = "Wrong parameter type"; break;