diff --git a/orbbec_camera/SDK/include/libobsensor/h/Device.h b/orbbec_camera/SDK/include/libobsensor/h/Device.h index bd6bcd55..6fc8e20c 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Device.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Device.h @@ -328,6 +328,15 @@ OB_EXPORT void ob_device_set_state_changed_callback(ob_device *device, ob_device */ OB_EXPORT void ob_device_enable_heartbeat(ob_device *device, bool enable, ob_error **error); +/** + * @brief Enable or disable the device firmware log. + * + * @param[in] device The device object. + * @param[in] enable Whether to enable the firmware log. + * @param[out] error Pointer to an error object that will be set if an error occurs. + */ +OB_EXPORT void ob_device_enable_firmware_log(ob_device *device, bool enable, ob_error **error); + /** * @brief Send data to the device and receive data from the device. * @brief This is a factory and debug function, which can be used to send and receive data from the device. The data format is secret and belongs to the device diff --git a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h index 53f3ed8d..0e08aec9 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h +++ b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h @@ -1108,14 +1108,6 @@ typedef enum OB_EDGE_NOISE_REMOVAL_TYPE { } OBEdgeNoiseRemovalType, ob_edge_noise_removal_type; -typedef struct { - OBEdgeNoiseRemovalType type; - uint16_t marginLeftTh; - uint16_t marginRightTh; - uint16_t marginTopTh; - uint16_t marginBottomTh; -} OBEdgeNoiseRemovalFilterParams, ob_edge_noise_removal_filter_params; - /** * @brief Denoising method */ @@ -1131,6 +1123,41 @@ typedef struct { OBDDONoiseRemovalType type; } OBNoiseRemovalFilterParams, ob_noise_removal_filter_params; +typedef struct { + int margin_x_th; ///< Horizontal threshold settings + int margin_y_th; ///< Vertical threshold settings + int limit_x_th; ///< Maximum horizontal threshold + int limit_y_th; ///< Maximum vertical threshold + uint32_t width; ///< Image width + uint32_t height; ///< Image height + bool enable_direction; ///< Set to true for horizontal and vertical, false for horizontal only +} OBEdgeNoiseRemovalFilterParams, ob_edge_noise_removal_filter_params; + +/** + * @brief Configuration parameters for the MGC noise removal filter + */ +typedef struct { + int max_width_left; ///< Left chamfer threshold settings + int max_width_right; ///< Right chamfer threshold settings + int max_radius; ///< Chamfer radius threshold settings + int margin_x_th; ///< Horizontal threshold settings + int margin_y_th; ///< Vertical threshold settings + int limit_x_th; ///< Maximum horizontal threshold + int limit_y_th; ///< Maximum vertical threshold + uint32_t width; ///< Depth map width the above parameters correspond to + uint32_t height; ///< Depth map height the above parameters correspond to +} OBMgcNoiseRemovalFilterParams, ob_mgc_noise_removal_filter_params; + +/** + * @brief Configuration parameters for the LUT noise removal filter + */ +typedef struct { + uint16_t max_lut[16]; ///< LUT max size of noise pixels (4x4 LUT, 16 entries total) + uint16_t min_diff; ///< Difference threshold between neighbor pixels + uint32_t width; ///< Depth map width the above parameters correspond to + uint32_t height; ///< Depth map height the above parameters correspond to +} OBLutNoiseRemovalFilterParams, ob_lut_noise_removal_filter_params; + /** * @brief Control command protocol version number */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Property.h b/orbbec_camera/SDK/include/libobsensor/h/Property.h index f436c7ff..32ae7930 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Property.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Property.h @@ -610,6 +610,16 @@ typedef enum { */ OB_PROP_COLOR_PRESET_PRIORITY_INT = 255, + /** + * @brief LLA (Link Local Address) switch + */ + OB_PROP_DEVICE_NETWORK_LLA_BOOL = 257, + + /** + * @brief Color anti-flicker switch + */ + OB_PROP_COLOR_ANTI_FLICKER_BOOL = 259, + /** * @brief Baseline calibration parameters */ diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp index f86e4b43..0d943c75 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp @@ -549,6 +549,17 @@ public: Error::handle(&error); } + /** + * @brief Enable or disable the device firmware log. + * + * @param[in] enable Whether to enable the firmware log. + */ + void enableFirmwareLog(bool enable) const { + ob_error *error = nullptr; + ob_device_enable_firmware_log(impl_, enable, &error); + Error::handle(&error); + } + /** * @brief Get the supported multi device sync mode bitmap of the device. * @brief For example, if the return value is 0b00001100, it means the device supports @ref OB_MULTI_DEVICE_SYNC_MODE_PRIMARY and @ref diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp index 86fd36ef..35de8c9e 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp @@ -1121,6 +1121,166 @@ public: } }; +/** + * @brief EdgeNoiseRemoval filter + */ +class EdgeNoiseRemovalFilter : public Filter { +public: + EdgeNoiseRemovalFilter(const std::string &activationKey = "") { + ob_error *error = nullptr; + auto impl = ob_create_private_filter("EdgeNoiseRemovalFilter", activationKey.c_str(), &error); + Error::handle(&error); + init(impl); + } + + ~EdgeNoiseRemovalFilter() noexcept override = default; + + /** + * @brief Get the edge noise removal filter margin x th range. + * @return OBUint16PropertyRange The margin x th of property range. + */ + OBUint16PropertyRange getMarginXthRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "margin_x_th") == 0) { + range = getPropertyRange(item, getConfigValue("margin_x_th")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter margin y th range. + * @return OBUint16PropertyRange The margin y th of property range. + */ + OBUint16PropertyRange getMarginYthRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "margin_y_th") == 0) { + range = getPropertyRange(item, getConfigValue("margin_y_th")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter limit x th range. + * @return OBUint16PropertyRange The limit x th of property range. + */ + OBUint16PropertyRange getLimitXthRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "limit_x_th") == 0) { + range = getPropertyRange(item, getConfigValue("limit_x_th")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter limit y th range. + * @return OBUint16PropertyRange The limit y th of property range. + */ + OBUint16PropertyRange getLimitYthRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "limit_y_th") == 0) { + range = getPropertyRange(item, getConfigValue("limit_y_th")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter vertical direction enable range. + * @return OBUint16PropertyRange The vertical direction enable of property range. + */ + OBUint16PropertyRange getVerticalDirectionEnableRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "enable_vertical_direction") == 0) { + range = getPropertyRange(item, getConfigValue("enable_vertical_direction")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter width range. + * @return OBUint16PropertyRange The width of property range. + */ + OBUint16PropertyRange getWidthRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "width") == 0) { + range = getPropertyRange(item, getConfigValue("width")); + break; + } + } + return range; + } + + /** + * @brief Get the edge noise removal filter height range. + * @return OBUint16PropertyRange The height of property range. + */ + OBUint16PropertyRange getHeightRange() { + OBUint16PropertyRange range{}; + const auto & schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "height") == 0) { + range = getPropertyRange(item, getConfigValue("height")); + break; + } + } + return range; + } + + /** + * @brief Set the edge noise removal filter params. + * + * @param[in] filterParams OBEdgeNoiseRemovalFilterParams. + */ + void setFilterParams(OBEdgeNoiseRemovalFilterParams filterParams) { + setConfigValue("margin_x_th", static_cast(filterParams.margin_x_th)); + setConfigValue("margin_y_th", static_cast(filterParams.margin_y_th)); + setConfigValue("limit_x_th", static_cast(filterParams.limit_x_th)); + setConfigValue("limit_y_th", static_cast(filterParams.limit_y_th)); + setConfigValue("enable_vertical_direction", static_cast(filterParams.enable_direction)); + setConfigValue("width", static_cast(filterParams.width)); + setConfigValue("height", static_cast(filterParams.height)); + } + + /** + * @brief Get the edge noise removal filter params. + * + * @return OBEdgeNoiseRemovalFilterParams. + */ + OBEdgeNoiseRemovalFilterParams getFilterParams() { + OBEdgeNoiseRemovalFilterParams param{}; + param.margin_x_th = static_cast(getConfigValue("margin_x_th")); + param.margin_y_th = static_cast(getConfigValue("margin_y_th")); + param.limit_x_th = static_cast(getConfigValue("limit_x_th")); + param.limit_y_th = static_cast(getConfigValue("limit_y_th")); + param.enable_direction = static_cast(getConfigValue("enable_vertical_direction")); + param.width = static_cast(getConfigValue("width")); + param.height = static_cast(getConfigValue("height")); + return param; + } + +}; + /** * @brief FalsePositive filter */ @@ -1459,6 +1619,311 @@ public: } }; +/** + * @brief MgcNoiseRemoval filter + */ +class MgcNoiseRemovalFilter : public Filter { +public: + MgcNoiseRemovalFilter(const std::string &activationKey = "") { + ob_error *error = nullptr; + auto impl = ob_create_private_filter("MgcNoiseRemovalFilter", activationKey.c_str(), &error); + Error::handle(&error); + init(impl); + } + + ~MgcNoiseRemovalFilter() noexcept override = default; + + /** + * @brief Set the mgc noise removal filter params. + * @param[in] filterParams OBMgcNoiseRemovalFilterParams. + */ + void setFilterParams(OBMgcNoiseRemovalFilterParams filterParams) { + setConfigValue("max_width_left", static_cast(filterParams.max_width_left)); + setConfigValue("max_width_right", static_cast(filterParams.max_width_right)); + setConfigValue("max_radius", static_cast(filterParams.max_radius)); + setConfigValue("margin_x_th", static_cast(filterParams.margin_x_th)); + setConfigValue("margin_y_th", static_cast(filterParams.margin_y_th)); + setConfigValue("limit_x_th", static_cast(filterParams.limit_x_th)); + setConfigValue("limit_y_th", static_cast(filterParams.limit_y_th)); + setConfigValue("width", static_cast(filterParams.width)); + setConfigValue("height", static_cast(filterParams.height)); + } + + /** + * @brief Get the mgc noise removal filter params. + * @return OBMgcNoiseRemovalFilterParams. + */ + OBMgcNoiseRemovalFilterParams getFilterParams() { + OBMgcNoiseRemovalFilterParams params{}; + params.max_width_left = static_cast(getConfigValue("max_width_left")); + params.max_width_right = static_cast(getConfigValue("max_width_right")); + params.max_radius = static_cast(getConfigValue("max_radius")); + params.margin_x_th = static_cast(getConfigValue("margin_x_th")); + params.margin_y_th = static_cast(getConfigValue("margin_y_th")); + params.limit_x_th = static_cast(getConfigValue("limit_x_th")); + params.limit_y_th = static_cast(getConfigValue("limit_y_th")); + params.width = static_cast(getConfigValue("width")); + params.height = static_cast(getConfigValue("height")); + return params; + } + + /** + * @brief Get the mgc noise removal filter max_width_left range. + * @return OBUint16PropertyRange The max_width_left of property range. + */ + OBUint16PropertyRange getMaxWidthLeftRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "max_width_left") == 0) { + range = getPropertyRange(item, getConfigValue("max_width_left")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter max_width_right range. + * @return OBUint16PropertyRange The max_width_right of property range. + */ + OBUint16PropertyRange getMaxWidthRightRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "max_width_right") == 0) { + range = getPropertyRange(item, getConfigValue("max_width_right")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter max_radius range. + * @return OBUint16PropertyRange The max_radius of property range. + */ + OBUint16PropertyRange getMaxRadiusRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "max_radius") == 0) { + range = getPropertyRange(item, getConfigValue("max_radius")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter margin_x_th range. + * @return OBUint16PropertyRange The margin_x_th of property range. + */ + OBUint16PropertyRange getMarginXthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "margin_x_th") == 0) { + range = getPropertyRange(item, getConfigValue("margin_x_th")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter margin_y_th range. + * @return OBUint16PropertyRange The margin_y_th of property range. + */ + OBUint16PropertyRange getMarginYthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "margin_y_th") == 0) { + range = getPropertyRange(item, getConfigValue("margin_y_th")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter limit_x_th range. + * @return OBUint16PropertyRange The limit_x_th of property range. + */ + OBUint16PropertyRange getLimitXthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "limit_x_th") == 0) { + range = getPropertyRange(item, getConfigValue("limit_x_th")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter limit_y_th range. + * @return OBUint16PropertyRange The limit_y_th of property range. + */ + OBUint16PropertyRange getLimitYthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "limit_y_th") == 0) { + range = getPropertyRange(item, getConfigValue("limit_y_th")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter width range. + * @return OBUint16PropertyRange The width of property range. + */ + OBUint16PropertyRange getWidthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "width") == 0) { + range = getPropertyRange(item, getConfigValue("width")); + break; + } + } + return range; + } + + /** + * @brief Get the mgc noise removal filter height range. + * @return OBUint16PropertyRange The height of property range. + */ + OBUint16PropertyRange getHeightRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "height") == 0) { + range = getPropertyRange(item, getConfigValue("height")); + break; + } + } + return range; + } +}; + +/** + * @brief LutNoiseRemoval filter + */ +class LutNoiseRemovalFilter : public Filter { +public: + LutNoiseRemovalFilter(const std::string &activationKey = "") { + ob_error *error = nullptr; + auto impl = ob_create_private_filter("LutNoiseRemovalFilter", activationKey.c_str(), &error); + Error::handle(&error); + init(impl); + } + + ~LutNoiseRemovalFilter() noexcept override = default; + + /** + * @brief Set the lut noise removal filter params. + * @param[in] filterParams OBLutNoiseRemovalFilterParams. + */ + void setFilterParams(OBLutNoiseRemovalFilterParams filterParams) { + for(int i = 0; i < 16; ++i) { + setConfigValue("max_lut_" + std::to_string(i), static_cast(filterParams.max_lut[i])); + } + setConfigValue("min_diff", static_cast(filterParams.min_diff)); + setConfigValue("width", static_cast(filterParams.width)); + setConfigValue("height", static_cast(filterParams.height)); + } + + /** + * @brief Get the lut noise removal filter params. + * @return OBLutNoiseRemovalFilterParams. + */ + OBLutNoiseRemovalFilterParams getFilterParams() { + OBLutNoiseRemovalFilterParams params{}; + for(int i = 0; i < 16; ++i) { + params.max_lut[i] = static_cast(getConfigValue("max_lut_" + std::to_string(i))); + } + params.min_diff = static_cast(getConfigValue("min_diff")); + params.width = static_cast(getConfigValue("width")); + params.height = static_cast(getConfigValue("height")); + return params; + } + + /** + * @brief Get the lut noise removal filter max_lut range for a given index (0-15). + * @param[in] index LUT entry index in range [0, 15]. + * @return OBUint16PropertyRange The max_lut of property range. + */ + OBUint16PropertyRange getMaxLutRange(int index) { + OBUint16PropertyRange range{}; + if(index < 0 || index >= 16) { + return range; + } + std::string name = "max_lut_" + std::to_string(index); + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, name.c_str()) == 0) { + range = getPropertyRange(item, getConfigValue(name)); + break; + } + } + return range; + } + + /** + * @brief Get the lut noise removal filter min_diff range. + * @return OBUint16PropertyRange The min_diff of property range. + */ + OBUint16PropertyRange getMinDiffRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "min_diff") == 0) { + range = getPropertyRange(item, getConfigValue("min_diff")); + break; + } + } + return range; + } + + /** + * @brief Get the lut noise removal filter width range. + * @return OBUint16PropertyRange The width of property range. + */ + OBUint16PropertyRange getWidthRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "width") == 0) { + range = getPropertyRange(item, getConfigValue("width")); + break; + } + } + return range; + } + + /** + * @brief Get the lut noise removal filter height range. + * @return OBUint16PropertyRange The height of property range. + */ + OBUint16PropertyRange getHeightRange() { + OBUint16PropertyRange range{}; + const auto &schemaVec = getConfigSchemaVec(); + for(const auto &item: schemaVec) { + if(strcmp(item.name, "height") == 0) { + range = getPropertyRange(item, getConfigValue("height")); + break; + } + } + return range; + } +}; + /** * @brief Depth to disparity or disparity to depth */ @@ -1532,7 +1997,10 @@ inline const std::unordered_map &getFilterTypeMap( { "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) }, + { "LutNoiseRemovalFilter", typeid(LutNoiseRemovalFilter) }, }; return filterTypeMap; } diff --git a/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake b/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake index e411150c..2ab2f511 100644 --- a/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake +++ b/orbbec_camera/SDK/lib/arm64/OrbbecSDKConfig-release.cmake @@ -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.7.7" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.0" 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.7.7" ) +list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.0" ) # Commands beyond this point should not need to know the version. set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake b/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake index 012f7162..f6b46004 100644 --- a/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake +++ b/orbbec_camera/SDK/lib/arm64/OrbbecSDKVersion.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.7.7") +set(PACKAGE_VERSION "2.8.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.7.7" MATCHES "^([0-9]+)\\.") + if("2.8.0" 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.7.7") + set(CVF_VERSION_MAJOR "2.8.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/orbbec_camera/SDK/lib/arm64/extensions/filters/libFilterProcessor.so b/orbbec_camera/SDK/lib/arm64/extensions/filters/libFilterProcessor.so index 0a156dbc..a633a9d9 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/filters/libFilterProcessor.so and b/orbbec_camera/SDK/lib/arm64/extensions/filters/libFilterProcessor.so differ diff --git a/orbbec_camera/SDK/lib/arm64/extensions/filters/libob_priv_filter.so b/orbbec_camera/SDK/lib/arm64/extensions/filters/libob_priv_filter.so index a8676e32..39f87b60 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/filters/libob_priv_filter.so and b/orbbec_camera/SDK/lib/arm64/extensions/filters/libob_priv_filter.so differ diff --git a/orbbec_camera/SDK/lib/arm64/extensions/firmwareupdater/libfirmwareupdater.so b/orbbec_camera/SDK/lib/arm64/extensions/firmwareupdater/libfirmwareupdater.so index 8dcf88d5..90078be6 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/firmwareupdater/libfirmwareupdater.so and b/orbbec_camera/SDK/lib/arm64/extensions/firmwareupdater/libfirmwareupdater.so differ diff --git a/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so b/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so index b7820963..42a860d8 100644 Binary files a/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so and b/orbbec_camera/SDK/lib/arm64/extensions/frameprocessor/libob_frame_processor.so differ diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 index 6ea11feb..1f9d6b12 120000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2 @@ -1 +1 @@ -libOrbbecSDK.so.2.7.7 \ No newline at end of file +libOrbbecSDK.so.2.8.0 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.7.7 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.8.0 similarity index 67% rename from orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.7.7 rename to orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.8.0 index 321be074..3471359a 100644 Binary files a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.7.7 and b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.2.8.0 differ diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake index e411150c..2ab2f511 100644 --- a/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKConfig-release.cmake @@ -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.7.7" + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.0" 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.7.7" ) +list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.8.0" ) # Commands beyond this point should not need to know the version. set(CMAKE_IMPORT_FILE_VERSION) diff --git a/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake b/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake index 012f7162..f6b46004 100644 --- a/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake +++ b/orbbec_camera/SDK/lib/x64/OrbbecSDKVersion.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.7.7") +set(PACKAGE_VERSION "2.8.0") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.7.7" MATCHES "^([0-9]+)\\.") + if("2.8.0" 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.7.7") + set(CVF_VERSION_MAJOR "2.8.0") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so b/orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so index f5b8ef4d..18c2d22b 100644 Binary files a/orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so and b/orbbec_camera/SDK/lib/x64/extensions/filters/libFilterProcessor.so differ diff --git a/orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so b/orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so index 5b4adace..ea86cf05 100644 Binary files a/orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so and b/orbbec_camera/SDK/lib/x64/extensions/filters/libob_priv_filter.so differ diff --git a/orbbec_camera/SDK/lib/x64/extensions/firmwareupdater/libfirmwareupdater.so b/orbbec_camera/SDK/lib/x64/extensions/firmwareupdater/libfirmwareupdater.so index ff8ed03f..cec134e9 100644 Binary files a/orbbec_camera/SDK/lib/x64/extensions/firmwareupdater/libfirmwareupdater.so and b/orbbec_camera/SDK/lib/x64/extensions/firmwareupdater/libfirmwareupdater.so differ diff --git a/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so b/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so index bd2c5af0..029ada57 100644 Binary files a/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so and b/orbbec_camera/SDK/lib/x64/extensions/frameprocessor/libob_frame_processor.so differ diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 index 6ea11feb..1f9d6b12 120000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 +++ b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2 @@ -1 +1 @@ -libOrbbecSDK.so.2.7.7 \ No newline at end of file +libOrbbecSDK.so.2.8.0 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.7.7 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.8.0 similarity index 67% rename from orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.7.7 rename to orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.8.0 index 8d278046..b5095ed1 100644 Binary files a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.7.7 and b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.2.8.0 differ diff --git a/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml b/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml index 8038d378..3896dedd 100644 --- a/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml +++ b/orbbec_camera/config/OrbbecSDKConfig_v2.0.xml @@ -76,6 +76,9 @@ system's capabilities and the device's speciality. --> Auto + + Standard +