Update OrbbecSDK to v1.8.1

2026-10-04 03:57:46 +08:00 · 2023-10-11 09:39:26 +08:00
parent 1d0d78ceac
commit 897205b17d
32 changed files with 45 additions and 40 deletions
@@ -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. */

 /**
@@ -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. */

 /**
@@ -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
@@ -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
 */
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Error.h
 * @brief Functions for handling errors, mainly used for obtaining error messages.
 */
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Filter.h
 * @brief The processing unit of the SDK can perform point cloud generation, format conversion and other functions.
 */
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Frame.h
 * @brief Frame related function is mainly used to obtain frame data and frame information
 *
@@ -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.
@@ -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*/
@@ -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.
@@ -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.

 /**
@@ -1,4 +1,4 @@
-/**
+/**
 * @file RecordPlayback.h
 * @brief Header file for recording and playback functions.
 */
@@ -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.
 */
@@ -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.
 */
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Version.h
 * @brief Functions for retrieving the SDK version number information.
 *
@@ -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.
@@ -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
 *
@@ -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.
@@ -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.
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Frame.hpp
 * @brief Frame related type, which is mainly used to obtain frame data and frame information.
 *
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Pipeline.hpp
 * @brief The SDK's advanced API type can quickly implement switching streaming and frame synchronization
 * operations.
@@ -1,4 +1,4 @@
-/**
+/**
 * @file RecordPlayback.hpp
 * @brief Header file for recording and playback functions.
 */
@@ -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.
 */
@@ -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<VideoStreamProfile> Return the matching resolution.
     */
-    const std::shared_ptr<VideoStreamProfile> getVideoStreamProfile(int width = 0, int height = 0, OBFormat format = OB_FORMAT_UNKNOWN, int fps = 0);
+    const std::shared_ptr<VideoStreamProfile> 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
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Types.hpp
 * @brief Provides SDK structure and enumeration constant definitions (depending on libobsensor/h/ObTypes.h).
 */
@@ -1,4 +1,4 @@
-/**
+/**
 * @file Version.hpp
 * @brief Provides functions to retrieve version information of the SDK.
 */