Compare commits
No commits in common. "04ec4fff8f34924b4ab8f61f2ee5d450b934dcd9" and "64c840a2fd0f9d999986b277ba2a810f32173ff6" have entirely different histories.
04ec4fff8f
...
64c840a2fd
4 changed files with 15 additions and 49 deletions
36
Cargo.lock
generated
36
Cargo.lock
generated
|
@ -2219,19 +2219,7 @@ dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tungstenite 0.23.0",
|
"tungstenite",
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tokio-tungstenite"
|
|
||||||
version = "0.24.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
|
|
||||||
dependencies = [
|
|
||||||
"futures-util",
|
|
||||||
"log",
|
|
||||||
"tokio",
|
|
||||||
"tungstenite 0.24.0",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -2356,24 +2344,6 @@ dependencies = [
|
||||||
"utf-8",
|
"utf-8",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "tungstenite"
|
|
||||||
version = "0.24.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
|
|
||||||
dependencies = [
|
|
||||||
"byteorder",
|
|
||||||
"bytes",
|
|
||||||
"data-encoding",
|
|
||||||
"http",
|
|
||||||
"httparse",
|
|
||||||
"log",
|
|
||||||
"rand",
|
|
||||||
"sha1",
|
|
||||||
"thiserror",
|
|
||||||
"utf-8",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "turn"
|
name = "turn"
|
||||||
version = "0.8.0"
|
version = "0.8.0"
|
||||||
|
@ -2503,7 +2473,7 @@ dependencies = [
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"snafu",
|
"snafu",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-tungstenite 0.24.0",
|
"tokio-tungstenite",
|
||||||
"tokio-util",
|
"tokio-util",
|
||||||
"toml",
|
"toml",
|
||||||
"tracing",
|
"tracing",
|
||||||
|
@ -2524,7 +2494,7 @@ dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tokio",
|
"tokio",
|
||||||
"tokio-tungstenite 0.23.1",
|
"tokio-tungstenite",
|
||||||
"tracing",
|
"tracing",
|
||||||
"webrtc",
|
"webrtc",
|
||||||
]
|
]
|
||||||
|
|
19
Cargo.toml
19
Cargo.toml
|
@ -6,23 +6,24 @@ edition = "2021"
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
async-channel = "2.3.1"
|
|
||||||
bincode = "1.3.3"
|
|
||||||
config = "0.14.0"
|
config = "0.14.0"
|
||||||
futures-util = "0.3.30"
|
|
||||||
gstreamer = { version = "0.23.0", features = ["v1_22"] }
|
gstreamer = { version = "0.23.0", features = ["v1_22"] }
|
||||||
gstreamer-app = { version = "0.23.0", features = ["v1_22"] }
|
gstreamer-app = { version = "0.23.0", features = ["v1_22"] }
|
||||||
log = "0.4.22"
|
log = "0.4.22"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { version = "1.0.204", features = ["derive"] }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0.122"
|
||||||
snafu = "0.8.4"
|
snafu = "0.8.4"
|
||||||
tokio = { version = "1.40", features = ["signal"] }
|
tokio = { version = "1.39.2", features = ["signal"] }
|
||||||
tokio-util = "0.7.12"
|
tokio-tungstenite = "0.23.1"
|
||||||
tokio-tungstenite = "0.24"
|
|
||||||
toml = "0.8.19"
|
toml = "0.8.19"
|
||||||
tracing = "0.1.40"
|
tracing = "0.1.40"
|
||||||
tracing-subscriber = "0.3.18"
|
tracing-subscriber = "0.3.18"
|
||||||
uuid = "1.10.0"
|
|
||||||
webrtc = "0.11.0"
|
webrtc = "0.11.0"
|
||||||
|
|
||||||
vcs-common = { git = "https://git.nickiel.net/VCC/vcs-common.git", branch = "main" }
|
vcs-common = { git = "https://git.nickiel.net/VCC/vcs-common.git", branch = "main" }
|
||||||
|
async-channel = "2.3.1"
|
||||||
|
futures-util = "0.3.30"
|
||||||
|
bincode = "1.3.3"
|
||||||
|
tokio-util = "0.7.12"
|
||||||
|
uuid = "1.10.0"
|
||||||
|
|
|
@ -20,8 +20,7 @@ pub fn new_pipeline(config: &AppConfig) -> Pipeline {
|
||||||
.name("camera_to_rtp_pipeine")
|
.name("camera_to_rtp_pipeine")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
// let source = ElementFactory::make("mfvideosrc")
|
let source = ElementFactory::make("mfvideosrc")
|
||||||
let source = ElementFactory::make("v4l2src")
|
|
||||||
.build()
|
.build()
|
||||||
.expect("Could not make mfvideosrc element!");
|
.expect("Could not make mfvideosrc element!");
|
||||||
|
|
||||||
|
|
|
@ -274,11 +274,7 @@ async fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("webrtc kickoff complete, entering watch mode");
|
info!("webrtc kickoff complete, entering watch mode");
|
||||||
}
|
} // end supports_webrtc portion
|
||||||
// end supports_webrtc portion
|
|
||||||
else {
|
|
||||||
info!("Skipped webrtc setup");
|
|
||||||
}
|
|
||||||
|
|
||||||
// loop through messages coming from the remote.
|
// loop through messages coming from the remote.
|
||||||
loop {
|
loop {
|
||||||
|
|
Loading…
Reference in a new issue