address coderabbit feedback

Brendonovich · Brendonovich · commit eb9d3bb2650e · 2025-08-22T15:06:24.000+08:00
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ Copyright (c) 2023-present Cap Software, Inc.
 
 Portions of this software are licensed as follows:
 
-- All code residing in the `cap-camera*` and `scap-* family of crates is licensed under the MIT license as defined in the LICENSE-MIT file
+- All code residing in the `cap-camera*` and `scap-*` families of crates is licensed under the MIT License (see LICENSE-MIT).
 - All third party components are licensed under the original license provided by the owner of the applicable component
 - All other content not mentioned above is available under the AGPLv3 license as defined below
 
diff --git a/crates/camera-avfoundation/Cargo.toml b/crates/camera-avfoundation/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cap-camera-avfoundation"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 cidre = { workspace = true }
diff --git a/crates/camera-directshow/Cargo.toml b/crates/camera-directshow/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cap-camera-directshow"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 tracing.workspace = true
diff --git a/crates/camera-directshow/examples/cli.rs b/crates/camera-directshow/examples/cli.rs
@@ -19,7 +19,7 @@ mod windows {
         core::Interface,
     };
 
-    fn main() {
+    pub fn main() {
         tracing_subscriber::fmt::init();
 
         unsafe {
diff --git a/crates/camera-ffmpeg/Cargo.toml b/crates/camera-ffmpeg/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cap-camera-ffmpeg"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 ffmpeg = { workspace = true }
diff --git a/crates/camera-mediafoundation/Cargo.toml b/crates/camera-mediafoundation/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cap-camera-mediafoundation"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 tracing.workspace = true
diff --git a/crates/camera-windows/Cargo.toml b/crates/camera-windows/Cargo.toml
@@ -2,6 +2,7 @@
 name = "cap-camera-windows"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 thiserror.workspace = true
diff --git a/crates/camera/Cargo.toml b/crates/camera/Cargo.toml
@@ -2,9 +2,10 @@
 name = "cap-camera"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
-thiserror.workspace = true
+thiserror = { workspace = true }
 serde = { workspace = true, optional = true }
 specta = { workspace = true, optional = true }
 
diff --git a/crates/cursor-capture/src/main.rs b/crates/cursor-capture/src/main.rs
@@ -7,7 +7,6 @@ fn main() {
             .relative_to_display(Display::list()[1])
             .unwrap()
             .normalize();
-        // .with_crop(LogicalPosition::new(0.0, 0.0), LogicalSize::new(1.0, 1.0));
 
         println!("{position:?}");
     }
diff --git a/crates/recording/examples/recording-cli.rs b/crates/recording/examples/recording-cli.rs
@@ -23,21 +23,12 @@ pub async fn main() {
 
     println!("Recording to directory '{}'", dir.path().display());
 
-    dbg!(
-        list_windows()
-            .into_iter()
-            .map(|(v, _)| v)
-            .collect::<Vec<_>>()
-    );
-
-    return;
-
     let (handle, _ready_rx) = cap_recording::spawn_studio_recording_actor(
         "test".to_string(),
         dir.path().into(),
         RecordingBaseInputs {
             capture_target: ScreenCaptureTarget::Display {
-                id: Display::list()[1].id(),
+                id: Display::primary().id(),
             },
             // ScreenCaptureTarget::Window {
             //     id: Window::list()
diff --git a/crates/recording/src/pipeline/control.rs b/crates/recording/src/pipeline/control.rs
@@ -9,11 +9,19 @@ pub enum Control {
 }
 
 pub struct PipelineControlSignal {
-    pub last_value: Option<Control>,
-    pub receiver: Receiver<Control>,
+    last_value: Option<Control>,
+    receiver: Receiver<Control>,
 }
 
 impl PipelineControlSignal {
+    pub fn receiver(&self) -> &Receiver<Control> {
+        &self.receiver
+    }
+
+    pub fn last_cached(&self) -> Option<Control> {
+        self.last_value
+    }
+
     pub fn last(&mut self) -> Option<Control> {
         self.blocking_last_if(false)
     }
diff --git a/crates/recording/src/sources/screen_capture/macos.rs b/crates/recording/src/sources/screen_capture/macos.rs
@@ -233,7 +233,7 @@ impl PipelineSourceTask for ScreenCaptureSource<CMSampleBufferCapture> {
 
                     match futures::future::select(
                         error_rx.recv_async(),
-                        control_signal.receiver.recv_async(),
+                        control_signal.receiver().recv_async(),
                     )
                     .await
                     {
diff --git a/crates/recording/src/sources/screen_capture/mod.rs b/crates/recording/src/sources/screen_capture/mod.rs
@@ -249,8 +249,10 @@ struct Config {
 pub enum ScreenCaptureInitError {
     #[error("NoDisplay")]
     NoDisplay,
-    #[error("PhysicalSize")]
-    PhysicalSize,
+    #[error("NoWindow")]
+    NoWindow,
+    #[error("Bounds")]
+    NoBounds,
 }
 
 impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureSource<TCaptureFormat> {
@@ -273,12 +275,18 @@ impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureSource<TCaptureFormat> {
         let crop_bounds = match target {
             ScreenCaptureTarget::Display { .. } => None,
             ScreenCaptureTarget::Window { id } => {
-                let window = Window::from_id(&id).unwrap();
+                let window = Window::from_id(&id).ok_or(ScreenCaptureInitError::NoWindow)?;
 
                 #[cfg(target_os = "macos")]
                 {
-                    let raw_display_bounds = display.raw_handle().logical_bounds().unwrap();
-                    let raw_window_bounds = window.raw_handle().logical_bounds().unwrap();
+                    let raw_display_bounds = display
+                        .raw_handle()
+                        .logical_bounds()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
+                    let raw_window_bounds = window
+                        .raw_handle()
+                        .logical_bounds()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
 
                     Some(LogicalBounds::new(
                         LogicalPosition::new(
@@ -291,8 +299,14 @@ impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureSource<TCaptureFormat> {
 
                 #[cfg(windows)]
                 {
-                    let raw_display_position = display.raw_handle().physical_position().unwrap();
-                    let raw_window_bounds = window.raw_handle().physical_bounds().unwrap();
+                    let raw_display_position = display
+                        .raw_handle()
+                        .physical_position()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
+                    let raw_window_bounds = window
+                        .raw_handle()
+                        .physical_bounds()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
 
                     Some(PhysicalBounds::new(
                         PhysicalPosition::new(
@@ -314,8 +328,12 @@ impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureSource<TCaptureFormat> {
 
                 #[cfg(windows)]
                 {
-                    let raw_display_size = display.physical_size().unwrap();
-                    let logical_display_size = display.logical_size().unwrap();
+                    let raw_display_size = display
+                        .physical_size()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
+                    let logical_display_size = display
+                        .logical_size()
+                        .ok_or(ScreenCaptureInitError::NoBounds)?;
 
                     Some(PhysicalBounds::new(
                         PhysicalPosition::new(
@@ -351,7 +369,7 @@ impl<TCaptureFormat: ScreenCaptureFormat> ScreenCaptureSource<TCaptureFormat> {
                 Some(b.size().map(|v| (v / 2.0).floor() * 2.0))
             })
             .or_else(|| display.physical_size())
-            .unwrap();
+            .ok_or(ScreenCaptureInitError::NoBounds)?;
 
         Ok(Self {
             config: Config {
diff --git a/crates/recording/src/sources/screen_capture/windows.rs b/crates/recording/src/sources/screen_capture/windows.rs
@@ -166,6 +166,7 @@ impl Message<NewFrame> for FrameHandler {
                 total_count,
                 WINDOW_DURATION.as_secs()
             );
+            let _ = ctx.actor_ref().stop_gracefully().await;
             return;
             // return ControlFlow::Break(Err("Recording can't keep up with screen capture. Try reducing your display's resolution or refresh rate.".to_string()));
         }
diff --git a/crates/scap-cpal/Cargo.toml b/crates/scap-cpal/Cargo.toml
@@ -2,6 +2,7 @@
 name = "scap-cpal"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 cpal.workspace = true
diff --git a/crates/scap-direct3d/Cargo.toml b/crates/scap-direct3d/Cargo.toml
@@ -2,6 +2,7 @@
 name = "scap-direct3d"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [target.'cfg(windows)'.dependencies]
 windows = { workspace = true, features = [
diff --git a/crates/scap-direct3d/src/lib.rs b/crates/scap-direct3d/src/lib.rs
@@ -96,14 +96,14 @@ impl Settings {
     pub fn can_is_border_required() -> windows::core::Result<bool> {
         ApiInformation::IsPropertyPresent(
             &HSTRING::from("Windows.Graphics.Capture.GraphicsCaptureSession"),
-            &HSTRING::from("IsCursorCaptureEnabled"),
+            &HSTRING::from("IsBorderRequired"),
         )
     }
 
     pub fn can_is_cursor_capture_enabled() -> windows::core::Result<bool> {
         ApiInformation::IsPropertyPresent(
             &HSTRING::from("Windows.Graphics.Capture.GraphicsCaptureSession"),
-            &HSTRING::from("IsBorderRequired"),
+            &HSTRING::from("IsCursorCaptureEnabled"),
         )
     }
 
diff --git a/crates/scap-ffmpeg/Cargo.toml b/crates/scap-ffmpeg/Cargo.toml
@@ -2,17 +2,18 @@
 name = "scap-ffmpeg"
 version = "0.1.0"
 edition = "2024"
+license = "MIT"
 
 [dependencies]
 ffmpeg = { workspace = true }
 
+scap-cpal = { optional = true, path = "../scap-cpal" }
+cpal = { workspace = true }
+
 [target.'cfg(windows)'.dependencies]
 scap-direct3d = { path = "../scap-direct3d" }
 windows = { workspace = true, features = [] }
 
-scap-cpal = { optional = true, path = "../scap-cpal" }
-cpal = { workspace = true }
-
 [target.'cfg(target_os = "macos")'.dependencies]
 scap-screencapturekit = { path = "../scap-screencapturekit" }
 cidre = { workspace = true }
diff --git a/crates/scap-ffmpeg/src/cpal.rs b/crates/scap-ffmpeg/src/cpal.rs
@@ -14,11 +14,11 @@ impl DataExt for ::cpal::Data {
 
         let mut ffmpeg_frame = ffmpeg::frame::Audio::new(
             match self.sample_format() {
-                SampleFormat::F32 => Sample::F32(format_typ),
-                SampleFormat::F64 => Sample::F64(format_typ),
+                SampleFormat::U8 => Sample::U8(format_typ),
                 SampleFormat::I16 => Sample::I16(format_typ),
                 SampleFormat::I32 => Sample::I32(format_typ),
-                SampleFormat::U8 => Sample::U8(format_typ),
+                SampleFormat::F32 => Sample::F32(format_typ),
+                SampleFormat::F64 => Sample::F64(format_typ),
                 _ => panic!("Unsupported sample format"),
             },
             sample_count,
diff --git a/crates/scap-ffmpeg/src/lib.rs b/crates/scap-ffmpeg/src/lib.rs
@@ -8,9 +8,7 @@ mod direct3d;
 #[cfg(windows)]
 pub use direct3d::*;
 
-#[cfg(windows)]
 mod cpal;
-#[cfg(windows)]
 pub use cpal::*;
 
 pub trait AsFFmpeg {
diff --git a/crates/scap-screencapturekit/Cargo.toml b/crates/scap-screencapturekit/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scap-screencapturekit"
 version = "0.1.0"
 edition = "2024"
-
+license = "MIT"
 
 [dependencies]
 futures = { workspace = true }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ fn main() {`
`7`	`7`	`.relative_to_display(Display::list()[1])`
`8`	`8`	`.unwrap()`
`9`	`9`	`.normalize();`
`10`		`- // .with_crop(LogicalPosition::new(0.0, 0.0), LogicalSize::new(1.0, 1.0));`
`11`	`10`
`12`	`11`	`println!("{position:?}");`
`13`	`12`	`}`