i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-09-13 03:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update OrbbecSDK version to 2.8.8

Browse Source
This commit is contained in:
ob-yalian
2026-06-02 10:44:53 +08:00
parent c1bf09c09b
commit b9c3bfd627
12 changed files with 162 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/SDK/include/libobsensor/h/TypeHelper.h
+56 -2
View File
@@ -54,6 +54,24 @@ OB_EXPORT const char* ob_sensor_type_to_string(OBSensorType type);
*/
OB_EXPORT const char* ob_imu_rate_type_to_string(OBIMUSampleRate type);
/**
* @brief Convert OBIMUSampleRate to its numeric frequency value in Hz.
*
* @param[in] type OBIMUSampleRate type.
*
* @return IMU sample rate value in Hz. Returns 0 for unknown values.
*/
OB_EXPORT float ob_imu_rate_type_to_value(OBIMUSampleRate type);
/**
* @brief Convert a numeric IMU sample rate value in Hz to OBIMUSampleRate.
*
* @param[in] value IMU sample rate value in Hz.
*
* @return Matching OBIMUSampleRate. Returns OB_SAMPLE_RATE_UNKNOWN when no exact SDK rate matches.
*/
OB_EXPORT OBIMUSampleRate ob_imu_rate_value_to_type(float value);
/**
* @brief Convert OBGyroFullScaleRange to " char* " type and then return.
*
@@ -90,14 +108,50 @@ OB_EXPORT const char *ob_lidar_scan_rate_type_to_string(OBLiDARScanRate type);
OB_EXPORT const char* ob_meta_data_type_to_string(OBFrameMetadataType type);
/**
* @brief Convert OBStreamType to OBSensorType.
* @brief Convert OBSensorType to OBStreamType.
*
* @param[in] type The sensor type to convert.
*
* @return OBStreamType The corresponding stream type.
* @return The corresponding stream type.
*/
OB_EXPORT OBStreamType ob_sensor_type_to_stream_type(OBSensorType type);
/**
* @brief Convert OBStreamType to OBSensorType.
*
* @param[in] type The stream type to convert.
*
* @return The corresponding sensor type.
*/
OB_EXPORT OBSensorType ob_stream_type_to_sensor_type(OBStreamType type);
/**
* @brief Convert OBStreamType to OBFrameType.
*
* @param[in] type The stream type to convert.
*
* @return The corresponding frame type.
*/
OB_EXPORT OBFrameType ob_stream_type_to_frame_type(OBStreamType type);
/**
* @brief Convert OBFrameType to OBStreamType.
*
* @param[in] type The frame type to convert.
*
* @return The corresponding stream type.
*/
OBStreamType ob_frame_type_to_stream_type(OBFrameType type);
/**
* @brief Convert OBFrameType to OBSensorType.
*
* @param[in] type The frame type to convert.
*
* @return The corresponding sensor type.
*/
OB_EXPORT OBSensorType ob_frame_type_to_sensor_type(OBFrameType type);
/**
* @brief Convert OBFormat to " char* " type and then return.
*
orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp
+26 -53
View File
@@ -484,26 +484,6 @@ public:
/**
* @brief UnDistortionFilter removes lens distortion from a chosen stream (Color, IR, or Depth).
*
* Usage (pure color undistortion, sync_align scenario):
* @code
* auto filter = std::make_shared<ob::UnDistortionFilter>();
* // default stream type is COLOR, default mode is pure undistortion
* filter->pushFrame(frameSet);
* @endcode
*
* Usage (virtual-camera mode, hw_d2c_align scenario):
* @code
* auto filter = std::make_shared<ob::UnDistortionFilter>();
* // Pass the raw depth intrinsic — filter computes the scale to color resolution internally.
* filter->setNewCameraMatrix(depthIntrinsic);
* filter->pushFrame(frameSet);
* @endcode
*
* Usage (depth undistortion — must use nearest-neighbor interpolation):
* @code
* auto filter = std::make_shared<ob::UnDistortionFilter>(OB_STREAM_DEPTH);
* filter->setInterpolationMode(0); // nearest neighbor avoids ghost-depth artefacts
* @endcode
*/
class UnDistortionFilter : public Filter {
public:
@@ -519,7 +499,6 @@ public:
/**
* @brief Set which stream to undistort (default: OB_STREAM_COLOR).
* For depth streams, also call setInterpolationMode(0).
*/
void setStreamType(OBStreamType streamType) {
setConfigValue("StreamType", static_cast<double>(streamType));
@@ -544,11 +523,11 @@ public:
* @param depthIntrinsic The depth camera intrinsic at its native resolution.
*/
void setNewCameraMatrix(OBCameraIntrinsic depthIntrinsic) {
setConfigValue("NewCameraFx", static_cast<double>(depthIntrinsic.fx));
setConfigValue("NewCameraFy", static_cast<double>(depthIntrinsic.fy));
setConfigValue("NewCameraCx", static_cast<double>(depthIntrinsic.cx));
setConfigValue("NewCameraCy", static_cast<double>(depthIntrinsic.cy));
setConfigValue("NewCameraWidth", static_cast<double>(depthIntrinsic.width));
setConfigValue("NewCameraFx", static_cast<double>(depthIntrinsic.fx));
setConfigValue("NewCameraFy", static_cast<double>(depthIntrinsic.fy));
setConfigValue("NewCameraCx", static_cast<double>(depthIntrinsic.cx));
setConfigValue("NewCameraCy", static_cast<double>(depthIntrinsic.cy));
setConfigValue("NewCameraWidth", static_cast<double>(depthIntrinsic.width));
setConfigValue("NewCameraHeight", static_cast<double>(depthIntrinsic.height));
}
@@ -558,18 +537,6 @@ public:
void clearNewCameraMatrix() {
setConfigValue("NewCameraWidth", 0.0);
}
/**
* @brief Set the pixel interpolation mode.
* @param mode 0 = nearest-neighbor (required for depth), 1 = bilinear (default).
*/
void setInterpolationMode(int mode) {
setConfigValue("InterpolationMode", static_cast<double>(mode));
}
int getInterpolationMode() const {
return static_cast<int>(getConfigValue("InterpolationMode"));
}
};
/**
@@ -1232,7 +1199,7 @@ public:
*/
OBUint16PropertyRange getMarginXthRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "margin_x_th") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("margin_x_th"));
@@ -1248,7 +1215,7 @@ public:
*/
OBUint16PropertyRange getMarginYthRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "margin_y_th") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("margin_y_th"));
@@ -1264,7 +1231,7 @@ public:
*/
OBUint16PropertyRange getLimitXthRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "limit_x_th") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("limit_x_th"));
@@ -1280,7 +1247,7 @@ public:
*/
OBUint16PropertyRange getLimitYthRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "limit_y_th") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("limit_y_th"));
@@ -1296,7 +1263,7 @@ public:
*/
OBUint16PropertyRange getVerticalDirectionEnableRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "enable_vertical_direction") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("enable_vertical_direction"));
@@ -1312,7 +1279,7 @@ public:
*/
OBUint16PropertyRange getWidthRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "width") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("width"));
@@ -1328,7 +1295,7 @@ public:
*/
OBUint16PropertyRange getHeightRange() {
OBUint16PropertyRange range{};
const auto & schemaVec = getConfigSchemaVec();
const auto &schemaVec = getConfigSchemaVec();
for(const auto &item: schemaVec) {
if(strcmp(item.name, "height") == 0) {
range = getPropertyRange<OBUint16PropertyRange>(item, getConfigValue("height"));
@@ -1369,7 +1336,6 @@ public:
param.height = static_cast<uint16_t>(getConfigValue("height"));
return param;
}
};
/**
@@ -2166,13 +2132,20 @@ public:
*/
inline const std::unordered_map<std::string, std::type_index> &getFilterTypeMap() {
static const std::unordered_map<std::string, std::type_index> filterTypeMap = {
{ "PointCloudFilter", typeid(PointCloudFilter) }, { "Align", typeid(Align) },
{ "FormatConverter", typeid(FormatConvertFilter) }, { "HDRMerge", typeid(HdrMerge) },
{ "SequenceIdFilter", typeid(SequenceIdFilter) }, { "DecimationFilter", typeid(DecimationFilter) },
{ "ThresholdFilter", typeid(ThresholdFilter) }, { "SpatialAdvancedFilter", typeid(SpatialAdvancedFilter) },
{ "HoleFillingFilter", typeid(HoleFillingFilter) }, { "NoiseRemovalFilter", typeid(NoiseRemovalFilter) },
{ "TemporalFilter", typeid(TemporalFilter) }, { "DisparityTransform", typeid(DisparityTransform) },
{ "SpatialFastFilter", typeid(SpatialFastFilter) }, { "SpatialModerateFilter", typeid(SpatialModerateFilter) },
{ "PointCloudFilter", typeid(PointCloudFilter) },
{ "Align", typeid(Align) },
{ "FormatConverter", typeid(FormatConvertFilter) },
{ "HDRMerge", typeid(HdrMerge) },
{ "SequenceIdFilter", typeid(SequenceIdFilter) },
{ "DecimationFilter", typeid(DecimationFilter) },
{ "ThresholdFilter", typeid(ThresholdFilter) },
{ "SpatialAdvancedFilter", typeid(SpatialAdvancedFilter) },
{ "HoleFillingFilter", typeid(HoleFillingFilter) },
{ "NoiseRemovalFilter", typeid(NoiseRemovalFilter) },
{ "TemporalFilter", typeid(TemporalFilter) },
{ "DisparityTransform", typeid(DisparityTransform) },
{ "SpatialFastFilter", typeid(SpatialFastFilter) },
{ "SpatialModerateFilter", typeid(SpatialModerateFilter) },
{ "EdgeNoiseRemovalFilter", typeid(EdgeNoiseRemovalFilter) },
{ "FalsePositiveFilter", typeid(FalsePositiveFilter) },
{ "MgcNoiseRemovalFilter", typeid(MgcNoiseRemovalFilter) },
orbbec_camera/SDK/include/libobsensor/hpp/TypeHelper.hpp
+66
View File
@@ -68,6 +68,28 @@ public:
return ob_imu_rate_type_to_string(type);
}
/**
* @brief Convert OBIMUSampleRate to its numeric frequency value in Hz.
*
* @param[in] type OBIMUSampleRate type.
*
* @return IMU sample rate value in Hz.
*/
static float convertOBIMUSampleRateTypeToValue(const OBIMUSampleRate &type) {
return ob_imu_rate_type_to_value(type);
}
/**
* @brief Convert a numeric IMU sample rate value in Hz to OBIMUSampleRate.
*
* @param[in] value IMU sample rate value in Hz.
*
* @return Matching OBIMUSampleRate.
*/
static OBIMUSampleRate convertOBIMUSampleRateValueToType(float value) {
return ob_imu_rate_value_to_type(value);
}
/**
* @brief Convert OBGyroFullScaleRange to " string " type and then return.
*
@@ -122,6 +144,50 @@ public:
return ob_sensor_type_to_stream_type(type);
}
/**
* @brief Convert OBStreamType to OBSensorType and then return.
*
* @param[in] type OBStreamType type.
*
* @return OBSensorType type.
*/
static OBSensorType convertStreamTypeToSensorType(OBStreamType type) {
return ob_stream_type_to_sensor_type(type);
}
/**
* @brief Convert OBStreamType to OBFrameType and then return.
*
* @param[in] type OBStreamType type.
*
* @return OBFrameType type.
*/
static OBFrameType convertStreamTypeToFrameType(OBStreamType type) {
return ob_stream_type_to_frame_type(type);
}
/**
* @brief Convert OBFrameType to OBStreamType and then return.
*
* @param[in] type OBFrameType type.
*
* @return OBStreamType type.
*/
static OBStreamType convertFrameTypeToStreamType(OBFrameType type) {
return ob_frame_type_to_stream_type(type);
}
/**
* @brief Convert OBFrameType to OBSensorType and then return.
*
* @param[in] type OBFrameType type.
*
* @return OBSensorType type.
*/
static OBSensorType convertFrameTypeToSensorType(OBFrameType type) {
return ob_frame_type_to_sensor_type(type);
}
/**
* @brief Check if the given sensor type is a video sensor.
* @brief Video sensors are sensors that produce video frames.
orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake
+2 -2
View File
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "ob::OrbbecSDK" for configuration "Release"
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(ob::OrbbecSDK PROPERTIES
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.7"
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.8"
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
)
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.7" )
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.8" )
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake
+3 -3
View File
@@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "2.8.7")
set(PACKAGE_VERSION "2.8.8")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
if("2.8.7" MATCHES "^([0-9]+)\\.")
if("2.8.8" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif()
else()
set(CVF_VERSION_MAJOR "2.8.7")
set(CVF_VERSION_MAJOR "2.8.8")
endif()
if(PACKAGE_FIND_VERSION_RANGE)
orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2
+1 -1
View File
@@ -1 +1 @@
libOrbbecSDK.so.2.8.7
libOrbbecSDK.so.2.8.8
orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.8.7 → orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.8.8
BIN
View File
Binary file not shown.
orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake
+2 -2
View File
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
# Import target "ob::OrbbecSDK" for configuration "Release"
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
set_target_properties(ob::OrbbecSDK PROPERTIES
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.7"
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.8"
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
)
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.7" )
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.8" )
# Commands beyond this point should not need to know the version.
set(CMAKE_IMPORT_FILE_VERSION)
orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake
+3 -3
View File
@@ -9,19 +9,19 @@
# The variable CVF_VERSION must be set before calling configure_file().
set(PACKAGE_VERSION "2.8.7")
set(PACKAGE_VERSION "2.8.8")
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
set(PACKAGE_VERSION_COMPATIBLE FALSE)
else()
if("2.8.7" MATCHES "^([0-9]+)\\.")
if("2.8.8" MATCHES "^([0-9]+)\\.")
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
endif()
else()
set(CVF_VERSION_MAJOR "2.8.7")
set(CVF_VERSION_MAJOR "2.8.8")
endif()
if(PACKAGE_FIND_VERSION_RANGE)
orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2
+1 -1
View File
@@ -1 +1 @@
libOrbbecSDK.so.2.8.7
libOrbbecSDK.so.2.8.8
orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.8.7 → orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.8.8
BIN
View File
Binary file not shown.
orbbec_camera/config/OrbbecSDKConfig_v2.0.xml
+2 -2
View File
@@ -44,8 +44,8 @@
<Pipeline>
<Stream>
<Depth>
<!-- Use default stream profile, bool type, true： use default stream profile,
false：use specified stream profile in the configuration file -->
<!-- Use default stream profile, bool type, true: use default stream profile,
false: use specified stream profile in the configuration file -->
<UseDefaultStreamProfile>true</UseDefaultStreamProfile>
</Depth>
<Color>