Merge branch 'main' into fix-nrf-list

Author: richiemcilroy

crates/recording/src/sources/audio_mixer.rs

@@ -282,33 +282,39 @@ impl AudioMixer {
 
                         if let Some(diff) =
                             elapsed_since_last_frame.checked_sub(buffer_last_duration)
-                            && diff >= Duration::from_millis(1)
                         {
-                            let gap = diff;
+                            let min_gap = if buffer_last_duration.is_zero() {
+                                Duration::from_micros(1)
+                            } else {
+                                buffer_last_duration
+                            };
 
-                            print!("Gap between last buffer frame, inserting {gap:?} of silence");
+                            if diff >= min_gap {
+                                let gap = diff;
 
-                            let silence_samples_needed = (gap.as_secs_f64()) * rate as f64;
-                            let silence_samples_count = silence_samples_needed.ceil() as usize;
+                                debug!(?gap, "Gap between last buffer frame, inserting silence");
 
-                            let mut frame = ffmpeg::frame::Audio::new(
-                                source.info.sample_format,
-                                silence_samples_count,
-                                source.info.channel_layout(),
-                            );
+                                let silence_samples_needed = (gap.as_secs_f64()) * rate as f64;
+                                let silence_samples_count = silence_samples_needed.ceil() as usize;
 
-                            for i in 0..frame.planes() {
-                                frame.data_mut(i).fill(0);
-                            }
+                                let mut frame = ffmpeg::frame::Audio::new(
+                                    source.info.sample_format,
+                                    silence_samples_count,
+                                    source.info.channel_layout(),
+                                );
 
-                            frame.set_rate(source.info.rate() as u32);
+                                for i in 0..frame.planes() {
+                                    frame.data_mut(i).fill(0);
+                                }
+
+                                frame.set_rate(source.info.rate() as u32);
 
-                            let timestamp = buffer_last_timestamp + gap;
-                            source.buffer_last = Some((
-                                timestamp,
-                                Duration::from_secs_f64(silence_samples_count as f64 / rate as f64),
-                            ));
-                            source.buffer.push_back(AudioFrame::new(frame, timestamp));
+                                let silence_duration =
+                                    Duration::from_secs_f64(silence_samples_count as f64 / rate as f64);
+                                let timestamp = buffer_last_timestamp + buffer_last_duration;
+                                source.buffer_last = Some((timestamp, silence_duration));
+                                source.buffer.push_back(AudioFrame::new(frame, timestamp));
+                            }
                         }
                     }
                 }
@@ -681,3 +687,4 @@ mod test {
         }
     }
 }
+

crates/scap-ffmpeg/src/cpal.rs

@@ -10,7 +10,8 @@ impl DataExt for ::cpal::Data {
         let format_typ = sample::Type::Packed;
 
         let sample_size = self.sample_format().sample_size();
-        let sample_count = self.bytes().len() / (sample_size * config.channels as usize);
+        let bytes = self.bytes();
+        let sample_count = bytes.len() / (sample_size * config.channels as usize);
 
         let mut ffmpeg_frame = ffmpeg::frame::Audio::new(
             match self.sample_format() {
@@ -29,13 +30,27 @@ impl DataExt for ::cpal::Data {
             for i in 0..config.channels {
                 let plane_size = sample_count * sample_size;
                 let base = (i as usize) * plane_size;
-
-                ffmpeg_frame
-                    .data_mut(i as usize)
-                    .copy_from_slice(&self.bytes()[base..base + plane_size]);
+                let end = (base + plane_size).min(bytes.len());
+                if end <= base {
+                    continue;
+                }
+                let src = &bytes[base..end];
+                let dst = ffmpeg_frame.data_mut(i as usize);
+                debug_assert!(
+                    dst.len() >= src.len(),
+                    "FFmpeg plane smaller than CPAL buffer"
+                );
+                let copy_len = dst.len().min(src.len());
+                dst[..copy_len].copy_from_slice(&src[..copy_len]);
             }
         } else {
-            ffmpeg_frame.data_mut(0).copy_from_slice(self.bytes());
+            let dst = ffmpeg_frame.data_mut(0);
+            debug_assert!(
+                dst.len() >= bytes.len(),
+                "FFmpeg buffer smaller than CPAL buffer"
+            );
+            let copy_len = dst.len().min(bytes.len());
+            dst[..copy_len].copy_from_slice(&bytes[..copy_len]);
         }
 
         ffmpeg_frame.set_rate(config.sample_rate.0);