Skip to content
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
8 changes: 4 additions & 4 deletions gst-meet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ authors = ["Jasper Hugo <jasper@avstack.io>"]

[dependencies]
anyhow = { version = "1", default-features = false, features = ["std"] }
colibri = { version = "0.1", default-features = false }
colibri = { version = "0.2", default-features = false }
futures = { version = "0.3", default-features = false }
glib = { version = "0.19", default-features = false, features = ["log"] }
gstreamer = { version = "0.22", default-features = false }
glib = { version = "0.21", default-features = false, features = ["log"] }
gstreamer = { version = "0.24", default-features = false }
http = { version = "1", default-features = false }
lib-gst-meet = { version = "0.8", path = "../lib-gst-meet", default-features = false, features = ["tracing-subscriber"] }
serde_urlencoded = { version = "0.7", default-features = false }
Expand All @@ -21,7 +21,7 @@ tokio-stream = { version = "0.1", default-features = false }
tracing = { version = "0.1", default-features = false, features = ["attributes", "std"] }

[target.'cfg(target_os = "macos")'.dependencies]
cocoa = { version = "0.25", default-features = false }
cocoa = { version = "0.26", default-features = false }

[features]
default = ["tls-rustls-native-roots"]
Expand Down
2 changes: 2 additions & 0 deletions gst-meet/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ async fn main_inner() -> Result<()> {
ideal_height: None,
}),
constraints: None,
selected_sources: None,
on_stage_sources: None,
})
.await?;

Expand Down
4 changes: 2 additions & 2 deletions lib-gst-meet-c/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ authors = ["Jasper Hugo <jasper@avstack.io>"]

[dependencies]
anyhow = { version = "1", default-features = false }
glib = { version = "0.19", default-features = false }
gstreamer = { version = "0.22", default-features = false }
glib = { version = "0.21", default-features = false }
gstreamer = { version = "0.24", default-features = false }
lib-gst-meet = { version = "0.8", path = "../lib-gst-meet", default-features = false, features = ["tracing-subscriber"] }
tokio = { version = "1", default-features = false, features = ["rt-multi-thread"] }
tracing = { version = "0.1", default-features = false }
Expand Down
24 changes: 12 additions & 12 deletions lib-gst-meet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@ async-stream = { version = "0.3", default-features = false }
async-trait = { version = "0.1", default-features = false }
base64 = { version = "0.22", default-features = false }
bytes = { version = "1", default-features = false, features = ["std"] }
colibri = { version = "0.1", default-features = false }
colibri = { version = "0.2", default-features = false }
futures = { version = "0.3", default-features = false }
glib = { version = "0.19", default-features = false }
gstreamer = { version = "0.22", default-features = false, features = ["v1_20"] }
gstreamer-rtp = { version = "0.22", default-features = false, features = ["v1_20"] }
glib = { version = "0.21", default-features = false }
gstreamer = { version = "0.24", default-features = false, features = ["v1_20"] }
gstreamer-rtp = { version = "0.24", default-features = false, features = ["v1_20"] }
hex = { version = "0.4", default-features = false, features = ["std"] }
itertools = { version = "0.13", default-features = false, features = ["use_std"] }
itertools = { version = "0.14", default-features = false, features = ["use_std"] }
jid = { version = "0.10", default-features = false }
jitsi-xmpp-parsers = { version = "0.2", path = "../jitsi-xmpp-parsers", default-features = false }
libc = { version = "0.2", default-features = false }
maplit = { version = "1", default-features = false }
native-tls = { version = "0.2", default-features = false, optional = true }
nice-gst-meet = { version = "0.3", path = "../nice-gst-meet", default-features = false, features = ["v0_1_18"] }
once_cell = { version = "1", default-features = false, features = ["std"] }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rcgen = { version = "0.13", default-features = false, features = ["crypto", "pem", "aws_lc_rs"] }
rand = { version = "0.9", default-features = false, features = ["std", "std_rng", "thread_rng"] }
rcgen = { version = "0.14", default-features = false, features = ["crypto", "pem", "aws_lc_rs"] }
ring = { version = "0.17", default-features = false }
rtcp = { version = "0.11", default-features = false, optional = true }
rustls = { version = "0.22", default-features = false, features = ["logging", "tls12", "aws_lc_rs"], optional = true }
rustls-native-certs = { version = "0.7", default-features = false, optional = true }
rtcp = { version = "0.14", default-features = false, optional = true }
rustls = { version = "0.23", default-features = false, features = ["logging", "tls12", "aws_lc_rs"], optional = true }
rustls-native-certs = { version = "0.8", default-features = false, optional = true }
serde = { version = "1", default-features = false, features = ["derive"] }
serde_json = { version = "1", default-features = false, features = ["std"] }
sha2 = { version = "0.10", default-features = false, features = ["std"] }
syntect = { version = "5", optional = true }
tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "macros", "sync", "time"] }
tokio-stream = { version = "0.1", default-features = false, features = ["time"] }
tokio-tungstenite = { version = "0.21", default-features = false, features = ["connect"] }
tokio-tungstenite = { version = "0.28", default-features = false, features = ["connect"] }
tracing = { version = "0.1", default-features = false, features = ["attributes", "std"] }
tracing-subscriber = { version = "0.3", optional = true, default-features = false, features = [
"fmt",
Expand All @@ -51,7 +51,7 @@ tracing-subscriber = { version = "0.3", optional = true, default-features = fals
"tracing-log",
] }
uuid = { version = "1", default-features = false, features = ["v4"] }
webpki-roots = { version = "0.26", default-features = false, optional = true }
webpki-roots = { version = "1", default-features = false, optional = true }
xmpp-parsers = { version = "0.20", default-features = false, features = ["disable-validation"] }

[features]
Expand Down
6 changes: 3 additions & 3 deletions lib-gst-meet/src/colibri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use futures::{
sink::SinkExt,
stream::{StreamExt, TryStreamExt},
};
use rand::{thread_rng, RngCore};
use rand::RngCore;
use tokio::{
sync::{mpsc, Mutex},
time::sleep,
Expand Down Expand Up @@ -37,7 +37,7 @@ impl ColibriChannel {
let mut retries = 0;
let colibri_websocket = loop {
let mut key = [0u8; 16];
thread_rng().fill_bytes(&mut key);
rand::rng().fill_bytes(&mut key);
let request = Request::get(&uri)
.header("sec-websocket-key", base64::encode(&key))
.header("sec-websocket-version", "13")
Expand Down Expand Up @@ -120,7 +120,7 @@ impl ColibriChannel {
match serde_json::to_string(&colibri_msg) {
Ok(json) => {
debug!("Colibri >>> {}", json);
let msg = Message::Text(json);
let msg = Message::Text(json.into());
colibri_sink.send(msg).await?;
},
Err(e) => warn!("failed to serialise colibri message: {:?}", e),
Expand Down
6 changes: 3 additions & 3 deletions lib-gst-meet/src/jingle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ impl JingleSession {
}
}
}
true
core::ops::ControlFlow::Break(())
});
}
}
Expand Down Expand Up @@ -1135,7 +1135,7 @@ impl JingleSession {
};
audio_sink_element.set_property("min-ptime", 10i64 * 1000 * 1000);
audio_sink_element.set_property("ssrc", audio_ssrc);
if audio_sink_element.has_property("auto-header-extension", None) {
if audio_sink_element.has_property("auto-header-extension") {
audio_sink_element.set_property("auto-header-extension", false);
audio_sink_element.connect("request-extension", false, move |values| {
let f = || {
Expand Down Expand Up @@ -1181,7 +1181,7 @@ impl JingleSession {
bail!("unsupported video codec: {}", codec_name);
};
video_sink_element.set_property("ssrc", video_ssrc);
if video_sink_element.has_property("auto-header-extension", None) {
if video_sink_element.has_property("auto-header-extension") {
video_sink_element.set_property("auto-header-extension", false);
video_sink_element.connect("request-extension", false, move |values| {
let f = || {
Expand Down
2 changes: 1 addition & 1 deletion lib-gst-meet/src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use tokio_tungstenite::Connector;
pub(crate) fn wss_connector(insecure: bool) -> Result<tokio_tungstenite::Connector> {
let mut roots = rustls::RootCertStore::empty();
for cert in
rustls_native_certs::load_native_certs().context("failed to load native root certs")?
rustls_native_certs::load_native_certs().expect("failed to load native root certs")
{
roots.add(cert).context("failed to add native root certs")?;
}
Expand Down
6 changes: 3 additions & 3 deletions lib-gst-meet/src/xmpp/connection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use futures::{
sink::{Sink, SinkExt},
stream::{Stream, StreamExt, TryStreamExt},
};
use rand::{thread_rng, RngCore};
use rand::RngCore;
use tokio::sync::{mpsc, oneshot, Mutex};
use tokio_stream::wrappers::ReceiverStream;
use tokio_tungstenite::tungstenite::{
Expand Down Expand Up @@ -93,7 +93,7 @@ impl Connection {

info!("Connecting XMPP WebSocket to {}", websocket_url);
let mut key = [0u8; 16];
thread_rng().fill_bytes(&mut key);
rand::rng().fill_bytes(&mut key);
let request = Request::get(&websocket_url)
.header("sec-websocket-protocol", "xmpp")
.header("sec-websocket-key", base64::encode(&key))
Expand Down Expand Up @@ -198,7 +198,7 @@ impl Connection {
}
#[cfg(not(feature = "syntax-highlighting"))]
debug!("XMPP >>> {}", xml);
sink.send(Message::Text(xml)).await?;
sink.send(Message::Text(xml.into())).await?;
}
Ok(())
}
Expand Down
8 changes: 4 additions & 4 deletions nice-gst-meet-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ name = "nice_sys"

[dependencies]
libc = { version = "0.2", default-features = false }
glib = { version = "0.19", default-features = false }
gio = { version = "0.19", default-features = false }
gobject-sys = { version = "0.19", default-features = false }
glib = { version = "0.21", default-features = false }
gio = { version = "0.21", default-features = false }
gobject-sys = { version = "0.21", default-features = false }

[build-dependencies]
system-deps = { version = "6", default-features = false }
system-deps = { version = "7", default-features = false }

[dev-dependencies]
shell-words = { version = "1", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions nice-gst-meet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ authors = ["Jasper Hugo <jasper@avstack.io>"]

[dependencies]
bitflags = { version = "2", default-features = false, optional = true }
glib = { version = "0.19", default-features = false }
glib = { version = "0.21", default-features = false }
libc = { version = "0.2", default-features = false }
nice-gst-meet-sys = { version = "0.3", path = "../nice-gst-meet-sys", default-features = false }
nix = { version = "0.28", default-features = false, features = ["socket", "net"] }
nix = { version = "0.31", default-features = false, features = ["socket", "net"] }

[features]
v0_1_4 = ["nice-gst-meet-sys/v0_1_4"]
Expand Down