refactor(rdpsnd)!: pass format_no instead of AudioFormat

This can help avoid extra lookups and cloning.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Author: elmarco

crates/ironrdp-rdpsnd-native/src/cpal.rs

@@ -18,7 +18,7 @@ pub struct RdpsndBackend {
     stream_handle: Option<JoinHandle<()>>,
     stream_ended: Arc<AtomicBool>,
     tx: Option<Sender<Vec<u8>>>,
-    format: Option<AudioFormat>,
+    format_no: Option<usize>,
 }
 
 impl Default for RdpsndBackend {
@@ -31,7 +31,7 @@ impl RdpsndBackend {
     pub fn new() -> Self {
         Self {
             tx: None,
-            format: None,
+            format_no: None,
             stream_handle: None,
             stream_ended: Arc::new(AtomicBool::new(false)),
         }
@@ -69,16 +69,21 @@ impl RdpsndClientHandler for RdpsndBackend {
         ]
     }
 
-    fn wave(&mut self, format: &AudioFormat, _ts: u32, data: Cow<'_, [u8]>) {
-        if Some(format) != self.format.as_ref() {
-            debug!(?format, "New audio format");
+    fn wave(&mut self, format_no: usize, _ts: u32, data: Cow<'_, [u8]>) {
+        if Some(format_no) != self.format_no {
+            debug!("New audio format");
             self.close();
         }
 
         if self.stream_handle.is_none() {
             let (tx, rx) = mpsc::channel();
             self.tx = Some(tx);
-            self.format = Some(format.clone());
+
+            self.format_no = Some(format_no);
+            let Some(format) = self.get_formats().get(format_no) else {
+                warn!(?format_no, "Invalid format_no");
+                return;
+            };
             let format = format.clone();
             self.stream_ended.store(false, Ordering::Relaxed);
             let stream_ended = Arc::clone(&self.stream_ended);

crates/ironrdp-rdpsnd/src/client.rs

@@ -16,7 +16,7 @@ pub trait RdpsndClientHandler: Send + core::fmt::Debug {
 
     fn get_formats(&self) -> &[AudioFormat];
 
-    fn wave(&mut self, format: &AudioFormat, ts: u32, data: Cow<'_, [u8]>);
+    fn wave(&mut self, format_no: usize, ts: u32, data: Cow<'_, [u8]>);
 
     fn set_volume(&mut self, volume: VolumePdu);
 
@@ -33,7 +33,7 @@ impl RdpsndClientHandler for NoopRdpsndBackend {
         &[]
     }
 
-    fn wave(&mut self, _format: &AudioFormat, _ts: u32, _data: Cow<'_, [u8]>) {}
+    fn wave(&mut self, _format_no: usize, _ts: u32, _data: Cow<'_, [u8]>) {}
 
     fn set_volume(&mut self, _volume: VolumePdu) {}
 
@@ -183,15 +183,9 @@ impl SvcProcessor for Rdpsnd {
                 match pdu {
                     // TODO: handle WaveInfo for < v8
                     pdu::ServerAudioOutputPdu::Wave2(pdu) => {
-                        // TODO: maybe change wave(fmt_no,..) API to avoid the need for clone()
-                        let fmt = self
-                            .handler
-                            .get_formats()
-                            .get(pdu.format_no as usize)
-                            .ok_or_else(|| pdu_other_err!("invalid format no"))?
-                            .clone();
+                        let format_no = pdu.format_no as usize;
                         let ts = pdu.audio_timestamp;
-                        self.handler.wave(&fmt, ts, pdu.data);
+                        self.handler.wave(format_no, ts, pdu.data);
                         return Ok(self.wave_confirm(pdu.timestamp, pdu.block_no)?.into());
                     }
                     pdu::ServerAudioOutputPdu::Volume(pdu) => {