Check that the number of threads is between the minimum and maximum v…

…alues
ttoivone · Nov 8, 2019 · cc00fc4 · cc00fc4
1 parent 736c55c
commit cc00fc4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 58 deletions.
diff --git a/samples/emotionRecognizer/index.js b/samples/emotionRecognizer/index.js
@@ -223,21 +223,7 @@ function initUI() {
     utils.startCamera(videoConstraint, 'videoInput', startVideoProcessing);
   });
 
-  if (!isMobileDevice()) {
-    // Init threads number.
-    let threadsControl = document.getElementsByClassName('threads-control')[0];
-    threadsControl.classList.remove('hidden');
-    let threadsNumLabel = document.getElementById('threadsNumLabel');
-    let threadsNum = document.getElementById('threadsNum');
-    threadsNum.max = navigator.hardwareConcurrency;
-    threadsNumLabel.innerHTML = `Number of threads (1 - ${threadsNum.max}):&nbsp;`;
-    if (3 <= threadsNum.max) threadsNum.value = 3;
-    else threadsNum.value = 1;
-    cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    threadsNum.addEventListener('change', () => {
-      cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    });
-  }
+  enableThreads();
 }
 
 utils.loadOpenCv(() => {

diff --git a/samples/faceDetection/index.js b/samples/faceDetection/index.js
@@ -172,20 +172,7 @@ function initUI() {
     utils.startCamera(videoConstraint, 'videoInput', startVideoProcessing);
   });
 
-  if (!isMobileDevice()) {
-    // Init threads number.
-    let threadsControl = document.getElementsByClassName('threads-control')[0];
-    threadsControl.classList.remove('hidden');
-    let threadsNumLabel = document.getElementById('threadsNumLabel');
-    let threadsNum = document.getElementById('threadsNum');
-    threadsNum.max = navigator.hardwareConcurrency;
-    threadsNumLabel.innerHTML = `Number of threads (1 - ${threadsNum.max}):&nbsp;`;
-    if (3 <= threadsNum.max) threadsNum.value = 3;
-    else threadsNum.value = 1;
-    cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    threadsNum.addEventListener('change', () => {
-      cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    });
+  enableThreads();
   }
 
   // Event listener for dowscale parameter.

diff --git a/samples/funnyHats/js/ui.js b/samples/funnyHats/js/ui.js
@@ -136,20 +136,7 @@ function initUI() {
     utils.startCamera(videoConstraint, 'videoInput', startVideoProcessing);
   });
 
-  if (!isMobileDevice()) {
-    // Init threads number.
-    let threadsControl = document.getElementsByClassName('threads-control')[0];
-    threadsControl.classList.remove('hidden');
-    let threadsNumLabel = document.getElementById('threadsNumLabel');
-    let threadsNum = document.getElementById('threadsNum');
-    threadsNum.max = navigator.hardwareConcurrency;
-    threadsNumLabel.innerHTML = `Number of threads (1 - ${threadsNum.max}):&nbsp;`;
-    if (3 <= threadsNum.max) threadsNum.value = 3;
-    else threadsNum.value = 1;
-    cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    threadsNum.addEventListener('change', () => {
-      cv.parallel_pthreads_set_threads_num(parseInt(parseInt(threadsNum.value)));
-    });
+  enableThreads();
   }
 
   // Event listener for dowscale parameter.

diff --git a/samples/invisibilityCloak/index.js b/samples/invisibilityCloak/index.js
@@ -183,21 +183,7 @@ function initUI() {
     utils.startCamera(videoConstraint, 'videoInput', startVideoProcessing);
   });
 
-  if (!isMobileDevice()) {
-    // Init threads number.
-    let threadsControl = document.getElementsByClassName('threads-control')[0];
-    threadsControl.classList.remove('hidden');
-    let threadsNumLabel = document.getElementById('threadsNumLabel');
-    let threadsNum = document.getElementById('threadsNum');
-    threadsNum.max = navigator.hardwareConcurrency;
-    threadsNumLabel.innerHTML = `Number of threads (1 - ${threadsNum.max}):&nbsp;`;
-    if (3 <= threadsNum.max) threadsNum.value = 3;
-    else threadsNum.value = 1;
-    cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    threadsNum.addEventListener('change', () => {
-      cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
-    });
-  }
+  enableThreads();
 }
 
 utils.loadOpenCv(() => {

diff --git a/utils/utils.js b/utils/utils.js
@@ -4,6 +4,8 @@ const resolutions = {
   'vga': { width: { exact: 640 }, height: { exact: 480 } }
 };
 
+const DEFAULT_THREADS_NUM = 3;
+
 function Utils(errorOutputId) { // eslint-disable-line no-unused-vars
   let self = this;
   this.errorOutput = document.getElementById(errorOutputId);
@@ -375,3 +377,24 @@ function addButtonToCameraBar(id, text, maxItems) {
   liElement.appendChild(divElement);
   cameraBar.appendChild(liElement);
 }
+
+function enableThreads() {
+  if (!isMobileDevice()) {
+    // Init threads number.
+    let threadsControl = document.getElementsByClassName('threads-control')[0];
+    threadsControl.classList.remove('hidden');
+    let threadsNumLabel = document.getElementById('threadsNumLabel');
+    let threadsNum = document.getElementById('threadsNum');
+    threadsNum.max = navigator.hardwareConcurrency;
+    threadsNumLabel.innerHTML = `Number of threads (1 - ${threadsNum.max}):&nbsp;`;
+    if (DEFAULT_THREADS_NUM <= threadsNum.max) threadsNum.value = DEFAULT_THREADS_NUM;
+    else threadsNum.value = 1;
+    cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
+    threadsNum.addEventListener('change', () => {
+      if (Number(threadsNum.value) <= Number(threadsNum.max) &&
+        Number(threadsNum.value) >= Number(threadsNum.min)) {
+        cv.parallel_pthreads_set_threads_num(parseInt(threadsNum.value));
+      }
+    });
+  }
+}