haskal
/
gst-meet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepared for publishing to crates.io

This commit is contained in:
Jasper Hugo 2021-08-13 18:54:51 +07:00
parent fbaf22ba7e
commit bed8d156dc
7 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Cargo.lock generated
View File

@ -54,9 +54,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.2.1" version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" checksum = "2da1976d75adbe5fbc88130ecd119529cf1cc6a93ae1546d8696ee66f0d21af1"
[[package]] [[package]]
name = "blake2" name = "blake2"
@ -665,7 +665,7 @@ dependencies = [
"tokio-tungstenite", "tokio-tungstenite",
"tracing", "tracing",
"uuid", "uuid",
"xmpp-parsers", "xmpp-parsers-gst-meet",
] ]
[[package]] [[package]]
@ -718,9 +718,9 @@ dependencies = [
[[package]] [[package]]
name = "matches" name = "matches"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]] [[package]]
name = "memchr" name = "memchr"
@ -785,7 +785,7 @@ dependencies = [
[[package]] [[package]]
name = "nice-gst-meet-sys" name = "nice-gst-meet-sys"
version = "0.0.1" version = "0.1.0"
dependencies = [ dependencies = [
"gio", "gio",
"glib", "glib",
@ -1406,9 +1406,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.9.0" version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b7b349f11a7047e6d1276853e612d152f5e8a352c61917887cc2169e2366b4c" checksum = "01cf844b23c6131f624accf65ce0e4e9956a8bb329400ea5bcc26ae3a5c20b0b"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",
@ -1575,12 +1575,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
[[package]] [[package]]
name = "unicode-bidi" name = "unicode-bidi"
version = "0.3.5" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" checksum = "246f4c42e67e7a4e3c6106ff716a5d067d4132a642840b242e357e468a2a0085"
dependencies = [
"matches",
]
[[package]] [[package]]
name = "unicode-normalization" name = "unicode-normalization"
@ -1766,8 +1763,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "xmpp-parsers" name = "xmpp-parsers-gst-meet"
version = "0.18.1" version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07ee050e91ad5abe5d8b90c07aad58e9bc66e1c188203dee96cd77c4c739a585"
dependencies = [ dependencies = [
"base64", "base64",
"blake2", "blake2",

3
gst-meet/Cargo.toml
View File

@ -1,5 +1,6 @@
[package] [package]
name = "gst-meet" name = "gst-meet"
description = "A tool for connecting GStreamer pipelines to Jitsi Meet conferences"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
@ -10,7 +11,7 @@ anyhow = { version = "1", default-features = false, features = ["std"] }
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
glib = { version = "0.14", default-features = false, features = ["log"] } glib = { version = "0.14", default-features = false, features = ["log"] }
gstreamer = { version = "0.17", default-features = false, features = ["v1_18"] } gstreamer = { version = "0.17", default-features = false, features = ["v1_18"] }
lib-gst-meet = { path = "../lib-gst-meet" } lib-gst-meet = { version = "0.1", path = "../lib-gst-meet", default-features = false }
structopt = { version = "0.3", default-features = false } structopt = { version = "0.3", default-features = false }
tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "signal", "sync", "time"] } tokio = { version = "1", default-features = false, features = ["macros", "rt-multi-thread", "signal", "sync", "time"] }
tokio-stream = { version = "0.1", default-features = false } tokio-stream = { version = "0.1", default-features = false }

7
lib-gst-meet/Cargo.toml
View File

@ -1,5 +1,6 @@
[package] [package]
name = "lib-gst-meet" name = "lib-gst-meet"
description = "Connect GStreamer pipelines to Jitsi Meet conferences"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
@ -17,18 +18,18 @@ hex = { version = "0.4", default-features = false, features = ["std"] }
itertools = { version = "0.10", default-features = false, features = ["use_std"] } itertools = { version = "0.10", default-features = false, features = ["use_std"] }
libc = { version = "0.2", default-features = false } libc = { version = "0.2", default-features = false }
maplit = { version = "1", default-features = false } maplit = { version = "1", default-features = false }
nice-gst-meet = { path = "../nice-gst-meet", default-features = false, features = ["v0_1_18"] } nice-gst-meet = { version = "0.1", path = "../nice-gst-meet", default-features = false, features = ["v0_1_18"] }
once_cell = { version = "1", default-features = false, features = ["std"] } once_cell = { version = "1", default-features = false, features = ["std"] }
pem = { version = "0.8", default-features = false } pem = { version = "0.8", default-features = false }
rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] } rand = { version = "0.8", default-features = false, features = ["std", "std_rng"] }
rcgen = { version = "0.8", default-features = false } rcgen = { version = "0.8", default-features = false }
ring = { version = "0.16", default-features = false } ring = { version = "0.16", default-features = false }
tokio = { version = "1", default-features = false, features = ["sync", "time"] } tokio = { version = "1", default-features = false, features = ["rt-multi-thread", "macros", "sync", "time"] }
tokio-stream = { version = "0.1", default-features = false, features = ["time"] } tokio-stream = { version = "0.1", default-features = false, features = ["time"] }
tokio-tungstenite = { version = "0.14", default-features = false, features = ["connect", "rustls-tls"] } tokio-tungstenite = { version = "0.14", default-features = false, features = ["connect", "rustls-tls"] }
tracing = { version = "0.1", default-features = false, features = ["attributes", "std"] } tracing = { version = "0.1", default-features = false, features = ["attributes", "std"] }
uuid = { version = "0.8", default-features = false, features = ["v4"] } uuid = { version = "0.8", default-features = false, features = ["v4"] }
xmpp-parsers = { path = "../../xmpp-rs/xmpp-parsers", default-features = false } xmpp-parsers = { package = "xmpp-parsers-gst-meet", version = "0.18", default-features = false }
[build-dependencies] [build-dependencies]
pkg-config = { version = "0.3", default-features = false } pkg-config = { version = "0.3", default-features = false }

13
lib-gst-meet/src/jingle.rs
View File

@ -716,12 +716,13 @@ impl JingleSession {
}); });
description.ssrcs = vec![ssrc]; description.ssrcs = vec![ssrc];
let mut transport = IceUdpTransport::new().with_fingerprint(Fingerprint { let mut transport = IceUdpTransport::new()
hash: Algo::Sha_256, .with_fingerprint(Fingerprint {
setup: Some(Setup::Active), hash: Algo::Sha_256,
value: fingerprint.clone(), setup: Some(Setup::Active),
required: Some(true.to_string()), value: fingerprint.clone(),
}); required: Some(true.to_string()),
});
transport.ufrag = Some(ice_local_ufrag.clone()); transport.ufrag = Some(ice_local_ufrag.clone());
transport.pwd = Some(ice_local_pwd.clone()); transport.pwd = Some(ice_local_pwd.clone());
transport.candidates = vec![]; transport.candidates = vec![];

1
nice-gst-meet-sys/Cargo.toml
View File

@ -1,5 +1,6 @@
[package] [package]
name = "nice-gst-meet-sys" name = "nice-gst-meet-sys"
description = "FFI bindings to libnice for gst-meet"
version = "0.1.0" version = "0.1.0"
links = "nice" links = "nice"
edition = "2018" edition = "2018"

3
nice-gst-meet/Cargo.toml
View File

@ -1,5 +1,6 @@
[package] [package]
name = "nice-gst-meet" name = "nice-gst-meet"
description = "Bindings to libnice for gst-meet"
version = "0.1.0" version = "0.1.0"
edition = "2018" edition = "2018"
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
@ -9,7 +10,7 @@ authors = ["Jasper Hugo <jasper@avstack.io>"]
bitflags = { version = "1", default-features = false, optional = true } bitflags = { version = "1", default-features = false, optional = true }
glib = { version = "0.14", default-features = false } glib = { version = "0.14", default-features = false }
libc = { version = "0.2", default-features = false } libc = { version = "0.2", default-features = false }
nice-gst-meet-sys = { path = "../nice-gst-meet-sys", default-features = false } nice-gst-meet-sys = { version = "0.1", path = "../nice-gst-meet-sys", default-features = false }
nix = { version = "0.22", default-features = false } nix = { version = "0.22", default-features = false }
[features] [features]

1
nice-gst-meet/src/candidate.rs
View File

@ -30,7 +30,6 @@ impl ::std::fmt::Debug for Candidate {
f.debug_struct("Candidate") f.debug_struct("Candidate")
.field("type_", &self.type_()) .field("type_", &self.type_())
.field("foundation", &self.foundation()) .field("foundation", &self.foundation())
.field("transport", &self.transport())
.field("addr", &self.addr()) .field("addr", &self.addr())
.field("priority", &self.priority()) .field("priority", &self.priority())
.field("stream_id", &self.stream_id()) .field("stream_id", &self.stream_id())