diff --git a/orbbec_camera/SDK/include/libobsensor/ObSensor.h b/orbbec_camera/SDK/include/libobsensor/ObSensor.h index a5f68e53..409b193e 100644 --- a/orbbec_camera/SDK/include/libobsensor/ObSensor.h +++ b/orbbec_camera/SDK/include/libobsensor/ObSensor.h @@ -1,4 +1,4 @@ -/* License: Apache 2.0. See LICENSE file in root directory. +/* License: Apache 2.0. See LICENSE file in root directory. Copyright(c) 2020 Orbbec Corporation. All Rights Reserved. */ /** diff --git a/orbbec_camera/SDK/include/libobsensor/ObSensor.hpp b/orbbec_camera/SDK/include/libobsensor/ObSensor.hpp index 94f71c6c..fbc07d29 100644 --- a/orbbec_camera/SDK/include/libobsensor/ObSensor.hpp +++ b/orbbec_camera/SDK/include/libobsensor/ObSensor.hpp @@ -1,4 +1,4 @@ -/* License: Apache 2.0. See LICENSE file in root directory. +/* License: Apache 2.0. See LICENSE file in root directory. Copyright(c) 2020 Orbbec Corporation. All Rights Reserved. */ /** diff --git a/orbbec_camera/SDK/include/libobsensor/h/Context.h b/orbbec_camera/SDK/include/libobsensor/h/Context.h index 6586f5b3..50e93b52 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Context.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Context.h @@ -1,4 +1,4 @@ -/** +/** * @file Context.h * @brief Context is a management class that describes the runtime of the SDK and is responsible for resource allocation and release of the SDK. * Context has the ability to manage multiple devices. It is responsible for enumerating devices, monitoring device callbacks, and enabling multi-device diff --git a/orbbec_camera/SDK/include/libobsensor/h/Device.h b/orbbec_camera/SDK/include/libobsensor/h/Device.h index 4e2fd453..c6b54f12 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Device.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Device.h @@ -1,4 +1,4 @@ -/** +/** * @file Device.h * @brief Device-related functions, including operations such as obtaining and creating a device, setting and obtaining device property, and obtaining sensors */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Error.h b/orbbec_camera/SDK/include/libobsensor/h/Error.h index d728426c..ffa5e5d6 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Error.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Error.h @@ -1,4 +1,4 @@ -/** +/** * @file Error.h * @brief Functions for handling errors, mainly used for obtaining error messages. */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Filter.h b/orbbec_camera/SDK/include/libobsensor/h/Filter.h index 7c5748e2..30e7f9ff 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Filter.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Filter.h @@ -1,4 +1,4 @@ -/** +/** * @file Filter.h * @brief The processing unit of the SDK can perform point cloud generation, format conversion and other functions. */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Frame.h b/orbbec_camera/SDK/include/libobsensor/h/Frame.h index 74094505..d532cddc 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Frame.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Frame.h @@ -1,4 +1,4 @@ -/** +/** * @file Frame.h * @brief Frame related function is mainly used to obtain frame data and frame information * diff --git a/orbbec_camera/SDK/include/libobsensor/h/MultipleDevices.h b/orbbec_camera/SDK/include/libobsensor/h/MultipleDevices.h index fb471715..01dbadb3 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/MultipleDevices.h +++ b/orbbec_camera/SDK/include/libobsensor/h/MultipleDevices.h @@ -1,4 +1,4 @@ -/** +/** * @file MultipleDevices.h * @brief This file contains the multiple devices related API witch is used to control the synchronization between multiple devices and the synchronization * between different sensor within single device. diff --git a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h index 4455f52a..f536fae5 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h +++ b/orbbec_camera/SDK/include/libobsensor/h/ObTypes.h @@ -1,4 +1,4 @@ -// License: Apache 2.0. See LICENSE file in root directory. +// License: Apache 2.0. See LICENSE file in root directory. // Copyright(c) 2020 Orbbec Corporation. All Rights Reserved. /** @@ -68,8 +68,14 @@ typedef struct RecorderImpl ob_recorder; typedef struct PlaybackImpl ob_playback; typedef struct OBDepthWorkModeListImpl ob_depth_work_mode_list; +#define OB_WIDTH_ANY 0 +#define OB_HEIGHT_ANY 0 +#define OB_FPS_ANY 0 +#define OB_FORMAT_ANY OB_FORMAT_UNKNOWN +#define OB_PROFILE_DEFAULT 0 + /** - * @brief senddata or recdata return status type + * @brief send data or receive data return status type */ typedef enum { HP_STATUS_OK = 0, /**< success*/ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Pipeline.h b/orbbec_camera/SDK/include/libobsensor/h/Pipeline.h index 780fb337..54a148a8 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Pipeline.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Pipeline.h @@ -1,4 +1,4 @@ -/** +/** * @file Pipeline.h * @brief The SDK's advanced API can quickly implement functions such as switching streaming, frame synchronization, software filtering, etc., suitable for * applications, and the algorithm focuses on rgbd data stream scenarios. If you are on real-time or need to handle synchronization separately, align the scene. diff --git a/orbbec_camera/SDK/include/libobsensor/h/Property.h b/orbbec_camera/SDK/include/libobsensor/h/Property.h index 9e128870..9b4e5c0c 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Property.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Property.h @@ -1,4 +1,4 @@ -// License: Apache 2.0. See LICENSE file in root directory. +// License: Apache 2.0. See LICENSE file in root directory. // Copyright(c) 2020 Orbbec Corporation. All Rights Reserved. /** diff --git a/orbbec_camera/SDK/include/libobsensor/h/RecordPlayback.h b/orbbec_camera/SDK/include/libobsensor/h/RecordPlayback.h index e7c449c4..b1748f56 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/RecordPlayback.h +++ b/orbbec_camera/SDK/include/libobsensor/h/RecordPlayback.h @@ -1,4 +1,4 @@ -/** +/** * @file RecordPlayback.h * @brief Header file for recording and playback functions. */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Sensor.h b/orbbec_camera/SDK/include/libobsensor/h/Sensor.h index a2f69e52..08783502 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Sensor.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Sensor.h @@ -1,4 +1,4 @@ -/** +/** * @file Sensor.h * @brief Defines types related to sensors, used for obtaining stream configurations, opening and closing streams, and setting and getting sensor properties. */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/StreamProfile.h b/orbbec_camera/SDK/include/libobsensor/h/StreamProfile.h index e3074cfa..7a014555 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/StreamProfile.h +++ b/orbbec_camera/SDK/include/libobsensor/h/StreamProfile.h @@ -1,4 +1,4 @@ -/** +/** * @file StreamProfile.h * @brief The stream profile related type is used to get information such as the width, height, frame rate, and format of the stream. * @@ -96,10 +96,10 @@ ob_gyro_sample_rate ob_gyro_stream_profile_sample_rate(ob_stream_profile *profil * the first one in the list will be returned by default. If no matched profile is found, an error will be returned. * * @param[in] profile_list Resolution list. - * @param[in] width Width. If you don't need to add matching conditions, you can pass 0. - * @param[in] height Height. If you don't need to add matching conditions, you can pass 0. - * @param[in] format Format. If you don't need to add matching conditions, you can pass OB_FORMAT_UNKNOWN. - * @param[in] fps Frame rate. If you don't need to add matching conditions, you can pass 0. + * @param[in] width Width. If you don't need to add matching conditions, you can pass OB_WIDTH_ANY. + * @param[in] height Height. If you don't need to add matching conditions, you can pass OB_HEIGHT_ANY. + * @param[in] format Format. If you don't need to add matching conditions, you can pass OB_FORMAT_ANY. + * @param[in] fps Frame rate. If you don't need to add matching conditions, you can pass OB_FPS_ANY. * @param[out] error Log error messages. * @return The matching profile. */ diff --git a/orbbec_camera/SDK/include/libobsensor/h/Version.h b/orbbec_camera/SDK/include/libobsensor/h/Version.h index 262455e1..2cf5efa8 100644 --- a/orbbec_camera/SDK/include/libobsensor/h/Version.h +++ b/orbbec_camera/SDK/include/libobsensor/h/Version.h @@ -1,4 +1,4 @@ -/** +/** * @file Version.h * @brief Functions for retrieving the SDK version number information. * diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Context.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Context.hpp index caddb040..5a465c14 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Context.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Context.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Context.hpp * @brief The SDK context class, which serves as the entry point to the underlying SDK. It is used to query device lists, handle device callbacks, and set the * log level. diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp index 314867ff..869cf670 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Device.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Device.hpp * @brief Device related types, including operations such as getting and creating a device, setting and obtaining device attributes, and obtaining sensors * diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Error.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Error.hpp index 6887e451..a6bd71cd 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Error.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Error.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Error.hpp * @brief This file defines the Error class, which describes abnormal errors within the SDK. * Detailed information about the exception can be obtained through this class. diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp index 29633fc0..1525b37f 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Filter.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Filter.hpp * @brief This file contains the Filter class, which is the processing unit of the SDK that can perform point cloud generation, format conversion, and other * functions. diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Frame.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Frame.hpp index b46e4217..61dc97da 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Frame.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Frame.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Frame.hpp * @brief Frame related type, which is mainly used to obtain frame data and frame information. * diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp index 37a745fb..93009c0c 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Pipeline.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Pipeline.hpp * @brief The SDK's advanced API type can quickly implement switching streaming and frame synchronization * operations. diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/RecordPlayback.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/RecordPlayback.hpp index ac1168cd..b82419fc 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/RecordPlayback.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/RecordPlayback.hpp @@ -1,4 +1,4 @@ -/** +/** * @file RecordPlayback.hpp * @brief Header file for recording and playback functions. */ diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Sensor.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Sensor.hpp index c24bf2bc..4235d997 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Sensor.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Sensor.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Sensor.hpp * @brief Defines types related to sensors, which are used to obtain stream configurations, open and close streams, and set and get sensor properties. */ diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/StreamProfile.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/StreamProfile.hpp index 1c5ca06c..93b3b476 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/StreamProfile.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/StreamProfile.hpp @@ -1,4 +1,4 @@ -/** +/** * @file StreamProfile.hpp * @brief The stream profile related type is used to get information such as the width, height, frame rate, and format of the stream. */ @@ -200,13 +200,14 @@ public: * @brief Match the corresponding video stream profile based on the passed-in parameters. If multiple Match are found, the first one in the list is * returned by default. Throws an exception if no matching profile is found. * - * @param width The width of the stream. Pass 0 if no matching condition is required. - * @param height The height of the stream. Pass 0 if no matching condition is required. - * @param format The type of the stream. Pass OB_FORMAT_UNKNOWN if no matching condition is required. - * @param fps The frame rate of the stream. Pass 0 if no matching condition is required. + * @param width The width of the stream. Pass OB_WIDTH_ANY if no matching condition is required. + * @param height The height of the stream. Pass OB_HEIGHT_ANY if no matching condition is required. + * @param format The type of the stream. Pass OB_FORMAT_ANY if no matching condition is required. + * @param fps The frame rate of the stream. Pass OB_FPS_ANY if no matching condition is required. * @return std::shared_ptr Return the matching resolution. */ - const std::shared_ptr getVideoStreamProfile(int width = 0, int height = 0, OBFormat format = OB_FORMAT_UNKNOWN, int fps = 0); + const std::shared_ptr getVideoStreamProfile(int width = OB_WIDTH_ANY, int height = OB_HEIGHT_ANY, OBFormat format = OB_FORMAT_ANY, + int fps = OB_FPS_ANY); /** * @brief Match the corresponding accelerometer stream profile based on the passed-in parameters. If multiple Match are found, the first one in the list diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Types.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Types.hpp index e3d37197..dd86ca2b 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Types.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Types.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Types.hpp * @brief Provides SDK structure and enumeration constant definitions (depending on libobsensor/h/ObTypes.h). */ diff --git a/orbbec_camera/SDK/include/libobsensor/hpp/Version.hpp b/orbbec_camera/SDK/include/libobsensor/hpp/Version.hpp index c9998b10..11e1bb1f 100644 --- a/orbbec_camera/SDK/include/libobsensor/hpp/Version.hpp +++ b/orbbec_camera/SDK/include/libobsensor/hpp/Version.hpp @@ -1,4 +1,4 @@ -/** +/** * @file Version.hpp * @brief Provides functions to retrieve version information of the SDK. */ diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so index 693b2884..253ea98d 120000 --- a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so +++ b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so @@ -1 +1 @@ -libOrbbecSDK.so.1.7 \ No newline at end of file +libOrbbecSDK.so.1.8 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7 b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7 deleted file mode 120000 index 98cdb4ed..00000000 --- a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7 +++ /dev/null @@ -1 +0,0 @@ -libOrbbecSDK.so.1.7.4 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7.4 b/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7.4 deleted file mode 100644 index 4bdaf32f..00000000 Binary files a/orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.7.4 and /dev/null differ diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so index 693b2884..253ea98d 120000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so +++ b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so @@ -1 +1 @@ -libOrbbecSDK.so.1.7 \ No newline at end of file +libOrbbecSDK.so.1.8 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7 deleted file mode 120000 index 98cdb4ed..00000000 --- a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7 +++ /dev/null @@ -1 +0,0 @@ -libOrbbecSDK.so.1.7.4 \ No newline at end of file diff --git a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7.4 b/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7.4 deleted file mode 100644 index b1f0481e..00000000 Binary files a/orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.7.4 and /dev/null differ