Free Motion Capture for Everyone πβ¨
TypeScript
not bad! shows annotated videos in rt w/ lagged data
jonmatthisbe5665031651
diff --git a/freemocap/api/http/ui/ui.html b/freemocap/api/http/ui/ui.htmlindex 51153856..04e7db47 100644--- a/freemocap/api/http/ui/ui.html+++ b/freemocap/api/http/ui/ui.html@@ -196,9 +196,9 @@<button onclick="callApi('http://localhost:8005/skellycam/cameras/connect/detect')">Connect to Cameras</button><div>- <button onclick="callApi('http://localhost:8005/skellycam/cameras/connect/apply', 'POST')">Connect/Update Cameras- </button>- <button onclick="callApi('http://localhost:8005/skellycam/cameras/close')">Close Camera Connections</button>+<!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/connect/apply', 'POST')">Connect/Update Cameras-->+<!-- </button>-->+<!-- <button onclick="callApi('http://localhost:8005/skellycam/cameras/close')">Close Camera Connections</button>--><!-- <!– Root and App API Calls –>--><!-- <button onclick="sendMessage('Hello from the client')">Send WS Message</button>-->diff --git a/freemocap/api/websocket/websocket_server.py b/freemocap/api/websocket/websocket_server.pyindex 80186e5d..3419c53a 100644--- a/freemocap/api/websocket/websocket_server.py+++ b/freemocap/api/websocket/websocket_server.py@@ -94,6 +94,8 @@ class FreemocapWebsocketServer:camera_group_uuid = Nonelatest_mf_number = -1+ previous_pipeline_output: CalibrationPipelineOutputData | None = None+ payloads_being_processed = {}processing_pipeline: BaseProcessingPipeline | None = None # Starts when camera group is detected, should probably be handled differently but this works fntry:while True:@@ -126,12 +128,17 @@ class FreemocapWebsocketServer:camera_configs=self._freemocap_app_state.camera_configs,retrieve_type=ReadTypes.LATEST.value)- latest_pipeline_output: CalibrationPipelineOutputData | None = Noneif processing_pipeline and processing_pipeline.ready_to_intake:processing_pipeline.intake_data(mf_payload)- mf_payload, latest_pipeline_output = processing_pipeline.annotate_images(mf_payload)+ # payloads_being_processed[mf_payload.multi_frame_number] = mf_payload+ print(f"Payloads being processed: {payloads_being_processed.keys()}")+ # mf_payload, latest_pipeline_output = processing_pipeline.annotate_images(mf_payload)+ # latest_pipeline_output = await processing_pipeline.get_next_data_async()+ latest_pipeline_output = processing_pipeline.get_next_data()++ annotated_payload = processing_pipeline.annotate_images(mf_payload, latest_pipeline_output)+ await self._send_frontend_payload(annotated_payload, latest_pipeline_output)- await self._send_frontend_payload(mf_payload, latest_pipeline_output)latest_mf_number = mf_payload.multi_frame_numberdiff --git a/freemocap/pipelines/pipeline_abcs.py b/freemocap/pipelines/pipeline_abcs.pyindex 6f1f6334..dc62cfbb 100644--- a/freemocap/pipelines/pipeline_abcs.py+++ b/freemocap/pipelines/pipeline_abcs.py@@ -1,3 +1,4 @@+import asyncioimport loggingimport multiprocessingfrom abc import ABC@@ -286,6 +287,12 @@ class BaseProcessingPipeline(ABC):data = self.aggregation_node.output_queue.get()return data+ async def get_next_data_async(self) -> BasePipelineOutputData:+ while self.aggregation_node.output_queue.empty():+ await asyncio.sleep(0.001)+ data = self.aggregation_node.output_queue.get()+ return data+def get_latest_data(self) -> BasePipelineOutputData | None:while not self.aggregation_node.output_queue.empty():self.latest_pipeline_data = self.aggregation_node.output_queue.get()@@ -303,11 +310,11 @@ class BaseProcessingPipeline(ABC):return self.latest_pipeline_data- def annotate_images(self, multiframe_payload: MultiFramePayload) -> tuple[MultiFramePayload, BasePipelineOutputData | None]:- pipeline_output = self.get_output_for_frame(target_frame_number=multiframe_payload.multi_frame_number)+ def annotate_images(self, multiframe_payload: MultiFramePayload,+ pipeline_output:BasePipelineOutputData|None) -> MultiFramePayload:if pipeline_output is None:- return multiframe_payload, None- return self.annotator.annotate_images(multiframe_payload, pipeline_output) , pipeline_output+ return multiframe_payload+ return self.annotator.annotate_images(multiframe_payload, pipeline_output)