Merge pull request #19831 from alalek:backport_19771

modules/js/perf/base.js

@@ -1,5 +1,10 @@
 if (typeof window === 'undefined') {
   var cv = require("../opencv");
+  if (cv instanceof Promise) {
+    loadOpenCV();
+  } else {
+    cv.onRuntimeInitialized = perf;
+  }
 }
 
 let gCvSize;
@@ -24,6 +29,10 @@ function getCvSize() {
   return gCvSize;
 }
 
+async function loadOpenCV() {
+  cv = await cv;
+}
+
 if (typeof window === 'undefined') {
   exports.getCvSize = getCvSize;
 }

modules/js/perf/perf_helpfunc.js

@@ -1,3 +1,10 @@
+const isNodeJs = (typeof window) === 'undefined'? true : false;
+
+if(isNodeJs) {
+  var Base = require("./base");
+  global.getCvSize = Base.getCvSize;
+}
+
 var fillGradient = function(cv, img, delta=5) {
   let ch = img.channels();
   console.assert(!img.empty() && img.depth() == cv.CV_8U && ch <= 4);
@@ -56,8 +63,8 @@ var smoothBorder = function(cv, img, color, delta=5) {
 
 var cvtStr2cvSize = function(strSize) {
   let size;
-
   let cvSize = getCvSize();
+
   switch(strSize) {
     case "127,61": size = cvSize.szODD;break;
     case '320,240': size = cvSize.szQVGA;break;

modules/js/perf/perf_imgproc/perf_blur.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_cvtcolor.js

@@ -17,7 +17,11 @@ function perf() {
   if (isNodeJs) {
     global.cv = cv;
     global.combine = HelpFunc.combine;
-    global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+    global.constructMode = HelpFunc.constructMode;
+    global.log = HelpFunc.log;
+    global.decodeParams2Case = HelpFunc.decodeParams2Case;
+    global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+    global.addKernelCase = HelpFunc.addKernelCase;
     global.cvSize = Base.getCvSize();
   } else {
     enableButton();

modules/js/perf/perf_imgproc/perf_dilate.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_erode.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_filter2D.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_gaussianBlur.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_medianBlur.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_pyrDown.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_remap.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_resize.js

@@ -17,7 +17,11 @@ function perf() {
   if (isNodeJs) {
     global.cv = cv;
     global.combine = HelpFunc.combine;
-    global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+    global.fillGradient = HelpFunc.fillGradient;
+    global.log = HelpFunc.log;
+    global.decodeParams2Case = HelpFunc.decodeParams2Case;
+    global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+    global.addKernelCase = HelpFunc.addKernelCase;
     global.cvSize = Base.getCvSize();
   } else {
     enableButton();

modules/js/perf/perf_imgproc/perf_scharr.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_sobel.js

@@ -17,7 +17,10 @@ function perf() {
     if (isNodeJs) {
       global.cv = cv;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase;
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_threshold.js

@@ -17,7 +17,10 @@ function perf() {
   if (isNodeJs) {
     global.cv = cv;
     global.combine = HelpFunc.combine;
-    global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+    global.log = HelpFunc.log;
+    global.decodeParams2Case = HelpFunc.decodeParams2Case;
+    global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+    global.addKernelCase = HelpFunc.addKernelCase;
     global.cvSize = Base.getCvSize();
   } else {
     enableButton();

modules/js/perf/perf_imgproc/perf_warpAffine.js

@@ -16,8 +16,13 @@ function perf() {
     console.log('opencv.js loaded');
     if (isNodeJs) {
       global.cv = cv;
+      global.fillGradient = HelpFunc.fillGradient;
+      global.smoothBorder = HelpFunc.smoothBorder;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();

modules/js/perf/perf_imgproc/perf_warpPerspective.js

@@ -16,8 +16,13 @@ function perf() {
     console.log('opencv.js loaded');
     if (isNodeJs) {
       global.cv = cv;
+      global.fillGradient = HelpFunc.fillGradient;
+      global.smoothBorder = HelpFunc.smoothBorder;
       global.combine = HelpFunc.combine;
-      global.cvtStr2cvSize = HelpFunc.cvtStr2cvSize;
+      global.log = HelpFunc.log;
+      global.decodeParams2Case = HelpFunc.decodeParams2Case;
+      global.setBenchmarkSuite = HelpFunc.setBenchmarkSuite;
+      global.addKernelCase = HelpFunc.addKernelCase
       global.cvSize = Base.getCvSize();
     } else {
       enableButton();