diff --git a/Cargo.lock b/Cargo.lock
index b78221a..77a559a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -504,6 +504,7 @@ dependencies = [
"cultmesh-rs",
"cultnet-rs",
"libc",
+ "muninn-move-tracker",
"odin-core",
"rmp-serde",
"serde",
diff --git a/crates/muninn-daemon/Cargo.toml b/crates/muninn-daemon/Cargo.toml
index 27ae348..8cbbdfa 100644
--- a/crates/muninn-daemon/Cargo.toml
+++ b/crates/muninn-daemon/Cargo.toml
@@ -14,6 +14,7 @@ anyhow = "1"
cultmesh-rs = { path = "../../vendor/cultmesh-rs" }
cultnet-rs = { path = "../../vendor/cultnet-rs" }
libc = "0.2"
+muninn-move-tracker = { path = "../muninn-move-tracker" }
odin-core = { path = "../odin-core" }
rmp-serde = "1.3"
serde = { version = "1", features = ["derive"] }
diff --git a/crates/muninn-daemon/src/main.rs b/crates/muninn-daemon/src/main.rs
index 28dafe3..f7f2434 100644
--- a/crates/muninn-daemon/src/main.rs
+++ b/crates/muninn-daemon/src/main.rs
@@ -23,9 +23,9 @@ use odin_core::{
MuninnCaptureStreamCommandRecord, MuninnCaptureStreamRecord, MuninnCommandBoundaryCompatRecord,
MuninnHidControllerStateRecord, MuninnMediaReceiverFeedbackRecord,
MuninnMoveControllerStateRecord, MuninnMoveIdentityRecord, MuninnMoveLightCommandRecord,
- MuninnObsStreamCatalogRecord, MuninnQuestAccessRecord, MuninnTelemetrySurfaceRecord,
- MuninnTransportProfileCompatRecord, OdinDocuments, OdinEndpointQuery,
- discover_provider_endpoints,
+ MuninnMoveMarkerCandidateRecord, MuninnObsStreamCatalogRecord, MuninnQuestAccessRecord,
+ MuninnTelemetrySurfaceRecord, MuninnTransportProfileCompatRecord, OdinDocuments,
+ OdinEndpointQuery, discover_provider_endpoints,
};
use serde::{Deserialize, Serialize};
use serde_json::json;
@@ -280,18 +280,23 @@ struct DefaultMoveLightTarget {
identity: String,
}
+#[derive(Clone, Debug, PartialEq)]
+struct MoveMarkerFrameSource {
+ stream_id: String,
+ host_id: String,
+ camera_id: String,
+ tracker_config: muninn_move_tracker::MoveTrackerConfig,
+}
+
#[derive(Serialize)]
struct MuninnMoveEvidenceStreamFrame<'a>(
&'a str,
&'a str,
i64,
- &'a [MuninnMoveMarkerCandidateWire],
+ &'a [MuninnMoveMarkerCandidateRecord],
&'a [MuninnMoveControllerStateRecord],
);
-#[derive(Serialize)]
-struct MuninnMoveMarkerCandidateWire;
-
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
struct JoystickEvent {
event_type: u8,
@@ -3162,7 +3167,7 @@ fn publish_obs_catalog(
}
fn create_move_evidence_stream(options: &Options) -> Result