diff --git a/strand-cam/src/frame_process_task.rs b/strand-cam/src/frame_process_task.rs index d3e2335bb..109f591fa 100644 --- a/strand-cam/src/frame_process_task.rs +++ b/strand-cam/src/frame_process_task.rs @@ -28,8 +28,8 @@ use ads_apriltag as apriltag; use crate::{ convert_stream, open_braid_destination_addr, post_trigger_buffer, video_streaming, - FinalMp4RecordingConfig, FmfWriteInfo, FpsCalc, MomentCentroid, Msg, TimestampSource, ToDevice, - LED_BOX_HEARTBEAT_INTERVAL_MSEC, MOMENT_CENTROID_SCHEMA_VERSION, + CentroidToDevice, FinalMp4RecordingConfig, FmfWriteInfo, FpsCalc, MomentCentroid, Msg, + TimestampSource, LED_BOX_HEARTBEAT_INTERVAL_MSEC, MOMENT_CENTROID_SCHEMA_VERSION, }; /// Perform image analysis @@ -838,9 +838,9 @@ pub(crate) async fn frame_process_task<'a>( // If mu00 is 0.0, these will be NaN. CBOR explicitly can represent NaNs. - let mc = ToDevice::Centroid(MomentCentroid { + let mc = CentroidToDevice::Centroid(MomentCentroid { schema_version: MOMENT_CENTROID_SCHEMA_VERSION, - framenumber: block_id.unwrap().get().try_into()?, + framenumber: block_id.unwrap().get(), timestamp: save_mp4_fmf_stamp, timestamp_source, mu00, diff --git a/strand-cam/src/strand-cam.rs b/strand-cam/src/strand-cam.rs index 32dc6bb2c..dc1abbb08 100644 --- a/strand-cam/src/strand-cam.rs +++ b/strand-cam/src/strand-cam.rs @@ -584,7 +584,7 @@ const MOMENT_CENTROID_SCHEMA_VERSION: u8 = 2; #[derive(Debug, PartialEq, Serialize, Deserialize, Clone)] pub struct MomentCentroid { pub schema_version: u8, - pub framenumber: u32, + pub framenumber: u64, pub timestamp_source: TimestampSource, pub timestamp: chrono::DateTime, pub mu00: f32, @@ -597,7 +597,7 @@ pub struct MomentCentroid { } #[derive(Debug, Serialize, Deserialize)] -enum ToDevice { +enum CentroidToDevice { Centroid(MomentCentroid), }