fix audio skip fail on macos

Author: Brendonovich

crates/enc-avfoundation/src/mp4.rs

@@ -246,7 +246,7 @@ impl MP4Encoder {
         };
 
         if !audio_input.is_ready_for_more_media_data() {
-            return Err(QueueAudioFrameError::NotReady);
+            return Ok(());
         }
 
         let audio_desc = cat::audio::StreamBasicDesc::common_f32(

crates/recording/src/sources/audio_mixer.rs

@@ -156,6 +156,7 @@ impl AudioMixer {
                     .checked_sub(last_end.duration_since(self.timestamps))
                 {
                     let mut remaining = elapsed_since_last;
+
                     while remaining > Self::BUFFER_TIMEOUT {
                         let chunk_samples =
                             (Self::BUFFER_TIMEOUT.as_secs_f64() * rate as f64) as usize;
@@ -172,11 +173,7 @@ impl AudioMixer {
                         }
 
                         let timestamp = last_end + (elapsed_since_last - remaining);
-                        dbg!(timestamp);
-                        source.buffer_last = Some((
-                            timestamp,
-                            Duration::from_secs_f64(chunk_samples as f64 / rate as f64),
-                        ));
+                        source.buffer_last = Some((timestamp, Self::BUFFER_TIMEOUT));
                         source.buffer.push_back((frame, timestamp));
 
                         remaining -= Self::BUFFER_TIMEOUT;
@@ -217,7 +214,6 @@ impl AudioMixer {
                             frame.set_rate(source.info.rate() as u32);
 
                             let timestamp = buffer_last_timestamp + gap;
-                            dbg!(timestamp);
                             source.buffer_last = Some((
                                 timestamp,
                                 Duration::from_secs_f64(silence_samples_count as f64 / rate as f64),
@@ -275,7 +271,6 @@ impl AudioMixer {
                             frame.set_rate(source.info.rate() as u32);
 
                             let timestamp = start_timestamp + (elapsed_since_start - remaining);
-                            dbg!(timestamp);
                             source.buffer_last = Some((
                                 timestamp,
                                 Duration::from_secs_f64(chunk_samples as f64 / rate as f64),

crates/timestamp/src/macos.rs

@@ -5,11 +5,14 @@ use std::{
 };
 
 #[derive(Clone, Copy, Debug)]
-pub struct MachAbsoluteTimestamp(u64);
+pub struct MachAbsoluteTimestamp(
+    // Nanoseconds
+    u64,
+);
 
 impl MachAbsoluteTimestamp {
-    pub fn new(value: u64) -> Self {
-        Self(value)
+    pub fn new(nanos: u64) -> Self {
+        Self(nanos)
     }
 
     pub fn now() -> Self {
@@ -37,7 +40,7 @@ impl Add<Duration> for MachAbsoluteTimestamp {
         let info = TimeBaseInfo::new();
         let freq = info.numer as f64 / info.denom as f64;
 
-        Self((self.0 as f64 + rhs.as_secs_f64() * freq) as u64)
+        Self((self.0 as f64 + rhs.as_nanos() as f64 * freq) as u64)
     }
 }
 
@@ -48,6 +51,19 @@ impl Sub<Duration> for MachAbsoluteTimestamp {
         let info = TimeBaseInfo::new();
         let freq = info.numer as f64 / info.denom as f64;
 
-        Self((self.0 as f64 - rhs.as_secs_f64() * freq) as u64)
+        Self((self.0 as f64 - rhs.as_nanos() as f64 * freq) as u64)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test() {
+        let a = MachAbsoluteTimestamp::new(0);
+
+        dbg!(MachAbsoluteTimestamp::now());
+        dbg!(a + Duration::from_secs(1));
     }
 }