use aac_at encoder on macos

apps/desktop/src-tauri/src/lib.rs

@@ -922,7 +922,7 @@ async fn create_editor_instance(
     let editor_instance = upsert_editor_instance(&app, video_id).await;
 
     // Load the RecordingMeta to get the pretty name
-    let mut meta = RecordingMeta::load_for_project(&editor_instance.project_path)
+    let meta = RecordingMeta::load_for_project(&editor_instance.project_path)
         .map_err(|e| format!("Failed to load recording meta: {}", e))?;
 
     println!("Pretty name: {}", meta.pretty_name);

apps/desktop/src/routes/(window-chrome)/setup.tsx

@@ -192,18 +192,20 @@ function Startup(props: { onClose: () => void }) {
     }
   };
 
+  const handleStartupCompleted = () =>
+    generalSettingsStore.set({
+      hasCompletedStartup: true,
+    });
+
   const handleGetStarted = async () => {
     setIsExiting(true);
-    const currentWindow = getCurrentWindow();
 
     // Cancel ongoing cloud animations
     cloud1Animation?.cancel();
     cloud2Animation?.cancel();
     cloud3Animation?.cancel();
 
-    await generalSettingsStore.set({
-      hasCompletedStartup: true,
-    });
+    await handleStartupCompleted();
 
     // Wait for animation to complete before showing new window and closing
     setTimeout(async () => {
@@ -478,10 +480,10 @@ function Startup(props: { onClose: () => void }) {
                 <Button
                   class="px-12"
                   size="lg"
-                  onClick={() => {
-                    commands.openMainWindow().then(() => {
-                      getCurrentWindow().close();
-                    });
+                  onClick={async () => {
+                    handleStartupCompleted();
+                    await commands.openMainWindow();
+                    getCurrentWindow().close();
                   }}
                 >
                   Continue to Cap

crates/media/src/data.rs

@@ -144,7 +144,8 @@ impl AudioInfo {
     fn channel_layout_raw(channels: u16) -> Option<ChannelLayout> {
         Some(match channels {
             1 => ChannelLayout::MONO,
-            _ => ChannelLayout::STEREO,
+            2 => ChannelLayout::STEREO,
+            _ => return None,
         })
     }
 

crates/media/src/encoders/mp4.rs

@@ -1,3 +1,5 @@
+use std::ffi::CStr;
+
 use crate::{
     data::{
         AudioInfo, FFAudio, FFPacket, FFRational, FFVideo, PlanarData, RawVideoFormat, VideoInfo,
@@ -13,6 +15,7 @@ use ffmpeg::{
     threading::Config,
     Dictionary, Rescale,
 };
+use ffmpeg_sys_next::FF_QP2LAMBDA;
 use tracing::{debug, info, trace};
 
 use super::Output;
@@ -38,8 +41,6 @@ pub struct MP4Encoder {
 }
 
 impl MP4Encoder {
-    const AUDIO_BITRATE: usize = 128 * 1000; // 128k
-
     pub fn init(
         tag: &'static str,
         video_config: VideoInfo,
@@ -81,29 +82,44 @@ impl MP4Encoder {
 
         let audio = if let Some(audio_config) = audio_config {
             // Setup audio encoder
-            let audio_codec = encoder::find(ffmpeg::codec::Id::AAC)
-                .ok_or(MediaError::TaskLaunch("Could not find AAC codec".into()))?;
+            let audio_codec = encoder::find_by_name(if cfg!(target_os = "macos") {
+                "aac"
+            } else {
+                "aac_at"
+            })
+            .ok_or(MediaError::TaskLaunch("Could not find AAC codec".into()))?;
             let mut audio_ctx = context::Context::new_with_codec(audio_codec);
             audio_ctx.set_threading(Config::count(4));
             let mut audio_enc = audio_ctx.encoder().audio()?;
 
-            if !audio_codec
-                .audio()
-                .unwrap()
-                .rates()
-                .into_iter()
-                .flatten()
-                .any(|r| r == audio_config.rate())
-            {
-                return Err(MediaError::TaskLaunch(format!(
-                    "AAC Codec does not support sample rate {}",
-                    audio_config.rate()
-                )));
-            }
+            let output_format = if cfg!(target_os = "macos") {
+                let output_format = ffmpeg::format::Sample::I16(format::sample::Type::Planar);
+
+                audio_enc.set_flags(ffmpeg::codec::Flags::QSCALE);
+                audio_enc.set_quality(10 * FF_QP2LAMBDA as usize);
+
+                output_format
+            } else {
+                audio_enc.set_bit_rate(128 * 1000);
+                let output_format = ffmpeg::format::Sample::F32(format::sample::Type::Planar);
+
+                if !audio_codec
+                    .audio()
+                    .unwrap()
+                    .rates()
+                    .into_iter()
+                    .flatten()
+                    .any(|r| r == audio_config.rate())
+                {
+                    return Err(MediaError::TaskLaunch(format!(
+                        "AAC Codec does not support sample rate {}",
+                        audio_config.rate()
+                    )));
+                }
 
-            let output_format = ffmpeg::format::Sample::F32(format::sample::Type::Planar);
+                output_format
+            };
 
-            audio_enc.set_bit_rate(Self::AUDIO_BITRATE);
             audio_enc.set_rate(audio_config.rate());
             audio_enc.set_format(output_format);
             audio_enc.set_channel_layout(audio_config.channel_layout());
@@ -203,7 +219,6 @@ impl MP4Encoder {
         //     frame.samples()
         // );
 
-        dbg!(audio.encoder.frame_size());
         audio.buffer.consume(frame);
 
         // Process all buffered frames

crates/media/src/sources/screen_capture.rs

@@ -10,7 +10,7 @@ use scap::{
 use serde::{Deserialize, Serialize};
 use specta::Type;
 use std::{collections::HashMap, ops::ControlFlow};
-use tracing::{error, info, instrument, trace, warn};
+use tracing::{error, info, trace, warn};
 
 use crate::{
     data::{FFVideo, RawVideoFormat, VideoInfo},