Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ScreenCapture loopback #894

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ mach2 = "0.4" # For access to mach_timebase type.

[target.'cfg(target_os = "macos")'.dependencies]
coreaudio-rs = { version = "0.11", default-features = false, features = ["audio_unit", "core_audio"] }
screencapturekit = "0.2.8"
screencapturekit-sys = "0.2.8"

[target.'cfg(target_os = "ios")'.dependencies]
coreaudio-rs = { version = "0.11", default-features = false, features = ["audio_unit", "core_audio", "audio_toolbox"] }
Expand Down
2 changes: 2 additions & 0 deletions src/host/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ pub(crate) mod jack;
pub(crate) mod null;
#[cfg(target_os = "android")]
pub(crate) mod oboe;
#[cfg(target_os = "macos")]
pub(crate) mod screencapturekit;
#[cfg(windows)]
pub(crate) mod wasapi;
#[cfg(all(target_arch = "wasm32", feature = "wasm-bindgen"))]
Expand Down
46 changes: 46 additions & 0 deletions src/host/screencapturekit/enumerate.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
use screencapturekit::sc_shareable_content::SCShareableContent;

use std::vec::IntoIter as VecIntoIter;

use crate::{BackendSpecificError, DevicesError, SupportedStreamConfigRange};

use super::Device;

pub struct Devices(VecIntoIter<Device>);

impl Devices {
pub fn new() -> Result<Self, DevicesError> {
let sc_shareable_content = SCShareableContent::try_current()
.map_err(|description| BackendSpecificError { description })?;

let mut res = Vec::new();
for display in sc_shareable_content.displays.into_iter() {
res.push(Device::new(display));

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here memory leak

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or actually this one too?
image

@Kree0 do you have any idea how to fix this leak? i use this branch in production and it grows memory forever, trying to find a fix

}

Ok(Devices(res.into_iter()))
}
}

unsafe impl Send for Devices {}
unsafe impl Sync for Devices {}

impl Iterator for Devices {
type Item = Device;

fn next(&mut self) -> Option<Self::Item> {
self.0.next()
}
}

pub fn default_input_device() -> Option<Device> {
let devices = Devices::new().ok()?;
devices.into_iter().next()
}

pub fn default_output_device() -> Option<Device> {
None
}

pub type SupportedInputConfigs = VecIntoIter<SupportedStreamConfigRange>;
pub type SupportedOutputConfigs = VecIntoIter<SupportedStreamConfigRange>;
Loading