From 5b72b574aee65ae7262e264a06b87cf4fa65c39a Mon Sep 17 00:00:00 2001 From: remibettan Date: Thu, 17 Sep 2020 11:26:38 +0300 Subject: [PATCH] correction of the order in the extensions list to avoid android bug --- include/librealsense2/h/rs_types.h | 4 ++-- .../java/com/intel/realsense/librealsense/Extension.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/librealsense2/h/rs_types.h b/include/librealsense2/h/rs_types.h index 524d2a579a..1ffbf6141c 100644 --- a/include/librealsense2/h/rs_types.h +++ b/include/librealsense2/h/rs_types.h @@ -191,8 +191,6 @@ typedef enum rs2_extension RS2_EXTENSION_TEMPORAL_FILTER, RS2_EXTENSION_HOLE_FILLING_FILTER, RS2_EXTENSION_ZERO_ORDER_FILTER, - RS2_EXTENSION_HDR_MERGE, - RS2_EXTENSION_SEQUENCE_ID_FILTER, RS2_EXTENSION_RECOMMENDED_FILTERS, RS2_EXTENSION_POSE, RS2_EXTENSION_POSE_SENSOR, @@ -212,6 +210,8 @@ typedef enum rs2_extension RS2_EXTENSION_AUTO_CALIBRATION_FILTER, RS2_EXTENSION_DEVICE_CALIBRATION, RS2_EXTENSION_CALIBRATED_SENSOR, + RS2_EXTENSION_HDR_MERGE, + RS2_EXTENSION_SEQUENCE_ID_FILTER, RS2_EXTENSION_COUNT } rs2_extension; const char* rs2_extension_type_to_string(rs2_extension type); diff --git a/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Extension.java b/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Extension.java index 8af8e8b8bd..94a83d7fbb 100644 --- a/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Extension.java +++ b/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Extension.java @@ -48,7 +48,12 @@ public enum Extension { FISHEYE_SENSOR(44), DEPTH_HUFFMAN_DECODER(45), SERIALIZABLE(46), - FW_LOGGER(47); + FW_LOGGER(47), + AUTO_CALIBRATION_FILTER(48), + DEVICE_CALIBRATION(49), + CALIBRATED_SENSOR(50), + HDR_MERGE(51), + SEQUENCE_ID_FILTER(52); private final int mValue;