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

Build media and live-kit in test-mode on non-MacOS #6859

Merged
merged 3 commits into from
Jan 30, 2024
Merged
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
6 changes: 6 additions & 0 deletions crates/live_kit_client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ nanoid = { version ="0.4", optional = true}
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.9.3"

[target.'cfg(not(target_os = "macos"))'.dependencies]
async-trait = { workspace = true }
collections = { path = "../collections", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
live_kit_server = { path = "../live_kit_server" }

[dev-dependencies]
collections = { path = "../collections", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
Expand Down
8 changes: 4 additions & 4 deletions crates/live_kit_client/src/live_kit_client.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
use std::sync::Arc;

#[cfg(not(any(test, feature = "test-support")))]
#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
pub mod prod;

#[cfg(not(any(test, feature = "test-support")))]
#[cfg(all(target_os = "macos", not(any(test, feature = "test-support"))))]
pub use prod::*;

#[cfg(any(test, feature = "test-support"))]
#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
pub mod test;

#[cfg(any(test, feature = "test-support"))]
#[cfg(any(test, feature = "test-support", not(target_os = "macos")))]
pub use test::*;

pub type Sid = String;
Expand Down
2 changes: 2 additions & 0 deletions crates/live_kit_client/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use collections::{BTreeMap, HashMap, HashSet};
use futures::Stream;
use gpui::BackgroundExecutor;
use live_kit_server::{proto, token};
#[cfg(target_os = "macos")]
use media::core_video::CVImageBuffer;
use parking_lot::Mutex;
use postage::watch;
Expand Down Expand Up @@ -845,6 +846,7 @@ impl Frame {
self.height
}

#[cfg(target_os = "macos")]
pub fn image(&self) -> CVImageBuffer {
unimplemented!("you can't call this in test mode")
}
Expand Down
8 changes: 6 additions & 2 deletions crates/media/build.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::{env, path::PathBuf, process::Command};

#[cfg(target_os = "macos")]
fn main() {
use std::{env, path::PathBuf, process::Command};

let sdk_path = String::from_utf8(
Command::new("xcrun")
.args(["--sdk", "macosx", "--show-sdk-path"])
Expand Down Expand Up @@ -37,3 +38,6 @@ fn main() {
.write_to_file(out_path.join("bindings.rs"))
.expect("couldn't write dispatch bindings");
}

#[cfg(not(target_os = "macos"))]
fn main() {}
2 changes: 2 additions & 0 deletions crates/media/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#![allow(non_snake_case)]
#![allow(unused)]

#[cfg(target_os = "macos")]
use objc::*;

#[cfg(target_os = "macos")]
include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
5 changes: 5 additions & 0 deletions crates/media/src/media.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@

mod bindings;

#[cfg(target_os = "macos")]
use core_foundation::{
base::{CFTypeID, TCFType},
declare_TCFType, impl_CFTypeDescription, impl_TCFType,
};
use std::ffi::c_void;

#[cfg(target_os = "macos")]
pub mod io_surface {
use super::*;

Expand All @@ -27,6 +29,7 @@ pub mod io_surface {
}
}

#[cfg(target_os = "macos")]
pub mod core_video {
#![allow(non_snake_case)]

Expand Down Expand Up @@ -206,6 +209,7 @@ pub mod core_video {
}
}

#[cfg(target_os = "macos")]
pub mod core_media {
#![allow(non_snake_case)]

Expand Down Expand Up @@ -413,6 +417,7 @@ pub mod core_media {
}
}

#[cfg(target_os = "macos")]
pub mod video_toolbox {
#![allow(non_snake_case)]

Expand Down
3 changes: 3 additions & 0 deletions script/bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ echo "migrating database..."

echo "seeding database..."
script/seed-db

echo "Linux dependencies..."
script/linux
40 changes: 40 additions & 0 deletions script/linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/usr/bin/env bash

# if not on Linux, do nothing
[[ $(uname) == "Linux" ]] || exit 0

# if sudo is not installed, define an empty alias
maysudo=$(command -v sudo || true)
export maysudo

# Ubuntu, Debian, etc.
apt=$(command -v apt-get || true)
deps=(
libasound2-dev
)
if [[ -n $apt ]]; then
$maysudo "$apt" install -y "${deps[@]}"
exit 0
fi

# Fedora, CentOS, RHEL, etc.
dnf=$(command -v dnf || true)
deps=(
alsa-lib-devel
)
if [[ -n $dnf ]]; then
$maysudo "$dnf" install -y "${deps[@]}"
exit 0
fi

# Arch, Manjaro, etc.
pacman=$(command -v pacman || true)
deps=(
alsa-lib
)
if [[ -n $pacman ]]; then
$maysudo "$pacman" -S --noconfirm "${deps[@]}"
exit 0
fi

echo "Unsupported Linux distribution in script/linux"
Loading