diff --git a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h index 17363e18..3c360caf 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h +++ b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h @@ -16,11 +16,14 @@ #if(defined(WIN32) || defined(_WIN32) || defined(WINCE)) #ifdef OB_EXPORTS #define OB_EXTENSION_API __declspec(dllexport) +#define OB_EXTENSION_INTERNAL_API __declspec(dllexport) #else #define OB_EXTENSION_API __declspec(dllimport) +#define OB_EXTENSION_INTERNAL_API #endif #else #define OB_EXTENSION_API __attribute__((visibility("default"))) +#define OB_EXTENSION_INTERNAL_API #endif #if defined(__GNUC__) || defined(__clang__) @@ -245,13 +248,13 @@ typedef enum { OB_FORMAT_Y14 = 24, /**< \if English Y14 format, single channel 14bit depth (SDK will unpack into Y16 by default) \else Y14 格式，单通道 14bit 深度 (SDK 默认会解包成 Y16) \endif */ OB_FORMAT_BGRA = 25, /**< BGRA */ - OB_FORMAT_COMPRESSED = 26, /**< 压缩格式 */ + OB_FORMAT_COMPRESSED = 26, /**< \if English compressed format \else 压缩格式 \endif */ OB_FORMAT_UNKNOWN = 0xff, /**< \if English unknown format \else 未知格式 \endif */ } OBFormat, ob_format; -#define OB_FORMAT_RGB888 OB_FORMAT_RGB // 别名，用于兼容旧版本命名 -#define OB_FORMAT_MJPEG OB_FORMAT_MJPG // 别名，用于兼容旧版本命名 +#define OB_FORMAT_RGB888 OB_FORMAT_RGB // \if English Alias of OB_FORMAT_RGB for compatible \else 别名，用于兼容旧版本命名 \endif +#define OB_FORMAT_MJPEG OB_FORMAT_MJPG // \if English Alias of OB_FORMAT_MJPG for compatible \else 别名，用于兼容旧版本命名 \endif /** * \if English @@ -805,7 +808,7 @@ typedef struct { typedef enum { /** * \if English - * @brief Close Synchronize mode + * @brief Close synchronize mode * @brief Single device, neither process input trigger signal nor output trigger signal * @brief Each Sensor in a single device automatically triggers * \else @@ -819,7 +822,7 @@ typedef enum { /** * \if English - * @brief Standalone sychronize mode + * @brief Standalone synchronize mode * @brief Single device, neither process input trigger signal nor output trigger signal * @brief Inside single device, RGB as Major sensor: RGB -> IR/Depth/TOF * \else @@ -968,11 +971,11 @@ typedef struct { * @brief IR Trigger signal input delay: Used to configure the delay between the IR/Depth/TOF Sensor receiving the trigger signal and starting exposure, * Unit: microsecond * - * @attention This parameter is invalid when the synchronization MODE is set to @ref OB SYNC MODE HOST IR TRIGGER + * @attention This parameter is invalid when the synchronization MODE is set to @ref OB_SYNC_MODE_PRIMARY_IR_TRIGGER * \else * @brief IR 触发信号输入延时，用于 IR/Depth/TOF Sensor 接收到触发信号后到开始曝光的延时配置，单位为微秒 * - * @attention 同步模式配置为 @ref OB_SYNC_MODE_HOST_IR_TRIGGER 时无效 + * @attention 同步模式配置为 @ref OB_SYNC_MODE_PRIMARY_IR_TRIGGER 时无效 * \endif */ uint16_t irTriggerSignalInDelay; @@ -982,11 +985,11 @@ typedef struct { * @brief RGB trigger signal input delay is used to configure the delay from the time when an RGB Sensor receives the trigger signal to the time when the * exposure starts. Unit: microsecond * - * @attention This parameter is invalid when the synchronization MODE is set to @ref OB SYNC MODE HOST + * @attention This parameter is invalid when the synchronization MODE is set to @ref OB_SYNC_MODE_PRIMARY * \else * @brief RGB 触发信号输入延时，用于 RGB Sensor 接收到触发信号后到开始曝光的延时配置，单位为微秒 * - * @attention 同步模式配置为 @ref OB_SYNC_MODE_HOST 时无效 + * @attention 同步模式配置为 @ref OB_SYNC_MODE_PRIMARY 时无效 * \endif */ uint16_t rgbTriggerSignalInDelay; @@ -996,27 +999,26 @@ typedef struct { * @brief Device trigger signal output delay, used to control the delay configuration of the host device to output trigger signals or the slave device to * output trigger signals. Unit: microsecond * - * @attention This parameter is invalid when the synchronization MODE is set to @ref OB SYNC MODE CLOSE or @ref OB SYNC Mode SINGLE + * @attention This parameter is invalid when the synchronization MODE is set to @ref OB_SYNC_MODE_CLOSE or @ref OB_SYNC_MODE_STANDALONE * \else * @brief 设备触发信号输出延时，用于控制主机设备向外输 或 从机设备向外中继输出 触发信号的延时配置，单位：微秒 * - * @attention 同步模式配置为 @ref OB_SYNC_MODE_CLOSE 和 @ref OB_SYNC_MODE_SINGLE 时无效 + * @attention 同步模式配置为 @ref OB_SYNC_MODE_CLOSE 和 @ref OB_SYNC_MODE_STANDALONE 时无效 * \endif */ uint16_t deviceTriggerSignalOutDelay; /** * \if English - * @brief The device trigger signal output polarity is used to control the polarity configuration of the trigger signal output from the host device or the - * trigger signal output from the slave device + * @brief The device trigger signal output polarity * @brief 0: forward pulse; 1: negative pulse * - * @attention This parameter is invalid when the synchronization MODE is set to @ref OB SYNC MODE CLOSE or @ref OB SYNC Mode SINGLE + * @attention This parameter is invalid when the synchronization MODE is set to @ref OB_SYNC_MODE_CLOSE or @ref OB_SYNC_MODE_STANDALONE * \else - * @brief 设备触发信号输出极性，用于控制主机设备向外输 或 从机设备向外中继输出 触发信号的极性配置 + * @brief 设备触发信号输出极性 * @brief 0: 正向脉冲；1: 负向脉冲 * - * @attention 同步模式配置为 @ref OB_SYNC_MODE_CLOSE 和 @ref OB_SYNC_MODE_SINGLE 时无效 + * @attention 同步模式配置为 @ref OB_SYNC_MODE_CLOSE 和 @ref OB_SYNC_MODE_STANDALONE 时无效 * \endif */ uint16_t deviceTriggerSignalOutPolarity; @@ -1026,12 +1028,12 @@ typedef struct { * @brief MCU trigger frequency, used to configure the output frequency of MCU trigger signal in MCU master mode, unit: Hz * @brief This configuration will directly affect the image output frame rate of the Sensor. Unit: FPS （frame pre second） * - * @attention This parameter is invalid only when the synchronization MODE is set to @ref OB SYNC MODE HOST MCU TRIGGER + * @attention This parameter is invalid only when the synchronization MODE is set to @ref OB_SYNC_MODE_PRIMARY_MCU_TRIGGER * \else * @brief MCU 触发频率，用于 MCU 主模式下，MCU触发信号输出频率配置，单位：Hz * @brief 该配置会直接影响 Sensor 的图像输出帧率，即也可以认为单位为：FPS （frame pre second） * - * @attention 仅当同步模式配置为 @ref OB_SYNC_MODE_HOST_MCU_TRIGGER 时无效 + * @attention 仅当同步模式配置为 @ref OB_SYNC_MODE_PRIMARY_MCU_TRIGGER 时无效 * \endif */ uint16_t mcuTriggerFrequency; @@ -1071,13 +1073,17 @@ typedef struct { } OBDepthWorkMode, ob_depth_work_mode; /** + * \if English + * @brief Command version of device property + * \else * @brief 控制命令协议版本号 + * \endif * */ typedef struct { - uint8_t major; ///< 主版本号 - uint8_t minor; ///< 次版本号 - uint8_t patch; ///< 补丁版本 + uint8_t major; ///< \if English Major version number \else 主版本号 \endif + uint8_t minor; ///< \if English Minor version number \else 次版本号 \endif + uint8_t patch; ///< \if English Patch version number \else 补丁版本 \endif } OBProtocolVersion, ob_protocol_version; /** @@ -1102,8 +1108,21 @@ typedef enum { /** * \if English * Internal api, publish future. + * Description: Data type match OBCmdVersion of one propertyId + * 1. propertyId has multiple OBCmdVersion; different OBCmdVersion of this propertyId has different data type; + * propertyId && OBCmdVersion match only one data type. + * 2. itemCount is the number of data type contain in data bytes. + * 3. C language and C++ is difference. + * + * C language: + * data's type is an uint8_t pointer, user parse data to destionation type. + * itemTypeSize == 1，dataSize == itemCount； + * + * C++: + * data's type is the propertyId && OBCmdVersion's data type. + * itemTypeSize = sizeof(T)，itemCount = dataSize / itemTypeSize; * \else - * @brief OrbbecSDK私有接口 + * @brief OrbbecSDK私有接口, 未来对外开放 * 功能：保存多版本数据结构的数据内容； * 1. 通过propertyId和cmdVersion可以决定具体的数据类型； * 2. 通过itemCount可以决定data内容映射的对象数量； @@ -1118,13 +1137,13 @@ typedef enum { * \endif */ typedef struct OBDataBundle { - OBCmdVersion cmdVersion; ///< 与控制命令关联的数据结构的版本号 + OBCmdVersion cmdVersion; ///< \if English propertyId's OBCmdVersion \else 与控制命令关联的数据结构的版本号 \endif - void * data; ///< 数据内容，是一个数组，长度为 itemCount; void *data = new T[itemCount]; 数组元素类型为 T，类型 T 由 propertyId 和 cmdVersion 决定 - uint32_t dataSize; ///< data 的大小，单位：byte，dataSize == itemTypeSize * itemCount + void * data; ///< \if English Data contain which contain itemCount of element. void *data = new T[itemCount];\else 数据内容，是一个数组，长度为 itemCount; void *data = new T[itemCount]; 数组元素类型为 T，类型 T 由 propertyId 和 cmdVersion 决定 \endif + uint32_t dataSize; ///< \if English Data size. unit: byte. dataSize == itemTypeSize * itemCount \else data 的大小，单位：byte，dataSize == itemTypeSize * itemCount \endif - uint32_t itemTypeSize; ///< data 内容映射的目标对象的数据类型大小，C 语言：1，C++：sizeof(T) - uint32_t itemCount; ///< data 内容映射的目标对象数量，满足条件：itemCount = dataSize / itemTypeSize; 0 == dataSize % itemTypeSize; + uint32_t itemTypeSize; ///< \if English Size of data item. C language, itemTypeSize = 1, C++: itemTypeSize = sizeof(T) \else data 内容映射的目标对象的数据类型大小，C 语言：1，C++：sizeof(T) \endif + uint32_t itemCount; ///< \if English Count of data item. itemCount = dataSize / itemTypeSize; 0 == dataSize % itemTypeSize; \else data 内容映射的目标对象数量，满足条件：itemCount = dataSize / itemTypeSize; 0 == dataSize % itemTypeSize; \endif } OBDataBundle, ob_data_bundle; /** @@ -1356,21 +1375,33 @@ typedef void (*ob_frameset_callback)(ob_frame *frameset, void *user_data); typedef void(ob_frame_destroy_callback)(void *buffer, void *context); /** + * \if English + * @brief Check sensor_type is IR sensor, true: IR sensor, false: no IR sensor + * \else * @brief 判断是否为 IR Sensor + * \endif * */ #define is_ir_sensor(sensor_type) (sensor_type == OB_SENSOR_IR || sensor_type == OB_SENSOR_IR_LEFT || sensor_type == OB_SENSOR_IR_RIGHT) #define isIRSensor is_ir_sensor /** + * \if English + * @brief Check stream_type is IR stream, true: IR stream, false: no IR stream + * \else * @brief 判断是否为 IR 数据流 + * \endif * */ #define is_ir_stream(stream_type) (stream_type == OB_STREAM_IR || stream_type == OB_STREAM_IR_LEFT || stream_type == OB_STREAM_IR_RIGHT) #define isIRStream is_ir_stream /** + * \if English + * @brief Check frame_type is IR frame, true: IR frame, false: no IR frame + * \else * @brief 判断是否为 IR 数据帧 + * \endif * */ #define is_ir_frame(frame_type) (frame_type == OB_FRAME_IR || frame_type == OB_FRAME_IR_LEFT || frame_type == OB_FRAME_IR_RIGHT) diff --git a/orbbec_camera/SDK/include/libobsensor/h/Property.h b/orbbec_camera/SDK/include/libobsensor/h/Property.h index 21452df5..b7bddec9 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Property.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Property.h @@ -83,24 +83,25 @@ typedef enum { 自定义RGB裁剪开关，0为关闭，1为开启自定义裁剪，下发ROI裁剪区域\endif */ OB_PROP_DEVICE_WORK_MODE_INT = 95, /**< \if English Device operating mode (power consumption) \else 设备工作模式（功耗） \endif */ - OB_PROP_DEVICE_COMMUNICATION_TYPE_INT = 97, /**< 设备通信方式 0: USB; 1: Ethernet(RTSP)*/ - OB_PROP_SWITCH_IR_MODE_INT = 98, /**< 切换IR模式，0为主动IR模式,1为被动IR模式*/ - OB_PROP_LASER_ENERGY_LEVEL_INT = 99, /**< 激光能量层级 */ - OB_PROP_TIMER_RESET_SIGNAL_BOOL = 104, /**< 触发设备时间归零 */ - OB_PROP_TIMER_RESET_TRIGGLE_OUT_ENABLE_BOOL = 105, /**< 向外发送时间归零信号开关, true:打开, false: 关闭; 默认为true */ - OB_PROP_TIMER_RESET_DELAY_US_INT = 106, /**< 设置硬件时间归零延迟时间, 单位: 微妙 */ - OB_PROP_CAPTURE_IMAGE_SIGNAL_BOOL = 107, /**< 软触发信号, 触发抓拍图片 */ - OB_PROP_IR_RIGHT_MIRROR_BOOL = 112, /**< 右IR的镜像 */ - OB_PROP_CAPTURE_IMAGE_FRAME_NUMBER_INT = 113, /** 单次软触发抓拍的帧数, 范围：[1, 255] */ - OB_PROP_IR_RIGHT_FLIP_BOOL = 114, /**< 右IR的翻转, true：翻转,false：不翻转；默认为false */ - OB_PROP_COLOR_ROTATE_INT = 115, /**< 彩色旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 */ - OB_PROP_IR_ROTATE_INT = 116, /**< IR旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 */ - OB_PROP_IR_RIGHT_ROTATE_INT = 117, /**< 右IR旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 */ - OB_PROP_DEPTH_ROTATE_INT = 118, /**< 深度旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 */ + OB_PROP_DEVICE_COMMUNICATION_TYPE_INT = 97, /**< \if English Device communication type, 0: USB; 1: Ethernet(RTSP) \else 设备通信方式 0: USB; 1: Ethernet(RTSP)*/ + OB_PROP_SWITCH_IR_MODE_INT = 98, /**< \if English Switch IR mode, 0: IR active mode, 1: IR passive mode \else 切换IR模式，0为主动IR模式,1为被动IR模式 \endif */ + OB_PROP_LASER_ENERGY_LEVEL_INT = 99, /**< \if English Laser energy level \else 激光能量层级 \endif */ + OB_PROP_LDP_MEASURE_DISTANCE_INT = 100, /**< \if English LDP's measure distance, unit: mm \else 获取激光近距离保护的测量值，单位：mm \endif */ + OB_PROP_TIMER_RESET_SIGNAL_BOOL = 104, /**< \if English Reset device time to zero \else 触发设备时间归零 \endif */ + OB_PROP_TIMER_RESET_TRIGGLE_OUT_ENABLE_BOOL = 105, /**< \if English Enable send reset device time signal to other device. true: enable, false: disable \else 向外发送时间归零信号开关, true:打开, false: 关闭; 默认为true \endif */ + OB_PROP_TIMER_RESET_DELAY_US_INT = 106, /**< \if English Delay to reset device time, unit: us \else 设置硬件时间归零延迟时间, 单位: 微妙 \endif */ + OB_PROP_CAPTURE_IMAGE_SIGNAL_BOOL = 107, /**< \if English Signal to capture image \else 软触发信号, 触发抓拍图片 \endif */ + OB_PROP_IR_RIGHT_MIRROR_BOOL = 112, /**< \if English Right IR sensor mirror state \else 右IR的镜像 \endif */ + OB_PROP_CAPTURE_IMAGE_FRAME_NUMBER_INT = 113, /**< \if English Number frame to capture once a 'OB_PROP_CAPTURE_IMAGE_SIGNAL_BOOL' effect. range: [1, 255] \else 单次软触发抓拍的帧数, 范围：[1, 255] \endif */ + OB_PROP_IR_RIGHT_FLIP_BOOL = 114, /**< \if English Right IR sensor flip state. true: flip image, false: origin, default: false \else 右IR的翻转, true：翻转,false：不翻转；默认为false \endif */ + OB_PROP_COLOR_ROTATE_INT = 115, /**< \if English Color sensor rotation, angle{0, 90, 180, 270} \else 彩色旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 \endif */ + OB_PROP_IR_ROTATE_INT = 116, /**< \if English IR/Left-IR sensor rotation, angle{0, 90, 180, 270} \else IR旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 \endif */ + OB_PROP_IR_RIGHT_ROTATE_INT = 117, /**< \if English Right IR sensor rotation, angle{0, 90, 180, 270} \else 右IR旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 \endif */ + OB_PROP_DEPTH_ROTATE_INT = 118, /**< \if English Depth sensor rotation, angle{0, 90, 180, 270} \else 深度旋转, 翻转角度范围{0, 90, 180, 270}, 默认为0 \endif */ OB_PROP_LASER_HW_ENERGY_LEVEL_INT = - 119, /**< 查询激光硬件的实际能量层级, OB_PROP_LASER_ENERGY_LEVEL_INT（99）指令用于设置能级,该指令用于查询设置后硬件实际能级 */ - OB_PROP_USB_POWER_STATE_INT = 121, /**< USB供电状态，状态值枚举: OBUSBPowerState */ - OB_PROP_DC_POWER_STATE_INT = 122, /**< DC供电状态,状态值枚举: OBDCPowerState */ + 119, /**< \if Get hardware laser energy level which real state of laser element. OB_PROP_LASER_ENERGY_LEVEL_INT（99）will effect this command which it setting and changed the hardware laser energy level. \else 查询激光硬件的实际能量层级, OB_PROP_LASER_ENERGY_LEVEL_INT（99）指令用于设置能级,该指令用于查询设置后硬件实际能级 \endif*/ + OB_PROP_USB_POWER_STATE_INT = 121, /**< \if USB's power state, enum type: OBUSBPowerState \else USB供电状态，状态值枚举: OBUSBPowerState \endif */ + OB_PROP_DC_POWER_STATE_INT = 122, /**< \if DC's power state, enum type: OBDCPowerState \else DC供电状态,状态值枚举: OBDCPowerState \endif */ OB_STRUCT_BASELINE_CALIBRATION_PARAM = 1002, /**< \if English Baseline calibration parameters \else 基线标定参数 \endif */ OB_STRUCT_DEVICE_TEMPERATURE = 1003, /**< \if English Device temperature information \else 设备温度信息 \endif */ @@ -110,9 +111,9 @@ typedef enum { OB_STRUCT_MULTI_DEVICE_SYNC_CONFIG = 1038, /**< \if English Multi-device synchronization mode and parameter configuration \else 多设备同步模式和参数配置 \endif */ OB_STRUCT_RGB_CROP_ROI = 1040, /**< \if English RGB cropping ROI \else RGB裁剪ROI \endif */ - OB_STRUCT_DEVICE_IP_ADDR_CONFIG = 1041, /**< 设备ip地址配置 */ - OB_STRUCT_CURRENT_DEPTH_ALG_MODE = 1043, /**< 当前的相机深度模式 */ - OB_STRUCT_DEPTH_PRECISION_SUPPORT_LIST = 1045, /**< 深度精度等级列表，返回uin16_t数组，对应精度等级的枚举定义 */ + OB_STRUCT_DEVICE_IP_ADDR_CONFIG = 1041, /**< \if English Config device's IP address \else 设备ip地址配置 \endif */ + OB_STRUCT_CURRENT_DEPTH_ALG_MODE = 1043, /**< \if English Current depth work mode state \else 当前的相机深度模式 \endif */ + OB_STRUCT_DEPTH_PRECISION_SUPPORT_LIST = 1045, /**< \if English List of depth precision level, return: uint16_t array, unit16_t is value of enum OBDepthPrecisionLevel \else 深度精度等级列表，返回uin16_t数组，对应精度等级的枚举定义，枚举：OBDepthPrecisionLevel \endif */ OB_PROP_COLOR_AUTO_EXPOSURE_BOOL = 2000, /**< \if English Color camera auto exposure \else 彩色相机自动曝光 \endif */ OB_PROP_COLOR_EXPOSURE_INT = 2001, /**< \if English Color camera exposure adjustment \else 彩色相机曝光调节 \endif */ @@ -144,7 +145,7 @@ typedef enum { OB_PROP_IR_CHANNEL_DATA_SOURCE_INT = 2028, /**< \if English Select Infrared camera data source channel. If not support throw exception. 0 : IR stream from IR Left sensor; 1 : IR stream from IR Left sensor; \else 读写IR通道的输出目标sensor,不支持时返回错误。0: 左侧IR sensor,1: 右侧IR sensor; \endif */ OB_PROP_DEPTH_RM_FILTER_BOOL = 2029, /**< 深度效果去畸变, true：打开，false：关闭, 与D2C功能互斥。软硬件D2C开启时，不能使用mask功能 */ - OB_PROP_SDK_DISPARITY_TO_DEPTH_BOOL = 3004, /**< 视差转深度 */ + OB_PROP_SDK_DISPARITY_TO_DEPTH_BOOL = 3004, /**< \if English Software disparity to depth \else 视差转深度 \endif */ OB_PROP_SDK_DEPTH_FRAME_UNPACK_BOOL = 3007, /**< \if English Depth data unpacking function switch (each open stream will be turned on by default, support RLE/Y10/Y11/Y12/Y14 format) \else Depth数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) \endif */ @@ -153,8 +154,8 @@ typedef enum { Ir数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) \endif */ OB_PROP_SDK_ACCEL_FRAME_TRANSFORMED_BOOL = 3009, /**< Accel数据转换功能开关(默认打开) */ OB_PROP_SDK_GYRO_FRAME_TRANSFORMED_BOOL = 3010, /**< Gyro数据转换功能开关(默认打开) */ - OB_PROP_SDK_IR_LEFT_FRAME_UNPACK_BOOL = 3011, /**< [左]Ir数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) */ - OB_PROP_SDK_IR_RIGHT_FRAME_UNPACK_BOOL = 3012, /**< [右]Ir数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) */ + OB_PROP_SDK_IR_LEFT_FRAME_UNPACK_BOOL = 3011, /**< \if English left IR data unpacking function switch (each open stream will be turned on by default, support RLE/Y10/Y11/Y12/Y14 format)\else [左]Ir数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) \endif */ + OB_PROP_SDK_IR_RIGHT_FRAME_UNPACK_BOOL = 3012, /**< \if English right IR data unpacking function switch (each open stream will be turned on by default, support RLE/Y10/Y11/Y12/Y14 format)\else [右]Ir数据解包功能开关(每次开流都会默认打开，支持RLE/Y10/Y11/Y12/Y14格式) \endif */ OB_RAW_DATA_CAMERA_CALIB_JSON_FILE = 4029, /**< 从设备端读取的标定Json文件(Femto Mega, read only)*/ } OBPropertyID, ob_property_id; diff --git a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so deleted file mode 100644 index ac9dca9e..00000000 --- a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700 -size 76081276 diff --git a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so new file mode 120000 index 00000000..053f4098 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 deleted file mode 100644 index ac9dca9e..00000000 --- a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700 -size 76081276 diff --git a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 new file mode 120000 index 00000000..4673dca6 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5 @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5.6 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5.5 b/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5.5 deleted file mode 100644 index ac9dca9e..00000000 --- a/orbbec_camera/SDK/lib/arm/libOrbbecSDK.so.1.5.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700 -size 76081276 diff --git a/orbbec_camera/SDK/lib/arm/libudev.so b/orbbec_camera/SDK/lib/arm/libudev.so deleted file mode 100644 index 219aa8eb..00000000 --- a/orbbec_camera/SDK/lib/arm/libudev.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7d26d49c9b4070ae14c514fe7bdc92846c0b579a7a7c77ce63481ad0d26ae59 -size 569372 diff --git a/orbbec_camera/SDK/lib/arm/libudev.so b/orbbec_camera/SDK/lib/arm/libudev.so new file mode 120000 index 00000000..d38ce683 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm/libudev.so @@ -0,0 +1 @@ +libudev.so.1.6.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm/libudev.so.1 b/orbbec_camera/SDK/lib/arm/libudev.so.1 deleted file mode 100644 index 219aa8eb..00000000 --- a/orbbec_camera/SDK/lib/arm/libudev.so.1 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7d26d49c9b4070ae14c514fe7bdc92846c0b579a7a7c77ce63481ad0d26ae59 -size 569372 diff --git a/orbbec_camera/SDK/lib/arm/libudev.so.1 b/orbbec_camera/SDK/lib/arm/libudev.so.1 new file mode 120000 index 00000000..d38ce683 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm/libudev.so.1 @@ -0,0 +1 @@ +libudev.so.1.6.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so deleted file mode 100644 index d5e01033..00000000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9 -size 88298992 diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so new file mode 120000 index 00000000..053f4098 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 deleted file mode 100644 index d5e01033..00000000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9 -size 88298992 diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 new file mode 120000 index 00000000..4673dca6 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5 @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5.6 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5.5 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5.5 deleted file mode 100644 index d5e01033..00000000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.5.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9 -size 88298992 diff --git a/orbbec_camera/SDK/lib/arm64/libudev.so b/orbbec_camera/SDK/lib/arm64/libudev.so deleted file mode 100644 index cd839477..00000000 --- a/orbbec_camera/SDK/lib/arm64/libudev.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5000b1289ad8e8e1c7e4e5d4b002fce5d58a61166fae070301eae119798b62c -size 762776 diff --git a/orbbec_camera/SDK/lib/arm64/libudev.so b/orbbec_camera/SDK/lib/arm64/libudev.so new file mode 120000 index 00000000..d38ce683 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm64/libudev.so @@ -0,0 +1 @@ +libudev.so.1.6.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libudev.so.1 b/orbbec_camera/SDK/lib/arm64/libudev.so.1 deleted file mode 100644 index cd839477..00000000 --- a/orbbec_camera/SDK/lib/arm64/libudev.so.1 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5000b1289ad8e8e1c7e4e5d4b002fce5d58a61166fae070301eae119798b62c -size 762776 diff --git a/orbbec_camera/SDK/lib/arm64/libudev.so.1 b/orbbec_camera/SDK/lib/arm64/libudev.so.1 new file mode 120000 index 00000000..d38ce683 --- /dev/null +++ b/orbbec_camera/SDK/lib/arm64/libudev.so.1 @@ -0,0 +1 @@ +libudev.so.1.6.3 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so deleted file mode 100644 index b04a6652..00000000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed -size 86041960 diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so new file mode 120000 index 00000000..053f4098 --- /dev/null +++ b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 deleted file mode 100644 index b04a6652..00000000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed -size 86041960 diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 new file mode 120000 index 00000000..4673dca6 --- /dev/null +++ b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5 @@ -0,0 +1 @@ +libOrbbecSDK.so.1.5.6 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5.5 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5.5 deleted file mode 100644 index b04a6652..00000000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.5.5 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed -size 86041960