From: Thomas Karpiniec <tom.karpiniec@outlook.com>
Date: Fri, 16 May 2025 01:10:23 +0000 (+1000)
Subject: add RfToVoice converter for reflector tx path
X-Git-Url: https://code.octet-stream.net/m17rt/commitdiff_plain/8feaa040715d4e7872c6ced423cd582a77b613c2?ds=sidebyside

add RfToVoice converter for reflector tx path
---

diff --git a/m17core/src/reflector/convert.rs b/m17core/src/reflector/convert.rs
index 8e5a96d..7ad54c3 100644
--- a/m17core/src/reflector/convert.rs
+++ b/m17core/src/reflector/convert.rs
@@ -56,3 +56,65 @@ impl VoiceToRf {
         (lsf, stream)
     }
 }
+
+/// Accepts LSF and stream RF payloads and merges them into `Voice` packets for reflector use.
+///
+/// For a series of transmissions this object should be re-used so that Stream ID is correctly
+/// changed after each new LSF.
+pub struct RfToVoice {
+    lsf: LsfFrame,
+    stream_id: u16,
+}
+
+impl RfToVoice {
+    pub fn new(lsf: LsfFrame) -> Self {
+        Self { lsf, stream_id: 0 }
+    }
+
+    pub fn process_lsf(&mut self, lsf: LsfFrame) {
+        self.lsf = lsf;
+        self.stream_id = self.stream_id.wrapping_add(1);
+    }
+
+    pub fn process_stream(&self, stream: &StreamFrame) -> Voice {
+        let mut v = Voice::new();
+        v.set_stream_id(self.stream_id);
+        v.set_frame_number(stream.frame_number);
+        v.set_end_of_stream(stream.end_of_stream);
+        v.set_payload(&stream.stream_data);
+        v.set_link_setup_frame(&self.lsf);
+        v
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::{
+        address::{Address, Callsign},
+        protocol::{LsfFrame, StreamFrame},
+    };
+
+    use super::{RfToVoice, VoiceToRf};
+
+    #[test]
+    fn convert_roundtrip() {
+        let lsf = LsfFrame::new_voice(
+            &Address::Callsign(Callsign(*b"VK7XT    ")),
+            &Address::Broadcast,
+        );
+        let stream = StreamFrame {
+            lich_idx: 0,
+            lich_part: lsf.0[0..5].try_into().unwrap(),
+            frame_number: 0,
+            end_of_stream: false,
+            stream_data: [1u8; 16],
+        };
+        let rf_to_voice = RfToVoice::new(lsf.clone());
+        let voice = rf_to_voice.process_stream(&stream);
+
+        let mut voice_to_rf = VoiceToRf::new();
+        let (lsf2, stream2) = voice_to_rf.next(&voice);
+        assert_eq!(lsf2, Some(lsf));
+        assert_eq!(stream2, stream);
+    }
+}