Merge pull request #221 from JingyuanZhang/master

fix(core): fix webgl_feed_process

Author: yueshuangyan

packages/paddlejs-core/src/mediaProcessor.ts

@@ -68,8 +68,8 @@ export default class MediaProcessor {
             }] as InputFeed[];
         }
 
-        this.pixelWidth = pixels.width;
-        this.pixelHeight = pixels.height;
+        this.pixelWidth = (pixels as HTMLImageElement).naturalWidth || pixels.width;
+        this.pixelHeight = (pixels as HTMLImageElement).naturalHeight || pixels.height;
 
 
         this.fitToTargetSize(pixels, imageDataInfo, env.get('webgl_feed_process'));

packages/paddlejs-core/src/runner.ts

@@ -209,12 +209,17 @@ export default class Runner {
             return tensorData.find(tensor => tensor.tensorId.endsWith('_image'));
         }) as OpExecutor;
 
-        let imageInputTensor: Tensor = imageOp.opData.inputTensors[0];
-        const imageInputTensorParams = imageInputTensor.opts;
-        imageInputTensorParams.shape = feed[0].shape;
-        imageInputTensorParams.data = feed[0].data;
-        imageInputTensor = new Tensor(imageInputTensorParams);
-        imageOp.opData.inputTensors = [imageInputTensor];
+        const imageInputTensor = imageOp.opData.inputTensors.find(
+            tensor => tensor.tensorId.endsWith('_image')
+        );
+        imageInputTensor.data = feed[0].data;
+
+        if (env.get('webgl_feed_process')) {
+            const imageInputTensorParams = imageInputTensor.opts;
+            imageInputTensorParams.shape = feed[0].shape;
+            imageInputTensorParams.data = feed[0].data;
+            imageOp.opData.inputTensors = [new Tensor(imageInputTensorParams)];
+        }
     }
 
     async execute() {