Update to gstreamer bindings v0.16

This commit is contained in:
George Hilliard committed 2020-08-02 11:48:40 -05:00
1 parent 7de269d1b3
commit 9cc3ca856f
3 files changed
+199 -61

No files matched your search

Generated
+193 -55
View File
@@ -18,6 +18,12 @@ dependencies = [
"winapi",
]
[[package]]
name = "anyhow"
version = "1.0.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
[[package]]
name = "arrayvec"
version = "0.5.1"
@@ -146,6 +152,12 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "either"
version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -173,6 +185,21 @@ dependencies = [
"synstructure",
]
[[package]]
name = "futures"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613"
dependencies = [
"futures-channel",
"futures-core",
"futures-executor",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-channel"
version = "0.3.5"
@@ -180,6 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5"
dependencies = [
"futures-core",
"futures-sink",
]
[[package]]
@@ -238,9 +266,13 @@ version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
"futures-macro",
"futures-sink",
"futures-task",
"memchr",
"pin-project",
"pin-utils",
"proc-macro-hack",
@@ -250,11 +282,12 @@ dependencies = [
[[package]]
name = "gio"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5"
checksum = "3c5492e80b45e6c56214894a9a0cbe1340ab5066eb44a2dbe151393b6d7942c0"
dependencies = [
"bitflags",
"futures",
"futures-channel",
"futures-core",
"futures-io",
@@ -263,27 +296,28 @@ dependencies = [
"glib",
"glib-sys",
"gobject-sys",
"lazy_static",
"libc",
"once_cell",
"thiserror",
]
[[package]]
name = "gio-sys"
version = "0.9.1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911"
checksum = "35993626299fbcaa73c0a19be8fdd01c950f9f3d3ac9cb4fb5532b924ab1a5d7"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "glib"
version = "0.9.3"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0"
checksum = "a5e0533f48640d86e8e2f3cee778a9f97588d4a0bec8be065ee51ea52346d6c1"
dependencies = [
"bitflags",
"futures-channel",
@@ -291,38 +325,55 @@ dependencies = [
"futures-executor",
"futures-task",
"futures-util",
"glib-macros",
"glib-sys",
"gobject-sys",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "glib-macros"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039"
dependencies = [
"anyhow",
"heck",
"itertools",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "glib-sys"
version = "0.9.1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2"
checksum = "b6cda4af5c2f4507b7a3535b798dca2135293f4bc3a17f399ce244ef15841c4c"
dependencies = [
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gobject-sys"
version = "0.9.1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9"
checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c"
dependencies = [
"glib-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer"
version = "0.15.7"
version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163"
checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609"
dependencies = [
"bitflags",
"cfg-if",
@@ -333,18 +384,20 @@ dependencies = [
"glib-sys",
"gobject-sys",
"gstreamer-sys",
"lazy_static",
"libc",
"muldiv",
"num-rational",
"once_cell",
"paste",
"pretty-hex",
"thiserror",
]
[[package]]
name = "gstreamer-app"
version = "0.15.6"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9"
checksum = "b2e9ca4df66162132a8d0083c5c5a40dea29ac619acb02395dba09e26bc1c500"
dependencies = [
"bitflags",
"futures-core",
@@ -356,28 +409,28 @@ dependencies = [
"gstreamer-app-sys",
"gstreamer-base",
"gstreamer-sys",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "gstreamer-app-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167"
checksum = "55d739f1289f37352884d716df1c571d365fe3eacb8164bc1996e8070053c949"
dependencies = [
"glib-sys",
"gstreamer-base-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-base"
version = "0.15.4"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12"
checksum = "872893487ce8876f18c63730402822804c5762869f631d8e3e6b18aafc8399f0"
dependencies = [
"bitflags",
"glib",
@@ -391,22 +444,22 @@ dependencies = [
[[package]]
name = "gstreamer-base-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed"
checksum = "c0fd5a77d39b47568fba01274dfcb28dc32382513c697009f80b89ef63fd32fd"
dependencies = [
"glib-sys",
"gobject-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-net"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac25e8d5593775b3a641a39410f9b25e460177982efd853f92d173419e91585a"
checksum = "caf6b7e17559f3afd74285d3007c9268bbd47ecb692dcb27944a2f54385aba73"
dependencies = [
"gio",
"glib",
@@ -419,23 +472,23 @@ dependencies = [
[[package]]
name = "gstreamer-net-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b454eef96c2fd27f8ea701024be277227ae1fe88042ffc60e7cc5c452a2660"
checksum = "ffc58fef62ae238322f24ca6589bf39f885888ab3c345b8ce15998f9a0f1b199"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-rtsp"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "971814f153a41e9f170b30ebcfba08f13a57a03e1bfb4ac26a872577ee8bdef4"
checksum = "17c0154054089449fa595da343660d37a9241cdb8a8794a982c7dfc4a82629f1"
dependencies = [
"bitflags",
"gio",
@@ -453,9 +506,9 @@ dependencies = [
[[package]]
name = "gstreamer-rtsp-server"
version = "0.15.5"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f79512e2f481f1fd2523a3e16b94f055a17c6c68a86da3a4b868085e5ac47ec8"
checksum = "ab8e59ac0e59b7c503359d4c617d1ca447ce2d263397b80d96f66312fb75ffc4"
dependencies = [
"bitflags",
"gio",
@@ -472,15 +525,15 @@ dependencies = [
"gstreamer-sdp",
"gstreamer-sdp-sys",
"gstreamer-sys",
"lazy_static",
"libc",
"once_cell",
]
[[package]]
name = "gstreamer-rtsp-server-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17e73413368846d1a5e475fa29dd710232d5479e02c402f3bab82bcd6b9f35df"
checksum = "d09f446a03f00fe0859ca41ca6ab0150392e261eab8151c1f0e1067356e34dce"
dependencies = [
"gio-sys",
"glib-sys",
@@ -490,14 +543,14 @@ dependencies = [
"gstreamer-sdp-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-rtsp-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed6bbda651f809e0a48500f9bde3c07d662ed688051a57501dcb5f9d7b2a5fd9"
checksum = "2e12559129061c3b4cc218ff997f42a7ba8a23f3c0db356e8f5a54e12fa7c3dd"
dependencies = [
"gio-sys",
"glib-sys",
@@ -505,14 +558,14 @@ dependencies = [
"gstreamer-sdp-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-sdp"
version = "0.15.6"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "547b3b0eb9e01e13ab5cc066c817e2ab758f83790145f80f62d3c8e43c2966af"
checksum = "6ebbe4fbea4f2c67982c667ba57b64b01d43bc3dc1dc4a8d3512cb33a2adc7c1"
dependencies = [
"glib",
"glib-sys",
@@ -524,27 +577,27 @@ dependencies = [
[[package]]
name = "gstreamer-sdp-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99e88ac4f9f20323ef3409dddcea3bbf58364ff8eea10b14da5303bfcb23347a"
checksum = "289c7f258d3387ae91c6058555922d8cf0704fc2bc870d1a03190bc81b040655"
dependencies = [
"glib-sys",
"gobject-sys",
"gstreamer-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
name = "gstreamer-sys"
version = "0.8.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db"
checksum = "1321f34d53bb5f60ab1aaf581e29b664b8d41601714ee1bb7dbea490b5b9ff60"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
"pkg-config",
"system-deps",
]
[[package]]
@@ -614,6 +667,15 @@ dependencies = [
"unindent",
]
[[package]]
name = "itertools"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "0.4.6"
@@ -701,12 +763,14 @@ dependencies = [
"crossbeam",
"env_logger",
"err-derive",
"gio",
"glib",
"gstreamer",
"gstreamer-app",
"gstreamer-rtsp",
"gstreamer-rtsp-server",
"indoc",
"itertools",
"lazy_static",
"log",
"md5",
@@ -746,9 +810,9 @@ dependencies = [
[[package]]
name = "num-rational"
version = "0.2.4"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138"
dependencies = [
"autocfg",
"num-integer",
@@ -827,6 +891,21 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
[[package]]
name = "pretty-hex"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be91bcc43e73799dc46a6c194a55e7aae1d86cc867c860fd4a436019af21bd8c"
[[package]]
name = "proc-macro-crate"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
]
[[package]]
name = "proc-macro-error"
version = "1.0.3"
@@ -1021,6 +1100,24 @@ dependencies = [
"syn",
]
[[package]]
name = "strum"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b"
[[package]]
name = "strum_macros"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "syn"
version = "1.0.33"
@@ -1055,6 +1152,21 @@ dependencies = [
"unicode-xid",
]
[[package]]
name = "system-deps"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b"
dependencies = [
"heck",
"pkg-config",
"strum",
"strum_macros",
"thiserror",
"toml",
"version-compare",
]
[[package]]
name = "termcolor"
version = "1.1.0"
@@ -1073,6 +1185,26 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "thiserror"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "thread_local"
version = "1.0.1"
@@ -1186,6 +1318,12 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version-compare"
version = "0.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1"
[[package]]
name = "version_check"
version = "0.9.2"
+5 -5
View File
@@ -13,11 +13,11 @@ crossbeam = "0.7"
env_logger = "*"
err-derive = "0.2"
glib = "*"
gio = "0.8"
gstreamer = "0.15"
gstreamer-app = "0.15"
gstreamer-rtsp = "0.15"
gstreamer-rtsp-server = { version = "0.15", features = ["v1_12", "v1_14"]}
gio = "0.9"
gstreamer = "0.16"
gstreamer-app = "0.16"
gstreamer-rtsp = "0.16"
gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]}
lazy_static = "1.4"
log = { version = "0.4" }
indoc = "0.3"
+1 -1
View File
@@ -165,7 +165,7 @@ impl RtspServer {
// We seperate reading the file and changing to a PEM so that we get different error messages.
let cert_contents = fs::read_to_string(cert_file).expect("TLS file not found");
let cert =
TlsCertificate::new_from_pem(&cert_contents).expect("Not a valid TLS certificate");
TlsCertificate::from_pem(&cert_contents).expect("Not a valid TLS certificate");
auth.set_tls_certificate(Some(&cert));
auth.set_tls_authentication_mode(client_auth);