updated body tracking SDK to 0.9.5

wouterverweirder · Dec 22, 2019 · 27c6b6b · 27c6b6b
1 parent d5deecc
commit 27c6b6b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/lib/kinect-azure.js b/lib/kinect-azure.js
@@ -81,7 +81,7 @@ class KinectAzure {
 }
 {
   KinectAzure.K4ABT_JOINT_PELVIS = 0,
-  KinectAzure.K4ABT_JOINT_SPINE_NAVAL = 1,
+  KinectAzure.K4ABT_JOINT_SPINE_NAVEL = 1,
   KinectAzure.K4ABT_JOINT_SPINE_CHEST = 2,
   KinectAzure.K4ABT_JOINT_NECK = 3,
   KinectAzure.K4ABT_JOINT_CLAVICLE_LEFT = 4,

diff --git a/lib/settings.js b/lib/settings.js
@@ -2,9 +2,9 @@ const path = require('path');
 
 module.exports = () => {
   const KINECT_SENSOR_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.Sensor/1.3.0';
-  const KINECT_BODY_TRACKING_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking/0.9.4';
-  const KINECT_BODY_TRACKING_DEPENDENCIES_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies/0.9.0';
-  const KINECT_CUDNN_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies.cuDNN/0.9.0';
+  const KINECT_BODY_TRACKING_SDK_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking/0.9.5';
+  const KINECT_BODY_TRACKING_DEPENDENCIES_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies/0.9.1';
+  const KINECT_CUDNN_URL = 'https://www.nuget.org/api/v2/package/Microsoft.Azure.Kinect.BodyTracking.Dependencies.cuDNN/0.9.1';
 
   const TARGET_SDK_DIR = path.resolve(__dirname, '../sdk');
   const TARGET_KINECT_SENSOR_SDK_ZIP = path.resolve(TARGET_SDK_DIR, 'sensor-sdk.zip');

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kinect-azure",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Nodejs library to access the azure kinect data from the official SDK",
   "repository": "https://github.com/wouterverweirder/kinect-azure",
   "main": "lib/kinect-azure.js",
@@ -16,6 +16,8 @@
   },
   "scripts": {
     "install": "node ./scripts/install.js && node-gyp rebuild",
+    "clean": "node ./scripts/clean.js",
+    "reinstall": "npm run clean && npm run install",
     "prepublishOnly": "rimraf ./examples/**/node_modules"
   },
   "gypfile": true,

diff --git a/scripts/clean.js b/scripts/clean.js
@@ -0,0 +1,18 @@
+const fs = require('fs-extra');
+const path = require('path');
+const settings = require('../lib/settings.js')();
+
+const init = async () => {
+  await fs.remove(settings.TARGET_SDK_DIR);
+
+  const appRoot = process.cwd().split('/node_modules')[0];
+  const { appRootDlls } = settings;
+  for (const dllName in appRootDlls) {
+    if (appRootDlls.hasOwnProperty(dllName)) {
+      const dllTargetPath = path.resolve(appRoot, dllName);
+      await fs.remove(dllTargetPath);
+    }
+  }
+};
+
+init();
diff --git a/src/kinect_azure.cc b/src/kinect_azure.cc
@@ -418,7 +418,8 @@ Napi::Value MethodStartListening(const Napi::CallbackInfo& info) {
         k4a_wait_result_t queue_capture_result = k4abt_tracker_enqueue_capture(g_tracker, sensor_capture, 0);
         if (queue_capture_result == K4A_WAIT_RESULT_FAILED)
         {
-          // printf("[kinect_azure.cc] Error! Add capture to tracker process queue failed!\n");
+          k4a_capture_release(sensor_capture);
+          mtx.unlock();
           break;
         }
 
@@ -480,6 +481,7 @@ Napi::Value MethodStartListening(const Napi::CallbackInfo& info) {
 
       if (!is_listening)
       {
+        mtx.unlock();
         break;
       }
       // Perform a blocking call