Merge pull request #7368 from remibettan/51-fix-android-bug

correction of the order in the extensions list to avoid android bug
IntelRealSense · Sep 17, 2020 · 13e84f4 · 13e84f4
2 parents cd6044b + 5b72b57
commit 13e84f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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;