edge-impulse-linux 1.15.4 → 1.15.5

package/build/sdk/studio/sdk/model/permission.js

@@ -12,5 +12,5 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PermissionValues = void 0;
-exports.PermissionValues = ['admin:infra:disallowedEmailDomains:write', 'admin:infra:featureFlags:read', 'admin:infra:featureFlags:write', 'admin:infra:config:read', 'admin:infra:config:write', 'admin:infra:migrations:read', 'admin:infra:migrations:write', 'admin:metrics:read', 'admin:metrics:write', 'admin:oauth:read', 'admin:oauth:write', 'admin:organizations:read', 'admin:organizations:write', 'admin:organizations:members:write', 'admin:projects:members:write', 'admin:projects:read', 'admin:projects:write', 'admin:trashbin:write', 'admin:trials:read', 'admin:trials:write', 'admin:users:permissions:write', 'admin:users:read', 'admin:users:write', 'admin:jobs:read', 'admin:emails:verification:code:read', 'projects:limits:write', 'projects:training:keras:write', 'thirdpartyauth:read', 'thirdpartyauth:write', 'users:emails:read', 'whitelabels:read', 'whitelabels:write', 'test:data:write'];
+exports.PermissionValues = ['admin:infra:disallowedEmailDomains:write', 'admin:infra:featureFlags:read', 'admin:infra:featureFlags:write', 'admin:infra:config:read', 'admin:infra:config:write', 'admin:infra:migrations:read', 'admin:infra:migrations:write', 'admin:metrics:read', 'admin:metrics:write', 'admin:oauth:read', 'admin:oauth:write', 'admin:organizations:read', 'admin:organizations:write', 'admin:organizations:members:write', 'admin:projects:members:write', 'admin:projects:read', 'admin:projects:write', 'admin:trashbin:write', 'admin:trials:read', 'admin:trials:write', 'admin:users:permissions:write', 'admin:users:read', 'admin:users:write', 'admin:jobs:read', 'admin:emails:verification:code:read', 'admin:sso:domainIdps:write', 'projects:limits:write', 'projects:training:keras:write', 'thirdpartyauth:read', 'thirdpartyauth:write', 'users:emails:read', 'whitelabels:read', 'whitelabels:write', 'test:data:write'];
 //# sourceMappingURL=permission.js.map

package/build/sdk/studio/sdk/model/permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../../../../sdk/studio/sdk/model/permission.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAKU,QAAA,gBAAgB,GAAa,CAAC,0CAA0C,EAAE,+BAA+B,EAAE,gCAAgC,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,8BAA8B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../../../../sdk/studio/sdk/model/permission.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAKU,QAAA,gBAAgB,GAAa,CAAC,0CAA0C,EAAE,+BAA+B,EAAE,gCAAgC,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,6BAA6B,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,mCAAmC,EAAE,8BAA8B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,+BAA+B,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,4BAA4B,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC"}

package/examples/js/classify-camera.js

@@ -48,7 +48,9 @@ const { ImageClassifier, LinuxImpulseRunner, Ffmpeg, Imagesnap, RunnerHelloHasAn
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new Ffmpeg(false /* verbose */, {
+                scaleAndCropInPipeline: true,
+            });
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -71,7 +73,12 @@ const { ImageClassifier, LinuxImpulseRunner, Ffmpeg, Imagesnap, RunnerHelloHasAn
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/examples/ts/classify-camera-webserver.ts

@@ -1,4 +1,4 @@
-import { ImageClassifier, LinuxImpulseRunner, Ffmpeg, ICamera, Imagesnap, ModelInformation } from "../../library";
+import { ImageClassifier, LinuxImpulseRunner, ICamera, Imagesnap, ModelInformation, GStreamer } from "../../library";
 import { ips } from "../../cli-common/get-ips";
 import sharp from 'sharp';
 import express = require('express');
@@ -58,7 +58,7 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new GStreamer(false /* verbose */);
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -81,7 +81,12 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/examples/ts/classify-camera.ts

@@ -1,4 +1,4 @@
-import { ImageClassifier, LinuxImpulseRunner, Ffmpeg, ICamera, Imagesnap } from "../../library";
+import { ImageClassifier, LinuxImpulseRunner, ICamera, Imagesnap, GStreamer } from "../../library";
 import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-runner";
 
 (async () => {
@@ -49,7 +49,9 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
             camera = new Imagesnap();
         }
         else if (process.platform === 'linux') {
-            camera = new Ffmpeg(false /* verbose */);
+            camera = new GStreamer(false /* verbose */, {
+                scaleAndCropInPipeline: true,
+            });
         }
         else {
             throw new Error('Unsupported platform "' + process.platform + '"');
@@ -72,7 +74,12 @@ import { RunnerHelloHasAnomaly } from "../../library/classifier/linux-impulse-ru
         await camera.start({
             device: device,
             intervalMs: 1000 / fps,
-            dimensions: dimensions
+            dimensions: dimensions,
+            inferenceDimensions: {
+                width: model.modelParameters.image_input_width,
+                height: model.modelParameters.image_input_height,
+                resizeMode: model.modelParameters.image_resize_mode || 'none',
+            },
         });
 
         camera.on('error', error => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-impulse-linux",
-  "version": "1.15.4",
+  "version": "1.15.5",
   "description": "Node.js SDK and tools for Edge Impulse for Linux",
   "directories": {
     "example": "examples"

package/test/gstreamer.test.ts

@@ -5234,6 +5234,7 @@ Freeing pipeline ...
 
             const gstreamer = new GStreamer(false, {
                 spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
             });
             await gstreamer.init();
             const launchResp = await gstreamer.getGstreamerLaunchCommand({
@@ -5246,7 +5247,195 @@ Freeing pipeline ...
                     type: "pylonsrc",
                 }],
                 videoSource: 'pylonsrc',
-            }, { width: 1440, height: 1080 });
+            }, { width: 1440, height: 1080 }, undefined);
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #1", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'fit-shortest',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! videocrop left=180 right=180 ! videoscale method=lanczos ! video/x-raw,width=320,height=320 ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #2", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'squash',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! videoscale method=lanczos ! video/x-raw,width=320,height=320 ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #3", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: true,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'fit-longest',
+            });
+
+            // console.log('launchResp', launchResp);
+
+            assert.equal(launchResp.invokeProcess, 'spawn');
+            assert.equal(launchResp.command, 'gst-launch-1.0');
+            assert.equal(launchResp.args.join(' '),
+                'pylonsrc ! video/x-raw,width=1440,height=1080 ! videoconvert ! jpegenc ! multifilesink location=test%05d.jpg');
+        });
+
+        it("w/ inference dims #4", async () => {
+            const spawnHelper: SpawnHelperType = async (command: string,
+                args: string[],
+                opts: {
+                    ignoreErrors: boolean,
+                    cwd ? : string
+                } = {
+                    ignoreErrors: false
+                }) => {
+
+                if (command === 'which') {
+                    return  '';
+                }
+                else {
+                    throw new Error('spawnHelper failed on ' + command + ' ' + args.join(' '));
+                }
+            };
+
+            const gstreamer = new GStreamer(false, {
+                spawnHelperOverride: spawnHelper,
+                scaleAndCropInPipeline: undefined,
+            });
+            await gstreamer.init();
+            const launchResp = await gstreamer.getGstreamerLaunchCommand({
+                id: 'pylonsrc',
+                name: 'Basler camera',
+                caps: [{
+                    framerate: 60,
+                    height: 1080,
+                    width: 1440,
+                    type: "pylonsrc",
+                }],
+                videoSource: 'pylonsrc',
+            }, { width: 1440, height: 1080 }, {
+                width: 320,
+                height: 320,
+                resizeMode: 'squash',
+            });
 
             // console.log('launchResp', launchResp);
 
@@ -5302,6 +5491,7 @@ async function testGetDevices(output: {
     const gstreamer = new GStreamer(false, {
         spawnHelperOverride: spawnHelper,
         modeOverride: output?.modeOverride,
+        scaleAndCropInPipeline: true,
     });
     await gstreamer.init();
     const devices = await gstreamer.getAllDevices();