Skip to content

Commit

Permalink
fix broken node buffers in node 14+ - related to #62
Browse files Browse the repository at this point in the history
  • Loading branch information
@wouterverweirder
wouterverweirder committed Jul 31, 2021
1 parent d7cfacd commit 20d96db
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 32 deletions.
16 changes: 9 additions & 7 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kinect2",
"version": "0.2.3",
"version": "0.2.4",
"description": "Nodejs library to access the kinect 2 data from the official MS SDK",
"repository": "https://github.com/wouterverweirder/kinect2",
"keywords": [
Expand All @@ -16,15 +16,18 @@
"main": "lib/kinect2.js",
"dependencies": {
"node-addon-api": "^1.0.0",
"prebuild-install": "^6.1.3"
"prebuild-install": "^6.1.3",
"prebuild": "^10.0.1"
},
"engines": {
"node": ">= 10.16.0"
},
"scripts": {
"install": "prebuild-install -t 4 --runtime napi || prebuild -t 4 --runtime napi || node-gyp rebuild",
"prebuild-install": "prebuild-install -t 4 --runtime napi --verbose",
"prebuild": "prebuild -t 4 --runtime napi",
"test": "npm run clean && npm run prebuild && node test.js",
"install": "prebuild-install -t 4 --runtime napi || prebuild -t 4 --runtime napi",
"prebuild-install": "prebuild-install -t 4 --runtime napi --verbose",
"prebuild": "prebuild -t 4 --runtime napi",
"clean": "rimraf ./lib/binding && rimraf ./build && rimraf ./prebuilds",
"package": "prebuild -t 4 --runtime napi -u",
"start": "cd ./examples/electron && npm start",
"prepublishOnly": "rimraf ./examples/**/node_modules"
Expand All @@ -41,7 +44,6 @@
]
},
"devDependencies": {
"rimraf": "^3.0.0",
"prebuild": "^10.0.1"
"rimraf": "^3.0.0"
}
}
66 changes: 41 additions & 25 deletions src/kinect2.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ IDepthFrameReader* m_pRawDepthFrameReader = NULL;
IBodyFrameReader* m_pBodyFrameReader = NULL;
IMultiSourceFrameReader* m_pMultiSourceFrameReader = NULL;

Napi::ObjectReference m_v8ObjectReference;

RGBQUAD* m_pColorPixels = new RGBQUAD[cColorWidth * cColorHeight];
RGBQUAD* m_pColorPixelsV8 = new RGBQUAD[cColorWidth * cColorHeight];
char* m_pInfraredPixels = new char[cInfraredWidth * cInfraredHeight];
Expand Down Expand Up @@ -756,8 +758,7 @@ Napi::Value MethodOpenColorReader(const Napi::CallbackInfo& info) {
return;
}
m_mColorReaderMutex.lock();
Napi::Buffer<RGBQUAD> imageData = Napi::Buffer<RGBQUAD>::New(env, pixelsRef, cColorWidth * cColorHeight);
jsCallback.Call( { imageData } );
jsCallback.Call( { m_v8ObjectReference.Get("colorBuffer") } );
m_mColorReaderMutex.unlock();
};

Expand Down Expand Up @@ -859,8 +860,7 @@ Napi::Value MethodOpenInfraredReader(const Napi::CallbackInfo& info) {
return;
}
m_mInfraredReaderMutex.lock();
Napi::Buffer<char> imageData = Napi::Buffer<char>::New(env, pixelsRef, cInfraredWidth * cInfraredHeight);
jsCallback.Call( { imageData } );
jsCallback.Call( { m_v8ObjectReference.Get("infraredBuffer") } );
m_mInfraredReaderMutex.unlock();
};

Expand Down Expand Up @@ -962,8 +962,7 @@ Napi::Value MethodOpenLongExposureInfraredReader(const Napi::CallbackInfo& info)
return;
}
m_mLongExposureInfraredReaderMutex.lock();
Napi::Buffer<char> imageData = Napi::Buffer<char>::New(env, pixelsRef, cLongExposureInfraredWidth * cLongExposureInfraredHeight);
jsCallback.Call( { imageData } );
jsCallback.Call( { m_v8ObjectReference.Get("longExposureInfraredBuffer") } );
m_mLongExposureInfraredReaderMutex.unlock();
};

Expand Down Expand Up @@ -1065,8 +1064,7 @@ Napi::Value MethodOpenDepthReader(const Napi::CallbackInfo& info) {
return;
}
m_mDepthReaderMutex.lock();
Napi::Buffer<char> imageData = Napi::Buffer<char>::New(env, pixelsRef, cDepthWidth * cDepthHeight);
jsCallback.Call( { imageData } );
jsCallback.Call( { m_v8ObjectReference.Get("depthPixelsBuffer") } );
m_mDepthReaderMutex.unlock();
};

Expand Down Expand Up @@ -1168,8 +1166,7 @@ Napi::Value MethodOpenRawDepthReader(const Napi::CallbackInfo& info) {
return;
}
m_mRawDepthReaderMutex.lock();
Napi::Buffer<UINT16> imageData = Napi::Buffer<UINT16>::New(env, pixelsRef, cDepthWidth * cDepthHeight);
jsCallback.Call( { imageData } );
jsCallback.Call( { m_v8ObjectReference.Get("rawDepthValuesBuffer") } );
m_mRawDepthReaderMutex.unlock();
};

Expand Down Expand Up @@ -1444,10 +1441,8 @@ Napi::Value MethodOpenMultiSourceReader(const Napi::CallbackInfo& info) {

if(NodeKinect2FrameTypes::FrameTypes_Color & m_enabledFrameTypes)
{
Napi::Buffer<RGBQUAD> v8ColorPixels = Napi::Buffer<RGBQUAD>::New(env, m_pColorPixelsV8, cColorWidth * cColorHeight);

Napi::Object v8ColorResult = Napi::Object::New(env);
v8ColorResult.Set(Napi::String::New(env, "buffer"), v8ColorPixels);
v8ColorResult.Set(Napi::String::New(env, "buffer"), m_v8ObjectReference.Get("colorBuffer"));

//field of view
v8ColorResult.Set(Napi::String::New(env, "horizontalFieldOfView"), Napi::Number::New(env, m_fColorHorizontalFieldOfViewV8));
Expand All @@ -1459,11 +1454,8 @@ Napi::Value MethodOpenMultiSourceReader(const Napi::CallbackInfo& info) {

if(NodeKinect2FrameTypes::FrameTypes_Depth & m_enabledFrameTypes)
{
//reuse the existing buffer
Napi::Buffer<char> v8DepthPixels = Napi::Buffer<char>::New(env, m_pDepthPixelsV8, cDepthWidth * cDepthHeight);

Napi::Object v8DepthResult = Napi::Object::New(env);
v8DepthResult.Set(Napi::String::New(env, "buffer"), v8DepthPixels);
v8DepthResult.Set(Napi::String::New(env, "buffer"), m_v8ObjectReference.Get("depthPixelsBuffer"));

//field of view
v8DepthResult.Set(Napi::String::New(env, "horizontalFieldOfView"), Napi::Number::New(env, m_fDepthHorizontalFieldOfViewV8));
Expand All @@ -1475,10 +1467,8 @@ Napi::Value MethodOpenMultiSourceReader(const Napi::CallbackInfo& info) {

if(NodeKinect2FrameTypes::FrameTypes_RawDepth & m_enabledFrameTypes)
{
Napi::Buffer<UINT16> v8RawDepthValues = Napi::Buffer<UINT16>::New(env, m_pRawDepthValuesV8, cDepthWidth * cDepthHeight);

Napi::Object v8RawDepthResult = Napi::Object::New(env);
v8RawDepthResult.Set(Napi::String::New(env, "buffer"), v8RawDepthValues);
v8RawDepthResult.Set(Napi::String::New(env, "buffer"), m_v8ObjectReference.Get("rawDepthBuffer"));

//field of view
v8RawDepthResult.Set(Napi::String::New(env, "horizontalFieldOfView"), Napi::Number::New(env, m_fDepthHorizontalFieldOfViewV8));
Expand All @@ -1490,10 +1480,8 @@ Napi::Value MethodOpenMultiSourceReader(const Napi::CallbackInfo& info) {

if(NodeKinect2FrameTypes::FrameTypes_DepthColor & m_enabledFrameTypes)
{
Napi::Buffer<char> v8DepthColorPixels = Napi::Buffer<char>::New(env, (char *)m_pDepthColorPixelsV8, cDepthWidth * cDepthHeight * sizeof(RGBQUAD));

Napi::Object v8DepthColorResult = Napi::Object::New(env);
v8DepthColorResult.Set(Napi::String::New(env, "buffer"), v8DepthColorPixels);
v8DepthColorResult.Set(Napi::String::New(env, "buffer"), m_v8ObjectReference.Get("depthColorPixelsBuffer"));

v8Result.Set(Napi::String::New(env, "depthColor"), v8DepthColorResult);
}
Expand All @@ -1510,13 +1498,13 @@ Napi::Value MethodOpenMultiSourceReader(const Napi::CallbackInfo& info) {
Napi::Object v8BodyIndexColorResult = Napi::Object::New(env);

Napi::Array v8bodies = Napi::Array::New(env, BODY_COUNT);
Napi::Array bodyIndexColorPixelsBuffers = m_v8ObjectReference.Get("bodyIndexColorPixelsBuffers").As<Napi::Array>();
for(int i = 0; i < BODY_COUNT; i++)
{
Napi::Object v8body = Napi::Object::New(env);
v8body.Set(Napi::String::New(env, "bodyIndex"), Napi::Number::New(env, i));
if(m_jsBodyFrameV8.bodies[i].hasPixels && m_trackPixelsForBodyIndexV8[i]) {
Napi::Buffer<RGBQUAD> v8ColorPixels = Napi::Buffer<RGBQUAD>::New(env, m_pBodyIndexColorPixelsV8[i], cColorWidth * cColorHeight);
v8body.Set(Napi::String::New(env, "buffer"), v8ColorPixels);
v8body.Set(Napi::String::New(env, "buffer"), bodyIndexColorPixelsBuffers.Get(i));
}
v8bodies.Set(i, v8body);
}
Expand Down Expand Up @@ -1890,6 +1878,34 @@ Napi::Value MethodTrackPixelsForBodyIndices(const Napi::CallbackInfo& info) {
Napi::Object Init(Napi::Env env, Napi::Object exports) {
printf("[kinect2.cc] Init\n");

m_v8ObjectReference = Napi::Reference<Napi::Object>::New(Napi::Object::New(env), 1);

Napi::Buffer<RGBQUAD> colorBuffer = Napi::Buffer<RGBQUAD>::New(env, m_pColorPixelsV8, cColorWidth * cColorHeight);
m_v8ObjectReference.Set("colorBuffer", colorBuffer);

Napi::Buffer<char> infraredBuffer = Napi::Buffer<char>::New(env, m_pInfraredPixelsV8, cInfraredWidth * cInfraredHeight);
m_v8ObjectReference.Set("infraredBuffer", infraredBuffer);

Napi::Buffer<char> longExposureInfraredBuffer = Napi::Buffer<char>::New(env, m_pLongExposureInfraredPixelsV8, cLongExposureInfraredWidth * cLongExposureInfraredHeight);
m_v8ObjectReference.Set("longExposureInfraredBuffer", longExposureInfraredBuffer);

Napi::Buffer<char> depthPixelsBuffer = Napi::Buffer<char>::New(env, m_pDepthPixelsV8, cDepthWidth * cDepthHeight);
m_v8ObjectReference.Set("depthPixelsBuffer", depthPixelsBuffer);

Napi::Buffer<UINT16> rawDepthValuesBuffer = Napi::Buffer<UINT16>::New(env, m_pRawDepthValuesV8, cDepthWidth * cDepthHeight);
m_v8ObjectReference.Set("rawDepthValuesBuffer", rawDepthValuesBuffer);

Napi::Buffer<char> depthColorPixelsBuffer = Napi::Buffer<char>::New(env, (char *)m_pDepthColorPixelsV8, cDepthWidth * cDepthHeight * sizeof(RGBQUAD));
m_v8ObjectReference.Set("depthColorPixelsBuffer", depthColorPixelsBuffer);

Napi::Array bodyIndexColorPixelsBuffers = Napi::Array::New(env, BODY_COUNT);
for(int i = 0; i < BODY_COUNT; i++)
{
Napi::Buffer<RGBQUAD> bodyIndexColorPixelsBuffer = Napi::Buffer<RGBQUAD>::New(env, m_pBodyIndexColorPixelsV8[i], cColorWidth * cColorHeight);
bodyIndexColorPixelsBuffers.Set(i, bodyIndexColorPixelsBuffer);
}
m_v8ObjectReference.Set(Napi::String::New(env, "bodyIndexColorPixelsBuffers"), bodyIndexColorPixelsBuffers);

exports.Set(Napi::String::New(env, "open"), Napi::Function::New(env, MethodOpen));
exports.Set(Napi::String::New(env, "close"), Napi::Function::New(env, MethodClose));

Expand Down

0 comments on commit 20d96db

Please sign in to comment.