Merge pull request #56 from SnuffSocket/osc-branch

Fix: Decouple OSC from GUI render loop

Author: RamesTheGeneric

BabbleApp/babble_processor.py

@@ -51,6 +51,7 @@ def __init__(
         capture_queue_incoming: "queue.Queue(maxsize=2)",
         image_queue_outgoing: "queue.Queue(maxsize=2)",
         cam_id,
+        osc_queue: queue.Queue,
     ):
         self.main_config = BabbleSettingsConfig
         self.config = config
@@ -63,6 +64,7 @@ def __init__(
         self.cancellation_event = cancellation_event
         self.capture_event = capture_event
         self.cam_id = cam_id
+        self.osc_queue = osc_queue
 
         # Image state
         self.previous_image = None
@@ -130,15 +132,19 @@ def output_images_and_update(self, output_information: CamInfo):
                 axis=1,
             )
             self.image_queue_outgoing.put((image_stack, output_information))
+            if self.image_queue_outgoing.qsize() > 1:
+                self.image_queue_outgoing.get()
+
             self.previous_image = self.current_image
             self.previous_rotation = self.config.rotation_angle
+
+            # Relay information to OSC
+            self.osc_queue.put((None, output_information))
         except:  # If this fails it likely means that the images are not the same size for some reason.
             print(
                 f'\033[91m[{lang._instance.get_string("log.error")}] {lang._instance.get_string("error.size")}.\033[0m'
             )
 
-            pass
-
     def capture_crop_rotate_image(self):
         # Get our current frame
 
@@ -225,7 +231,7 @@ def run(self):
                     self.current_image,
                     self.current_frame_number,
                     self.current_fps,
-                ) = self.capture_queue_incoming.get(block=True, timeout=0.2)
+                ) = self.capture_queue_incoming.get(block=True, timeout=0.1)
             except queue.Empty:
                 # print("No image available")
                 continue
@@ -250,10 +256,10 @@ def run(self):
             run_model(self)
             if self.settings.use_calibration:
                 self.output = cal.cal_osc(self, self.output)
-
             # else:
             #   pass
             # print(self.output)
+            
             self.output_images_and_update(CamInfo(self.current_algo, self.output))
 
     def get_framesize(self):

BabbleApp/babbleapp.py

@@ -129,7 +129,7 @@ def main():
     # Check to see if we have an ROI. If not, bring up ROI finder GUI.
 
     # Spawn worker threads
-    osc_queue: queue.Queue[tuple[bool, int, int]] = queue.Queue(maxsize=2)
+    osc_queue: queue.Queue[tuple[bool, int, int]] = queue.Queue(maxsize=10)
     osc = VRChatOSC(cancellation_event, osc_queue, config)
     osc_thread = threading.Thread(target=osc.run)
     # start worker threads

BabbleApp/camera_widget.py

@@ -75,6 +75,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
             self.capture_queue,
             self.image_queue,
             self.cam_id,
+            self.osc_queue,
         )
 
         self.camera_status_queue = Queue(maxsize=2)
@@ -518,8 +519,5 @@ def render(self, window, event, values):
                 imgbytes = cv2.imencode(".ppm", maybe_image)[1].tobytes()
                 window[self.gui_tracking_image].update(data=imgbytes)
 
-                # Relay information to OSC
-                if cam_info.info_type != CamInfoOrigin.FAILURE:
-                    self.osc_queue.put((self.cam_id, cam_info))
             except Empty:
                 pass

BabbleApp/landmark_processor.py

@@ -117,7 +117,7 @@ def __init__(
 
     def get_frame(self):
         return self.current_image_gray_clean
-    
+
     def infer_frame(self, image):
         return write_image(self, image)
 
@@ -130,12 +130,14 @@ def output_images_and_update(self, output_information: CamInfo):
                 axis=1,
             )
             self.image_queue_outgoing.put((image_stack, output_information))
+            if self.image_queue_outgoing.qsize() > 1:
+                self.image_queue_outgoing.get()
+
             self.previous_image = self.current_image
             self.previous_rotation = self.config.rotation_angle
         except: # If this fails it likely means that the images are not the same size for some reason.
             print('\033[91m[{lang._instance.get_string("log.error")}] Size of frames to display are of unequal sizes.\033[0m')
 
-            pass
     def capture_crop_rotate_image(self):
         # Get our current frame