diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp index 88a4bcf4..71afa90e 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp @@ -325,7 +325,7 @@ public: * @brief The processing strategy when the FrameSet generated by the frame aggregation function does not contain the frames of all opened streams (which * can be caused by different frame rates of each stream, or by the loss of frames of one stream): drop directly or output to the user. * - * @param mode The frame aggregation output mode to be set (default mode is @ref OB_FRAME_AGGREGATE_OUTPUT_FULL_FRAME_REQUIRE) + * @param mode The frame aggregation output mode to be set (default mode is @ref OB_FRAME_AGGREGATE_OUTPUT_ANY_SITUATION) */ void setFrameAggregateOutputMode(OBFrameAggregateOutputMode mode); diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10 b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10 index bad021d7..ba4e78d9 120000 --- a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10 +++ b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10 @@ -1 +1 @@ -libOrbbecSDK.so.1.10.17 \ No newline at end of file +libOrbbecSDK.so.1.10.18 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10.17 b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10.17 deleted file mode 100644 index 5c717ae1..00000000 Binary files a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10.17 and /dev/null differ diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10 index bad021d7..ba4e78d9 120000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10 +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10 @@ -1 +1 @@ -libOrbbecSDK.so.1.10.17 \ No newline at end of file +libOrbbecSDK.so.1.10.18 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10.17 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10.17 deleted file mode 100644 index 3d95dfc2..00000000 Binary files a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10.17 and /dev/null differ diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10 index bad021d7..ba4e78d9 120000 --- a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10 +++ b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10 @@ -1 +1 @@ -libOrbbecSDK.so.1.10.17 \ No newline at end of file +libOrbbecSDK.so.1.10.18 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10.17 b/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10.17 deleted file mode 100644 index f29e966d..00000000 Binary files a/orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10.17 and /dev/null differ