Skip to content

Commit fcb0cc4

Browse files
committed
Update to py 3.11, performance improvements, ESP USB camera improvement
1 parent 42c9ecf commit fcb0cc4

File tree

7 files changed

+1083
-26
lines changed

7 files changed

+1083
-26
lines changed

BabbleApp/babble_model_loader.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,18 @@
1313
from threading import Thread
1414
from one_euro_filter import OneEuroFilter
1515

16-
1716
def run_model(self):
1817
if self.runtime == "ONNX" or self.runtime == "Default (ONNX)":
1918
frame = cv2.resize(self.current_image_gray, (256, 256))
20-
# make it pil
21-
frame = Image.fromarray(frame)
22-
# make it grayscale
23-
frame = to_grayscale(frame)
24-
# make it a tensor
25-
frame = transforms.ToTensor()(frame)
26-
# make it a batch
27-
frame = frame.unsqueeze(0)
28-
# make it a numpy array
29-
frame = frame.numpy()
30-
19+
frame = transforms.ToTensor()(frame).unsqueeze(0).numpy()
3120
out = self.sess.run([self.output_name], {self.input_name: frame})
3221
#end = time.time()
3322
output = out[0]
3423
output = output[0]
24+
3525
output = self.one_euro_filter(output)
26+
3627
for i in range(len(output)): # Clip values between 0 - 1
3728
output[i] = max(min(output[i], 1), 0)
29+
3830
self.output = output

BabbleApp/babble_processor.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def __init__(
4646
fullconfig: "BabbleConfig",
4747
cancellation_event: "threading.Event",
4848
capture_event: "threading.Event",
49-
capture_queue_incoming: "queue.Queue",
50-
image_queue_outgoing: "queue.Queue",
49+
capture_queue_incoming: "queue.Queue(maxsize=2)",
50+
image_queue_outgoing: "queue.Queue(maxsize=2)",
5151
cam_id,
5252
):
5353
self.main_config = BabbleSettingsConfig
@@ -100,8 +100,8 @@ def __init__(
100100
beta = float(self.settings.gui_speed_coefficient) # 0.62
101101
except:
102102
print('\033[93m[WARN] OneEuroFilter values must be a legal number.\033[0m')
103-
min_cutoff = 10.0004
104-
beta = 0.62
103+
min_cutoff = 0.9
104+
beta = 0.9
105105
noisy_point = np.array([45])
106106
self.one_euro_filter = OneEuroFilter(
107107
noisy_point,

BabbleApp/babbleapp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def main():
183183
# GUI Render loop
184184
while True:
185185
# First off, check for any events from the GUI
186-
event, values = window.read(timeout=1)
186+
event, values = window.read(timeout=2)
187187

188188
# If we're in either mode and someone hits q, quit immediately
189189
if event == "Exit" or event == sg.WIN_CLOSED:

BabbleApp/camera.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __init__(
3636
cancellation_event: "threading.Event",
3737
capture_event: "threading.Event",
3838
camera_status_outgoing: "queue.Queue[CameraState]",
39-
camera_output_outgoing: "queue.Queue",
39+
camera_output_outgoing: "queue.Queue(maxsize=2)",
4040
settings: BabbleSettingsConfig,
4141
):
4242
self.camera_status = CameraState.CONNECTING
@@ -83,7 +83,7 @@ def run(self):
8383
if (
8484
self.config.capture_source != None and self.config.capture_source != ""
8585
):
86-
86+
self.current_capture_source = self.config.capture_source
8787
if ("COM" in str(self.config.capture_source)):
8888
if (
8989
self.serial_connection is None

BabbleApp/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class BabbleCameraConfig(BaseModel):
2222
gui_horizontal_flip: bool = False
2323

2424
class BabbleSettingsConfig(BaseModel):
25-
gui_min_cutoff: str = "10.5004"
26-
gui_speed_coefficient: str = "0.62"
25+
gui_min_cutoff: str = "0.9"
26+
gui_speed_coefficient: str = "0.9"
2727
gui_osc_address: str = "127.0.0.1"
2828
gui_osc_port: int = 8888
2929
gui_osc_receiver_port: int = 9001

0 commit comments

Comments
 (0)