Skip to content

Commit 854cc90

Browse files
committed
Update SDK to v1.10.8
1 parent 47cd605 commit 854cc90

File tree

11 files changed

+146
-18
lines changed

11 files changed

+146
-18
lines changed

orbbec_camera/SDK/include/libobsensor/h/ObTypes.h

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,11 @@ typedef struct DevicePresetListImpl ob_device_preset_list;
7777
#define OB_FORMAT_ANY OB_FORMAT_UNKNOWN
7878
#define OB_PROFILE_DEFAULT 0
7979

80+
#define OB_ACCEL_FULL_SCALE_RANGE_ANY OB_ACCEL_FS_UNKNOWN
81+
#define OB_ACCEL_SAMPLE_RATE_ANY OB_SAMPLE_RATE_UNKNOWN
82+
#define OB_GYRO_FULL_SCALE_RANGE_ANY OB_GYRO_FS_UNKNOWN
83+
#define OB_GYRO_SAMPLE_RATE_ANY OB_SAMPLE_RATE_UNKNOWN
84+
8085
/**
8186
* @brief send data or receive data return status type
8287
*/
@@ -458,7 +463,7 @@ typedef struct {
458463
OBCameraIntrinsic rgbIntrinsic; ///< Color camera internal parameters
459464
OBCameraDistortion depthDistortion; ///< Depth camera distortion parameters
460465
OBCameraDistortion rgbDistortion; ///< Color camera distortion parameters
461-
OBD2CTransform transform; ///< Rotation/transformation matrix
466+
OBD2CTransform transform; ///< Rotation/transformation matrix (from depth to color)
462467
bool isMirrored; ///< Whether the image frame corresponding to this group of parameters is mirrored
463468
} OBCameraParam, ob_camera_param;
464469

@@ -576,6 +581,7 @@ typedef enum {
576581
* @brief Enumeration of IMU sample rate values (gyroscope or accelerometer)
577582
*/
578583
typedef enum {
584+
OB_SAMPLE_RATE_UNKNOWN = 0, /**< Unknown sample rate */
579585
OB_SAMPLE_RATE_1_5625_HZ = 1, /**< 1.5625Hz */
580586
OB_SAMPLE_RATE_3_125_HZ, /**< 3.125Hz */
581587
OB_SAMPLE_RATE_6_25_HZ, /**< 6.25Hz */
@@ -598,25 +604,27 @@ typedef enum {
598604
* @brief Enumeration of gyroscope ranges
599605
*/
600606
typedef enum {
601-
OB_GYRO_FS_16dps = 1, /**< 16 degrees per second */
602-
OB_GYRO_FS_31dps, /**< 31 degrees per second */
603-
OB_GYRO_FS_62dps, /**< 62 degrees per second */
604-
OB_GYRO_FS_125dps, /**< 125 degrees per second */
605-
OB_GYRO_FS_250dps, /**< 250 degrees per second */
606-
OB_GYRO_FS_500dps, /**< 500 degrees per second */
607-
OB_GYRO_FS_1000dps, /**< 1000 degrees per second */
608-
OB_GYRO_FS_2000dps, /**< 2000 degrees per second */
607+
OB_GYRO_FS_UNKNOWN = 0, /**< Unknown range */
608+
OB_GYRO_FS_16dps = 1, /**< 16 degrees per second */
609+
OB_GYRO_FS_31dps, /**< 31 degrees per second */
610+
OB_GYRO_FS_62dps, /**< 62 degrees per second */
611+
OB_GYRO_FS_125dps, /**< 125 degrees per second */
612+
OB_GYRO_FS_250dps, /**< 250 degrees per second */
613+
OB_GYRO_FS_500dps, /**< 500 degrees per second */
614+
OB_GYRO_FS_1000dps, /**< 1000 degrees per second */
615+
OB_GYRO_FS_2000dps, /**< 2000 degrees per second */
609616
} OBGyroFullScaleRange,
610617
ob_gyro_full_scale_range, OB_GYRO_FULL_SCALE_RANGE;
611618

612619
/**
613620
* @brief Enumeration of accelerometer ranges
614621
*/
615622
typedef enum {
616-
OB_ACCEL_FS_2g = 1, /**< 1x the acceleration of gravity */
617-
OB_ACCEL_FS_4g, /**< 4x the acceleration of gravity */
618-
OB_ACCEL_FS_8g, /**< 8x the acceleration of gravity */
619-
OB_ACCEL_FS_16g, /**< 16x the acceleration of gravity */
623+
OB_ACCEL_FS_UNKNOWN = 0, /**< Unknown range */
624+
OB_ACCEL_FS_2g = 1, /**< 1x the acceleration of gravity */
625+
OB_ACCEL_FS_4g, /**< 4x the acceleration of gravity */
626+
OB_ACCEL_FS_8g, /**< 8x the acceleration of gravity */
627+
OB_ACCEL_FS_16g, /**< 16x the acceleration of gravity */
620628
} OBAccelFullScaleRange,
621629
ob_accel_full_scale_range, OB_ACCEL_FULL_SCALE_RANGE;
622630

@@ -995,7 +1003,6 @@ typedef struct {
9951003
uint16_t disp_diff;
9961004
OBDDONoiseRemovalType type;
9971005
} OBNoiseRemovalFilterParams, ob_noise_removal_filter_params;
998-
;
9991006

10001007
/**
10011008
* @brief Control command protocol version number

orbbec_camera/SDK/include/libobsensor/h/Pipeline.h

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,51 @@ void ob_delete_config(ob_config *config, ob_error **error);
263263
*/
264264
void ob_config_enable_stream(ob_config *config, ob_stream_profile *profile, ob_error **error);
265265

266+
/**
267+
* @brief Enable a video stream to be used in the configuration.
268+
*
269+
* This function configures and enables a video stream with specific parameters.
270+
* Users must specify all parameters explicitly as C does not support default arguments.
271+
* Refer to the product manual for details on supported resolutions and formats for different camera models.
272+
*
273+
* @param config Pointer to the configuration structure.
274+
* @param type The video stream type.
275+
* @param width The video stream width.
276+
* @param height The video stream height.
277+
* @param fps The video stream frame rate.
278+
* @param format The video stream format.
279+
* @param error Pointer to store the error if operation fails.
280+
*/
281+
void ob_config_enable_video_stream(ob_config *config, ob_stream_type type, int width, int height, int fps, ob_format format, ob_error **error);
282+
283+
/**
284+
* @brief Enable an accelerometer stream to be used in the configuration.
285+
*
286+
* This function configures and enables an accelerometer stream with specific parameters.
287+
* Users must specify all parameters explicitly. For details on available full-scale ranges and sample rates,
288+
* please refer to the product manual.
289+
*
290+
* @param config Pointer to the configuration structure.
291+
* @param fullScaleRange The full-scale range of the accelerometer.
292+
* @param sampleRate The sample rate of the accelerometer.
293+
* @param error Pointer to store the error if operation fails.
294+
*/
295+
void ob_config_enable_accel_stream(ob_config *config, ob_accel_full_scale_range full_scale_range, ob_accel_sample_rate sample_rate, ob_error **error);
296+
297+
/**
298+
* @brief Enable a gyroscope stream to be used in the configuration.
299+
*
300+
* This function configures and enables a gyroscope stream with specific parameters.
301+
* Users must specify all parameters explicitly. For details on available full-scale ranges and sample rates,
302+
* please refer to the product manual.
303+
*
304+
* @param config Pointer to the configuration structure.
305+
* @param fullScaleRange The full-scale range of the gyroscope.
306+
* @param sampleRate The sample rate of the gyroscope.
307+
* @param error Pointer to store the error if operation fails.
308+
*/
309+
void ob_config_enable_gyro_stream(ob_config *config, ob_gyro_full_scale_range full_scale_range, ob_gyro_sample_rate sample_rate, ob_error **error);
310+
266311
/**
267312
* @deprecated Use @ref ob_config_enable_stream instead
268313
* @brief Enable all streams in the pipeline configuration

orbbec_camera/SDK/include/libobsensor/h/Property.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,26 @@ typedef enum {
413413
*/
414414
OB_PROP_IR_BRIGHTNESS_INT = 184,
415415

416+
/**
417+
* @brief slave device sync status
418+
*/
419+
OB_PROP_SLAVE_DEVICE_SYNC_STATUS_BOOL = 188,
420+
421+
/**
422+
* @brief Color AE max exposure
423+
*/
424+
OB_PROP_COLOR_AE_MAX_EXPOSURE_INT = 189,
425+
426+
/**
427+
* @brief IR AE max exposure
428+
*/
429+
OB_PROP_IR_AE_MAX_EXPOSURE_INT = 190,
430+
431+
/**
432+
* @brief disparity search range mode
433+
*/
434+
OB_PROP_DISP_SEARCH_RANGE_MODE_INT = 191,
435+
416436
/**
417437
* @brief Baseline calibration parameters
418438
*/

orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -558,6 +558,13 @@ class OB_EXTENSION_API Device {
558558
*/
559559
const char *getCurrentPresetName();
560560

561+
/**
562+
* @brief Get current depth mode name
563+
* @brief According the current preset name to return current depth mode name
564+
* @return const char* return the current depth mode name.
565+
*/
566+
const char *getCurrentDepthModeName();
567+
561568
/**
562569
* @brief load the preset according to the preset name.
563570
* @attention After loading the preset, the settings in the preset will set to the device immediately. Therefore, it is recommended to re-read the device

orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ class OB_EXTENSION_API Pipeline {
6363
*/
6464
void start(std::shared_ptr<Config> config);
6565

66+
/**
67+
* @brief Start the pipeline with default configuration parameters
68+
*/
69+
void start();
70+
6671
/**
6772
* @brief Start the pipeline and set the frameset data callback
6873
*
@@ -76,6 +81,10 @@ class OB_EXTENSION_API Pipeline {
7681
*/
7782
void stop();
7883

84+
/**
85+
* @brief get Enabled Stream Profile List,It must be called after the pipeline is started, otherwise it will return an empty list
86+
*/
87+
std::shared_ptr<StreamProfileList> getEnabledStreamProfileList();
7988
/**
8089
* @brief Get the pipeline configuration parameters
8190
* @brief Returns the default configuration if the user has not configured it
@@ -90,7 +99,7 @@ class OB_EXTENSION_API Pipeline {
9099
* @param timeout_ms The waiting timeout in milliseconds
91100
* @return std::shared_ptr<FrameSet> The waiting frameset data
92101
*/
93-
std::shared_ptr<FrameSet> waitForFrames(uint32_t timeout_ms);
102+
std::shared_ptr<FrameSet> waitForFrames(uint32_t timeout_ms = 1000);
94103

95104
/**
96105
* @brief Get the device object
@@ -226,6 +235,46 @@ class OB_EXTENSION_API Config {
226235
*/
227236
void enableAllStream();
228237

238+
/**
239+
* @brief Enable a video stream to be used in the pipeline.
240+
*
241+
* This function allows users to enable a video stream with customizable parameters.
242+
* If no parameters are specified, the stream will be enabled with default resolution settings.
243+
* Users who wish to set custom resolutions should refer to the product manual, as available resolutions vary by camera model.
244+
*
245+
* @param type The video stream type.
246+
* @param width The video stream width (default is OB_WIDTH_ANY, which selects the default resolution).
247+
* @param height The video stream height (default is OB_HEIGHT_ANY, which selects the default resolution).
248+
* @param fps The video stream frame rate (default is OB_FPS_ANY, which selects the default frame rate).
249+
* @param format The video stream format (default is OB_FORMAT_ANY, which selects the default format).
250+
*/
251+
void enableVideoStream(ob_stream_type type, int width = OB_WIDTH_ANY, int height = OB_HEIGHT_ANY, int fps = OB_FPS_ANY, OBFormat format = OB_FORMAT_ANY);
252+
253+
/**
254+
* @brief Enable an accelerometer stream to be used in the pipeline.
255+
*
256+
* This function allows users to enable an accelerometer stream with customizable parameters.
257+
* If no parameters are specified, the stream will be enabled with default settings.
258+
* Users who wish to set custom full-scale ranges or sample rates should refer to the product manual, as available settings vary by device model.
259+
*
260+
* @param fullScaleRange The full-scale range of the accelerometer (default is OB_ACCEL_FULL_SCALE_RANGE_ANY, which selects the default range).
261+
* @param sampleRate The sample rate of the accelerometer (default is OB_ACCEL_SAMPLE_RATE_ANY, which selects the default rate).
262+
*/
263+
void enableAccelStream(ob_accel_full_scale_range fullScaleRange = OB_ACCEL_FULL_SCALE_RANGE_ANY,
264+
ob_accel_sample_rate sampleRate = OB_ACCEL_SAMPLE_RATE_ANY);
265+
266+
/**
267+
* @brief Enable a gyroscope stream to be used in the pipeline.
268+
*
269+
* This function allows users to enable a gyroscope stream with customizable parameters.
270+
* If no parameters are specified, the stream will be enabled with default settings.
271+
* Users who wish to set custom full-scale ranges or sample rates should refer to the product manual, as available settings vary by device model.
272+
*
273+
* @param fullScaleRange The full-scale range of the gyroscope (default is OB_GYRO_FULL_SCALE_RANGE_ANY, which selects the default range).
274+
* @param sampleRate The sample rate of the gyroscope (default is OB_GYRO_SAMPLE_RATE_ANY, which selects the default rate).
275+
*/
276+
void enableGyroStream(ob_gyro_full_scale_range fullScaleRange = OB_GYRO_FULL_SCALE_RANGE_ANY, ob_gyro_sample_rate sampleRate = OB_GYRO_SAMPLE_RATE_ANY);
277+
229278
/**
230279
* @brief Disable a stream to be used in the pipeline
231280
*
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libOrbbecSDK.so.1.10.7
1+
libOrbbecSDK.so.1.10.8
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libOrbbecSDK.so.1.10.7
1+
libOrbbecSDK.so.1.10.8
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
libOrbbecSDK.so.1.10.7
1+
libOrbbecSDK.so.1.10.8

0 commit comments

Comments
 (0)