Merge pull request #8 from Here-Charlie/prototype

Camera Improvements
Here-Charlie · Jun 13, 2023 · 5d20634 · 5d20634
2 parents 60ff4d7 + 5961ccf
commit 5d20634
Showing 1 changed file with 13 additions and 24 deletions.
diff --git a/src/components/roboflow.js b/src/components/roboflow.js
@@ -5,8 +5,9 @@ const Roboflow = (props) => {
     const webcamRef = useRef(null);
     const canvasRef = useRef(null);
     var inferRunning = useRef(true);
-    var tempClass =  "";
-    var sayItOnce = true;
+
+    // Text to Speech
+    const synthesis = window.speechSynthesis;
 
     const startInfer = () => {
         window.roboflow
@@ -20,10 +21,9 @@ const Roboflow = (props) => {
                     console.log("model loaded");
                 }
             }).then((model) => {
-                // Detect every 10 miliseconds 
                 setInterval(() => {
                     if (inferRunning) detect(model);
-                }, 0.5);
+                }, 10);
             });
     };
 
@@ -112,28 +112,20 @@ const Roboflow = (props) => {
             const textHeight = fontSize;
             var textWidth = ctx.measureText(msgTxt).width;
 
-            // Text to Speech
-            const synthesis = window.speechSynthesis;
-
             // Text to Speech metadata
             var utterance = new SpeechSynthesisUtterance(classTxt);
 
-            // synthesis.cancel();
-            // synthesis.speak(utterance);
-
-            if(tempClass === classTxt  && row.confidence*100 > 10 && sayItOnce){
+            // synthesis.cancel clears the thing currently spoken AND the queue
+            // making it wait one second allows tts to quickly say "person" and then clear everything
+            if (synthesis.speaking === false){
                 synthesis.speak(utterance);
-                sayItOnce = false;
-                // if(synthesis.pending === true){
-                //     synthesis.cancel();
-                // }
-            } else {
-                synthesis.cancel();
-                tempClass = classTxt;
-                sayItOnce = true;
             }
-
-
+            else{
+                // setTimeout is async so the detections will still render
+                setTimeout(() => {
+                    synthesis.cancel();
+                }, 1000);
+            }
 
             if (textHeight <= h && textWidth <= w) {
                 ctx.strokeStyle = row.color;
@@ -164,9 +156,6 @@ const Roboflow = (props) => {
         });
     };
 
-
-    // console.log(speechMetaData + "hello");
-
     return (
         <div className="roboflowCam">
             <Webcam