Commit d2cf18ff authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

Add command-line parsing, logging/GStreamer setup and runtime setup

parent 73fee48f

Cargo.lock

+52 −129
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ dependencies = [ 
 "futures",

 "http",

 "log",

 "openssl",

 "tokio-openssl",

 "trust-dns-proto",

 "trust-dns-resolver",

]
@@ -86,6 +88,7 @@ dependencies = [ 
 "actix-rt",

 "actix-service",

 "actix-threadpool",

 "actix-tls 1.0.0",

 "actix-utils 1.0.6",

 "base64 0.11.0",

 "bitflags",
@@ -233,6 +236,8 @@ dependencies = [ 
 "either",

 "futures",

 "log",

 "openssl",

 "tokio-openssl",

]



[[package]]
@@ -245,8 +250,8 @@ dependencies = [ 
 "actix-service",

 "actix-utils 2.0.0",

 "futures-util",

 "native-tls",

 "tokio-tls",

 "openssl",

 "tokio-openssl",

]



[[package]]
@@ -314,6 +319,7 @@ dependencies = [ 
 "log",

 "mime",

 "net2",

 "openssl",

 "pin-project",

 "regex",

 "serde",
@@ -425,10 +431,10 @@ dependencies = [ 
 "futures-io",

 "futures-util",

 "log",

 "native-tls",

 "openssl",

 "pin-project",

 "tokio",

 "tokio-native-tls",

 "tokio-openssl",

 "tungstenite",

]
@@ -465,6 +471,7 @@ dependencies = [ 
 "futures-core",

 "log",

 "mime",

 "openssl",

 "percent-encoding",

 "rand",

 "serde",
@@ -616,22 +623,6 @@ version = "0.1.5" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536"



[[package]]

name = "core-foundation"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"

dependencies = [

 "core-foundation-sys",

 "libc",

]



[[package]]

name = "core-foundation-sys"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"



[[package]]

name = "cpuid-bool"

version = "0.1.2"
@@ -921,9 +912,9 @@ dependencies = [ 


[[package]]

name = "getrandom"

version = "0.1.14"

version = "0.1.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"

checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"

dependencies = [

 "cfg-if",

 "libc",
@@ -938,9 +929,9 @@ checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" 


[[package]]

name = "glib"

version = "0.10.1"

version = "0.10.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "a5e0533f48640d86e8e2f3cee778a9f97588d4a0bec8be065ee51ea52346d6c1"

checksum = "5f11a45bde4cf9567653a14ff96cdbb01e6d2a89651746dbc118319dfdac433e"

dependencies = [

 "bitflags",

 "futures-channel",
@@ -1261,9 +1252,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" 


[[package]]

name = "libc"

version = "0.2.76"

version = "0.2.77"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"

checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"



[[package]]

name = "linked-hash-map"
@@ -1394,24 +1385,6 @@ version = "0.2.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204"



[[package]]

name = "native-tls"

version = "0.2.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"

dependencies = [

 "lazy_static",

 "libc",

 "log",

 "openssl",

 "openssl-probe",

 "openssl-sys",

 "schannel",

 "security-framework",

 "security-framework-sys",

 "tempfile",

]



[[package]]

name = "net2"

version = "0.2.35"
@@ -1495,12 +1468,6 @@ dependencies = [ 
 "openssl-sys",

]



[[package]]

name = "openssl-probe"

version = "0.1.2"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"



[[package]]

name = "openssl-sys"

version = "0.9.58"
@@ -1622,9 +1589,9 @@ checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" 


[[package]]

name = "pretty-hex"

version = "0.2.0"

version = "0.2.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c8a6a27f79f3ec19193cd2ecfe9b73276b79026529466aef45d70d0f9eca651b"

checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131"



[[package]]

name = "proc-macro-crate"
@@ -1673,9 +1640,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" 


[[package]]

name = "proc-macro2"

version = "1.0.20"

version = "1.0.21"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"

checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"

dependencies = [

 "unicode-xid",

]
@@ -1760,15 +1727,6 @@ version = "0.6.18" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8"



[[package]]

name = "remove_dir_all"

version = "0.5.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"

dependencies = [

 "winapi 0.3.9",

]



[[package]]

name = "resolv-conf"

version = "0.6.3"
@@ -1791,45 +1749,12 @@ version = "1.0.5" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"



[[package]]

name = "schannel"

version = "0.1.19"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"

dependencies = [

 "lazy_static",

 "winapi 0.3.9",

]



[[package]]

name = "scopeguard"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"



[[package]]

name = "security-framework"

version = "0.4.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535"

dependencies = [

 "bitflags",

 "core-foundation",

 "core-foundation-sys",

 "libc",

 "security-framework-sys",

]



[[package]]

name = "security-framework-sys"

version = "0.4.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405"

dependencies = [

 "core-foundation-sys",

 "libc",

]



[[package]]

name = "serde"

version = "1.0.115"
@@ -1916,9 +1841,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" 


[[package]]

name = "socket2"

version = "0.3.12"

version = "0.3.15"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"

checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"

dependencies = [

 "cfg-if",

 "libc",
@@ -2012,20 +1937,6 @@ dependencies = [ 
 "version-compare",

]



[[package]]

name = "tempfile"

version = "3.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"

dependencies = [

 "cfg-if",

 "libc",

 "rand",

 "redox_syscall",

 "remove_dir_all",

 "winapi 0.3.9",

]



[[package]]

name = "termcolor"

version = "1.1.0"
@@ -2121,22 +2032,12 @@ dependencies = [ 
]



[[package]]

name = "tokio-native-tls"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069"

dependencies = [

 "native-tls",

 "tokio",

]



[[package]]

name = "tokio-tls"

version = "0.3.1"

name = "tokio-openssl"

version = "0.4.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343"

checksum = "3c4b08c5f4208e699ede3df2520aca2e82401b2de33f45e96696a074480be594"

dependencies = [

 "native-tls",

 "openssl",

 "tokio",

]
@@ -2249,7 +2150,6 @@ dependencies = [ 
 "httparse",

 "input_buffer",

 "log",

 "native-tls",

 "rand",

 "sha-1",

 "url",
@@ -2351,9 +2251,32 @@ version = "0.10.0+wasi-snapshot-preview1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"



[[package]]

name = "webrtc-audio-publisher"

version = "0.1.0"

dependencies = [

 "anyhow",

 "async-tungstenite",

 "env_logger",

 "futures",

 "glib",

 "gstreamer",

 "gstreamer-webrtc",

 "log",

 "serde",

 "serde_json",

 "structopt",

 "tokio",

 "webrtc-audio-publishing",

]



[[package]]

name = "webrtc-audio-publishing"

version = "0.1.0"



[[package]]

name = "webrtc-audio-server"

version = "0.1.0"

dependencies = [

 "actix-rt",

 "actix-service",
@@ -2361,17 +2284,17 @@ dependencies = [ 
 "actix-web",

 "actix-web-actors",

 "anyhow",

 "async-tungstenite",

 "env_logger",

 "futures",

 "glib",

 "gstreamer",

 "gstreamer-webrtc",

 "log",

 "openssl",

 "serde",

 "serde_json",

 "structopt",

 "tokio",

 "webrtc-audio-publishing",

]



[[package]]

Cargo.toml

+6 −24
Original line number Diff line number Diff line 
[package]

name = "webrtc-audio-publishing"

version = "0.1.0"

authors = ["Sebastian Dröge <sebastian@centricular.com>"]

edition = "2018"

license = "MIT"

[workspace]



[dependencies]

anyhow = "1"

gst = { version = "0.16", package = "gstreamer" }

gst-webrtc = { version = "0.16", package = "gstreamer-webrtc" }

glib = "0.10"

futures = "0.3"

actix-rt = "1"

actix-web = "2"

actix-web-actors = "2"

actix-service = "1"

actix-tls = { version = "2", features = ["nativetls"] }

log = "0.4"

env_logger = "0.7"

serde = "1"

serde_json = "1"

structopt = "0.3"

tokio = "0.2"

async-tungstenite = { version = "0.8", features = ["tokio-runtime", "tokio-native-tls"] }
 
members = [

    "common",

    "server",

    "publisher",

]

LICENSE

0 → 100644
+23 −0
Original line number Diff line number Diff line 
The MIT License (MIT)



Copyright (c) 2017 Sebastian Dröge <sebastian@centricular.com>.



Permission is hereby granted, free of charge, to any person obtaining a copy

of this software and associated documentation files (the "Software"), to deal

in the Software without restriction, including without limitation the rights

to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

copies of the Software, and to permit persons to whom the Software is

furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all

copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

SOFTWARE.

common/Cargo.toml

0 → 100644
+6 −0
Original line number Diff line number Diff line 
[package]

name = "webrtc-audio-publishing"

version = "0.1.0"

authors = ["Sebastian Dröge <sebastian@centricular.com>"]

edition = "2018"

license = "MIT"

common/LICENSE

0 → 100644
+23 −0
Original line number Diff line number Diff line 
The MIT License (MIT)



Copyright (c) 2017 Sebastian Dröge <sebastian@centricular.com>.



Permission is hereby granted, free of charge, to any person obtaining a copy

of this software and associated documentation files (the "Software"), to deal

in the Software without restriction, including without limitation the rights

to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

copies of the Software, and to permit persons to whom the Software is

furnished to do so, subject to the following conditions:



The above copyright notice and this permission notice shall be included in all

copies or substantial portions of the Software.



THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

SOFTWARE.