fix(addImage, classify, predict): now featureExtractor works with images (it was working only with video) (#191)

* fix(addImage, classify, predict): now featureExtractor works with images (it was working only with v

* fix(addImage, classify, predict): now featureExtractor works with images (it was working only with video

Author: danidask

src/FeatureExtractor/Mobilenet.js

@@ -95,7 +95,7 @@ class Mobilenet {
     if (inputOrLabel instanceof HTMLImageElement || inputOrLabel instanceof HTMLVideoElement) {
       imgToAdd = inputOrLabel;
     } else if (typeof inputOrLabel === 'object' && (inputOrLabel.elt instanceof HTMLImageElement || inputOrLabel.elt instanceof HTMLVideoElement)) {
-      imgToAdd = inputOrLabel;
+      imgToAdd = inputOrLabel.elt;
     } else if (typeof inputOrLabel === 'string' || typeof inputOrLabel === 'number') {
       imgToAdd = this.video;
       label = inputOrLabel;
@@ -121,7 +121,8 @@ class Mobilenet {
   async addImageInternal(imgToAdd, label) {
     await this.ready;
     tf.tidy(() => {
-      const processedImg = imgToTensor(imgToAdd);
+      const imageResize = (imgToAdd === this.video) ? null : [IMAGESIZE, IMAGESIZE];
+      const processedImg = imgToTensor(imgToAdd, imageResize);
       const prediction = this.mobilenetFeatures.predict(processedImg);
 
       let y;
@@ -243,7 +244,8 @@ class Mobilenet {
     await tf.nextFrame();
     this.isPredicting = true;
     const predictedClass = tf.tidy(() => {
-      const processedImg = imgToTensor(imgToPredict);
+      const imageResize = (imgToPredict === this.video) ? null : [IMAGESIZE, IMAGESIZE];
+      const processedImg = imgToTensor(imgToPredict, imageResize);
       const activation = this.mobilenetFeatures.predict(processedImg);
       const predictions = this.customModel.predict(activation);
       return predictions.as1D().argMax();
@@ -281,7 +283,8 @@ class Mobilenet {
     await tf.nextFrame();
     this.isPredicting = true;
     const predictedClass = tf.tidy(() => {
-      const processedImg = imgToTensor(imgToPredict);
+      const imageResize = (imgToPredict === this.video) ? null : [IMAGESIZE, IMAGESIZE];
+      const processedImg = imgToTensor(imgToPredict, imageResize);
       const activation = this.mobilenetFeatures.predict(processedImg);
       const predictions = this.customModel.predict(activation);
       return predictions.as1D();