fixed multi camera namespace error

This commit is contained in:
Joe Dong
2023-02-16 16:14:38 +08:00
parent 31c0f91372
commit 689e6b22c7
34 changed files with 111 additions and 80 deletions
@@ -1355,16 +1355,27 @@ typedef void (*ob_frameset_callback)(ob_frame *frameset, void *user_data);
*/
typedef void(ob_frame_destroy_callback)(void *buffer, void *context);
/*
* 由于 Gemini2 产品有左右 IR,特地提供函数判断是否为 IR 相关的 Type
/**
* @brief 判断是否为 IR Sensor
*
*/
OB_EXTENSION_API bool is_ir_frame(const ob_frame_type type);
#define isIRFrame is_ir_frame
OB_EXTENSION_API bool is_ir_sensor(const ob_sensor_type type);
#define is_ir_sensor(sensor_type) (sensor_type == OB_SENSOR_IR || sensor_type == OB_SENSOR_IR_LEFT || sensor_type == OB_SENSOR_IR_RIGHT)
#define isIRSensor is_ir_sensor
OB_EXTENSION_API bool is_ir_stream(const ob_stream_type type);
/**
* @brief 判断是否为 IR 数据流
*
*/
#define is_ir_stream(stream_type) (stream_type == OB_STREAM_IR || stream_type == OB_STREAM_IR_LEFT || stream_type == OB_STREAM_IR_RIGHT)
#define isIRStream is_ir_stream
/**
* @brief 判断是否为 IR 数据帧
*
*/
#define is_ir_frame(frame_type) (frame_type == OB_FRAME_IR || frame_type == OB_FRAME_IR_LEFT || frame_type == OB_FRAME_IR_RIGHT)
#define isIRFrame is_ir_frame
#ifdef __cplusplus
}
#endif
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c79f5da818560081b68350527b0c0e61dd0230bc610aeb3f6cc6436c6d8dfd48
size 75946008
oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700
size 76081276
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c79f5da818560081b68350527b0c0e61dd0230bc610aeb3f6cc6436c6d8dfd48
size 75946008
oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700
size 76081276
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c79f5da818560081b68350527b0c0e61dd0230bc610aeb3f6cc6436c6d8dfd48
size 75946008
oid sha256:c7ba3aa46d3e7a031f425b8bb06f9834d2e9a7ba5f526e88e01d1e2002eb5700
size 76081276
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e60b58fcbb30eb17fcacc77e9f7be148a5816c77370a432eab943b4e407a444
size 87973560
oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9
size 88298992
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e60b58fcbb30eb17fcacc77e9f7be148a5816c77370a432eab943b4e407a444
size 87973560
oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9
size 88298992
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e60b58fcbb30eb17fcacc77e9f7be148a5816c77370a432eab943b4e407a444
size 87973560
oid sha256:680419d1efec079b7ef8dc3c2a48ff9884902d977e0361535f3b25cf0e944fe9
size 88298992
+2 -2
View File
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c0696d63a497f5ef3961ccaa211b1428f448011681f2ad51bc83c3e7f122bd7
size 85531704
oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed
size 86041960
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c0696d63a497f5ef3961ccaa211b1428f448011681f2ad51bc83c3e7f122bd7
size 85531704
oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed
size 86041960
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c0696d63a497f5ef3961ccaa211b1428f448011681f2ad51bc83c3e7f122bd7
size 85531704
oid sha256:72980b0d143d885ae58939c63ac0bfaa302d33284dc21001e095edd5d17ec5ed
size 86041960