hanzo/sharer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade dependencies (#24)

Browse Source
This commit is contained in:
Harry
2023-05-24 06:39:44 -04:00
committed by GitHub
parent 11c372bd55
commit ff2857e5c6
6 changed files with 410 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+305 -95
View File
@@ -140,9 +140,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "0.7.19"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
dependencies = [
"memchr",
]
@@ -200,6 +200,7 @@ dependencies = [
"num-traits",
"rusticata-macros",
"thiserror",
"time 0.3.17",
]
[[package]]
@@ -260,7 +261,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [
"hermit-abi",
"hermit-abi 0.1.19",
"libc",
"winapi",
]
@@ -819,6 +820,7 @@ dependencies = [
"asn1-rs 0.5.1",
"displaydoc",
"nom 7.1.1",
"num-bigint",
"num-traits",
"rusticata-macros",
]
@@ -933,9 +935,9 @@ dependencies = [
[[package]]
name = "embed-resource"
version = "1.7.2"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc24ff8d764818e9ab17963b0593c535f077a513f565e75e4352d758bc4d8c0"
checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a"
dependencies = [
"cc",
"rustc_version",
@@ -972,12 +974,12 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.9.3"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
dependencies = [
"atty",
"humantime",
"is-terminal",
"log",
"regex",
"termcolor",
@@ -994,6 +996,17 @@ dependencies = [
"winapi",
]
[[package]]
name = "errno"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
dependencies = [
"errno-dragonfly",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "errno-dragonfly"
version = "0.1.2"
@@ -1098,9 +1111,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
dependencies = [
"futures-core",
"futures-sink",
@@ -1108,9 +1121,9 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
@@ -1125,38 +1138,38 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
[[package]]
name = "futures-macro"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.103",
"syn 2.0.16",
]
[[package]]
name = "futures-sink"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
[[package]]
name = "futures-task"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
version = "0.3.25"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-channel",
"futures-core",
@@ -1245,6 +1258,12 @@ dependencies = [
"subtle",
]
[[package]]
name = "hashbrown"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "heck"
version = "0.4.0"
@@ -1260,6 +1279,12 @@ dependencies = [
"libc",
]
[[package]]
name = "hermit-abi"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
[[package]]
name = "hex"
version = "0.4.3"
@@ -1303,7 +1328,7 @@ dependencies = [
"bindgen",
"cc",
"cfg-if",
"errno",
"errno 0.2.8",
"libc",
"thiserror",
"winapi",
@@ -1372,6 +1397,16 @@ dependencies = [
"unicode-normalization",
]
[[package]]
name = "indexmap"
version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
dependencies = [
"autocfg",
"hashbrown",
]
[[package]]
name = "inout"
version = "0.1.3"
@@ -1392,9 +1427,9 @@ dependencies = [
[[package]]
name = "interceptor"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ffaa4d24f546a18eaeee91f7b2c52e080e20e285e43cd7c27a527b4712cfdad"
checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b"
dependencies = [
"async-trait",
"bytes",
@@ -1409,12 +1444,35 @@ dependencies = [
"webrtc-util",
]
[[package]]
name = "io-lifetimes"
version = "1.0.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
dependencies = [
"hermit-abi 0.3.1",
"libc",
"windows-sys 0.48.0",
]
[[package]]
name = "ipnet"
version = "2.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
[[package]]
name = "is-terminal"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
dependencies = [
"hermit-abi 0.3.1",
"io-lifetimes",
"rustix",
"windows-sys 0.48.0",
]
[[package]]
name = "itertools"
version = "0.10.5"
@@ -1482,6 +1540,12 @@ dependencies = [
"cc",
]
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "lock_api"
version = "0.4.9"
@@ -1574,7 +1638,7 @@ dependencies = [
"dyn-clone",
"embed-resource",
"enigo",
"env_logger 0.9.3",
"env_logger 0.10.0",
"failure",
"futures-util",
"howlong",
@@ -1680,7 +1744,7 @@ version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
dependencies = [
"hermit-abi",
"hermit-abi 0.1.19",
"libc",
]
@@ -1711,6 +1775,15 @@ dependencies = [
"asn1-rs 0.3.1",
]
[[package]]
name = "oid-registry"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
dependencies = [
"asn1-rs 0.5.1",
]
[[package]]
name = "once_cell"
version = "1.16.0"
@@ -2004,19 +2077,6 @@ dependencies = [
"getrandom 0.2.8",
]
[[package]]
name = "rcgen"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
dependencies = [
"pem",
"ring",
"time 0.3.17",
"x509-parser",
"yasna",
]
[[package]]
name = "rcgen"
version = "0.10.0"
@@ -2026,6 +2086,7 @@ dependencies = [
"pem",
"ring",
"time 0.3.17",
"x509-parser 0.14.0",
"yasna",
]
@@ -2040,9 +2101,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.7.0"
version = "1.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974"
dependencies = [
"aho-corasick",
"memchr",
@@ -2051,9 +2112,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.28"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "remove_dir_all"
@@ -2092,9 +2153,9 @@ dependencies = [
[[package]]
name = "rtcp"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11171e7e37998dcf54a9e9d4a6e2e1932c994424c7d39bc6349fed1424c45c3"
checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691"
dependencies = [
"bytes",
"thiserror",
@@ -2145,6 +2206,20 @@ dependencies = [
"nom 7.1.1",
]
[[package]]
name = "rustix"
version = "0.37.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2"
dependencies = [
"bitflags",
"errno 0.3.1",
"io-lifetimes",
"libc",
"linux-raw-sys",
"windows-sys 0.45.0",
]
[[package]]
name = "rustls"
version = "0.19.1"
@@ -2282,6 +2357,15 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_spanned"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
[[package]]
name = "sha-1"
version = "0.9.8"
@@ -2295,17 +2379,6 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "sha-1"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
dependencies = [
"cfg-if",
"cpufeatures",
"digest 0.10.6",
]
[[package]]
name = "sha1"
version = "0.10.5"
@@ -2612,9 +2685,9 @@ dependencies = [
[[package]]
name = "tokio-native-tls"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
dependencies = [
"native-tls",
"tokio",
@@ -2622,9 +2695,9 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
version = "0.17.2"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c"
dependencies = [
"futures-util",
"log",
@@ -2650,11 +2723,36 @@ dependencies = [
[[package]]
name = "toml"
version = "0.5.9"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7"
checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
dependencies = [
"indexmap",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]]
@@ -2679,19 +2777,19 @@ dependencies = [
[[package]]
name = "tungstenite"
version = "0.17.3"
version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
dependencies = [
"base64",
"byteorder",
"bytes",
"data-encoding",
"http",
"httparse",
"log",
"native-tls",
"rand",
"sha-1 0.10.0",
"sha1",
"thiserror",
"url",
"utf-8",
@@ -2954,9 +3052,9 @@ dependencies = [
[[package]]
name = "webrtc"
version = "0.6.0"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb"
checksum = "072e218dd661ea9074ba20cf80be38b8346729337abe96940800fb4b3ed2692f"
dependencies = [
"arc-swap",
"async-trait",
@@ -2966,7 +3064,7 @@ dependencies = [
"lazy_static",
"log",
"rand",
"rcgen 0.9.3",
"rcgen",
"regex",
"ring",
"rtcp",
@@ -2995,9 +3093,9 @@ dependencies = [
[[package]]
name = "webrtc-data"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100"
checksum = "5c3c7ba7d11733e448d8d2d054814e97c558f52293f0e0a2eb05840f28b3be12"
dependencies = [
"bytes",
"derive_builder",
@@ -3031,7 +3129,7 @@ dependencies = [
"p384",
"rand",
"rand_core 0.6.4",
"rcgen 0.10.0",
"rcgen",
"ring",
"rustls",
"sec1",
@@ -3045,7 +3143,7 @@ dependencies = [
"webpki",
"webrtc-util",
"x25519-dalek",
"x509-parser",
"x509-parser 0.13.2",
]
[[package]]
@@ -3087,9 +3185,9 @@ dependencies = [
[[package]]
name = "webrtc-media"
version = "0.5.1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991"
checksum = "6136216b40e2e87ca977fbfdaa1cddfa067feef2d011341139e7aaea3d7215d4"
dependencies = [
"byteorder",
"bytes",
@@ -3100,9 +3198,9 @@ dependencies = [
[[package]]
name = "webrtc-sctp"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0"
checksum = "7df742d91cfbd982f6ab2bfd45a7c3ddfce5b2f55913b2f63877404d1b3259db"
dependencies = [
"arc-swap",
"async-trait",
@@ -3132,7 +3230,7 @@ dependencies = [
"log",
"rtcp",
"rtp",
"sha-1 0.9.8",
"sha-1",
"subtle",
"thiserror",
"tokio",
@@ -3202,17 +3300,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.42.0"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0286ba339aa753e70765d521bb0242cc48e1194562bfa2a2ad7ac8a6de28f5d5"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.2",
"windows-targets 0.48.0",
]
[[package]]
@@ -3234,21 +3326,75 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.45.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
dependencies = [
"windows-targets 0.42.2",
]
[[package]]
name = "windows-sys"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
"windows-targets 0.48.0",
]
[[package]]
name = "windows-targets"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm 0.42.2",
"windows_aarch64_msvc 0.42.2",
"windows_i686_gnu 0.42.2",
"windows_i686_msvc 0.42.2",
"windows_x86_64_gnu 0.42.2",
"windows_x86_64_gnullvm 0.42.2",
"windows_x86_64_msvc 0.42.2",
]
[[package]]
name = "windows-targets"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
dependencies = [
"windows_aarch64_gnullvm 0.48.0",
"windows_aarch64_msvc 0.48.0",
"windows_i686_gnu 0.48.0",
"windows_i686_msvc 0.48.0",
"windows_x86_64_gnu 0.48.0",
"windows_x86_64_gnullvm 0.48.0",
"windows_x86_64_msvc 0.48.0",
]
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
@@ -3261,6 +3407,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
@@ -3273,6 +3425,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
@@ -3285,6 +3443,12 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
@@ -3297,12 +3461,24 @@ version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
@@ -3316,11 +3492,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
[[package]]
name = "winreg"
version = "0.10.1"
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
[[package]]
name = "winnow"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
dependencies = [
"memchr",
]
[[package]]
name = "winreg"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189"
dependencies = [
"cfg-if",
"winapi",
]
@@ -3348,7 +3540,25 @@ dependencies = [
"der-parser 7.0.0",
"lazy_static",
"nom 7.1.1",
"oid-registry",
"oid-registry 0.4.0",
"rusticata-macros",
"thiserror",
"time 0.3.17",
]
[[package]]
name = "x509-parser"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8"
dependencies = [
"asn1-rs 0.5.1",
"base64",
"data-encoding",
"der-parser 8.1.0",
"lazy_static",
"nom 7.1.1",
"oid-registry 0.6.1",
"ring",
"rusticata-macros",
"thiserror",
Cargo.toml
+6 -6
View File
@@ -9,13 +9,13 @@ failure = "0.1.8"
clap = { version = "4.0.14", features = ["derive"] }
tokio = { version = "1.15", features = ["full"] }
tokio-util = { version= "0.7.4", features = ["codec"] }
webrtc = "0.6.0"
webrtc = "0.7.3"
serde = "1.0.145"
serde_json = "1.0.70"
async-trait = "0.1.51"
log = "0.4.17"
env_logger = "0.9.0"
tokio-tungstenite = { version = "0.17.2", features = ["native-tls"] }
env_logger = "0.10.0"
tokio-tungstenite = { version = "0.19.0", features = ["native-tls"] }
url = "2.3.1"
futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
chrono = "0.4.22"
@@ -24,7 +24,7 @@ uuid = "1.2.1"
bytes = "1.2.1"
enigo = { git = "https://github.com/mira-screen-share/enigo", branch = "master" }
ac-ffmpeg = { git = "https://github.com/mira-screen-share/rust-ac-ffmpeg", branch = "dev" }
toml = "0.5.9"
toml = "0.7.4"
itertools = "0.10.5"
howlong = "0.1.7"
rtcp = "0.7.1"
@@ -35,7 +35,7 @@ block = "0.1.6"
[target.'cfg(target_os = "windows")'.dependencies]
[dependencies.windows]
version = "0.42.0"
version = "0.48.0"
features = [
"Data_Xml_Dom",
"Foundation",
@@ -62,4 +62,4 @@ features = [
]
[build-dependencies]
embed-resource = "1.7"
embed-resource = "2.1.1"
build.rs
+1 -1
View File
@@ -2,6 +2,6 @@ extern crate embed_resource;
fn main() {
if cfg!(target_os = "windows") {
embed_resource::compile("mira-manifest.rc");
embed_resource::compile("mira-manifest.rc", embed_resource::NONE);
}
}
src/capture/wgc/d3d.rs
+5 -7
View File
@@ -1,4 +1,4 @@
use windows::core::{Abi, Interface, Result};
use windows::core::{ComInterface, Interface, Result};
use windows::Graphics::DirectX::Direct3D11::IDirect3DDevice;
use windows::Win32::Graphics::Direct3D11::ID3D11DeviceContext;
use windows::Win32::Graphics::{
@@ -56,18 +56,16 @@ fn create_d3d_device() -> Result<ID3D11Device> {
pub fn create_direct3d_devices_and_context(
) -> Result<(ID3D11Device, IDirect3DDevice, ID3D11DeviceContext)> {
let d3d_device = create_d3d_device()?;
let d3d_context = unsafe {
let mut d3d_context = None;
d3d_device.GetImmediateContext(&mut d3d_context);
d3d_context.unwrap()
};
let d3d_context = unsafe { d3d_device.GetImmediateContext().unwrap() };
let dxgi_device: IDXGIDevice = d3d_device.cast()?;
let inspectable = unsafe { CreateDirect3D11DeviceFromDXGIDevice(&dxgi_device)? };
let id3d_device: IDirect3DDevice = inspectable.cast()?;
Ok((d3d_device, id3d_device, d3d_context))
}
pub fn get_d3d_interface_from_object<S: Interface, R: Interface + Abi>(object: &S) -> Result<R> {
pub fn get_d3d_interface_from_object<S: Interface + ComInterface, R: Interface + ComInterface>(
object: &S,
) -> Result<R> {
let access: IDirect3DDxgiInterfaceAccess = object.cast()?;
let object = unsafe { access.GetInterface::<R>()? };
Ok(object)
src/capture/yuv_convert/yuv_converter.rs
+93 -35
View File
@@ -118,11 +118,14 @@ impl YuvConverter {
},
};
let shader_resource_view = self
.device
.CreateShaderResourceView(&self.backend_texture, Some(&shader_resouce_view_desc))?;
let mut shader_resource_view = None;
self.device.CreateShaderResourceView(
&self.backend_texture,
Some(&shader_resouce_view_desc),
Some(&mut shader_resource_view),
)?;
let shader_resource_view = [Some(shader_resource_view)];
let shader_resource_view = [shader_resource_view];
self.device_context
.IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
@@ -183,9 +186,15 @@ impl YuvConverter {
&self.chrominance_render_texture,
);
let lumina_mapped_resource =
self.device_context
.Map(&self.luminance_staging_texture, 0, D3D11_MAP_READ, 0)?;
let mut lumina_mapped_resource = std::mem::zeroed();
self.device_context.Map(
&self.luminance_staging_texture,
0,
D3D11_MAP_READ,
0,
Some(&mut lumina_mapped_resource),
)?;
let luminance_stride = lumina_mapped_resource.RowPitch;
@@ -198,9 +207,15 @@ impl YuvConverter {
self.device_context
.Unmap(&self.luminance_staging_texture, 0);
let chrominance_mapped_resource =
self.device_context
.Map(&self.chrominance_staging_texture, 0, D3D11_MAP_READ, 0)?;
let mut chrominance_mapped_resource = std::mem::zeroed();
self.device_context.Map(
&self.chrominance_staging_texture,
0,
D3D11_MAP_READ,
0,
Some(&mut chrominance_mapped_resource),
)?;
let chrominance_stride = chrominance_mapped_resource.RowPitch;
@@ -233,7 +248,8 @@ unsafe fn init_shaders(
ID3D11PixelShader,
ID3D11PixelShader,
)> {
let vertex_shader = device.CreateVertexShader(shader::VERTEX_SHADER_BYTES, None)?;
let mut vertex_shader = None;
device.CreateVertexShader(shader::VERTEX_SHADER_BYTES, None, Some(&mut vertex_shader))?;
let vertex_buffer_desc = D3D11_BUFFER_DESC {
ByteWidth: VERTEX_STRIDES * VERTICES.len() as u32,
@@ -250,18 +266,32 @@ unsafe fn init_shaders(
SysMemSlicePitch: 0,
};
let vertex_buffer = device.CreateBuffer(&vertex_buffer_desc, Some(&subresource_data))?;
let mut vertex_buffer = None;
device.CreateBuffer(
&vertex_buffer_desc,
Some(&subresource_data),
Some(&mut vertex_buffer),
)?;
let pixel_shader_lumina = device.CreatePixelShader(shader::PIXEL_SHADER_LUMINA_BYTES, None)?;
let mut pixel_shader_lumina = None;
device.CreatePixelShader(
shader::PIXEL_SHADER_LUMINA_BYTES,
None,
Some(&mut pixel_shader_lumina),
)?;
let pixel_shader_chrominance =
device.CreatePixelShader(shader::PIXEL_SHADER_CHROMINANCE_BYTES, None)?;
let mut pixel_shader_chrominance = None;
device.CreatePixelShader(
shader::PIXEL_SHADER_CHROMINANCE_BYTES,
None,
Some(&mut pixel_shader_chrominance),
)?;
Ok((
vertex_shader,
vertex_buffer,
pixel_shader_lumina,
pixel_shader_chrominance,
vertex_shader.unwrap(),
vertex_buffer.unwrap(),
pixel_shader_lumina.unwrap(),
pixel_shader_chrominance.unwrap(),
))
}
@@ -285,13 +315,17 @@ unsafe fn init_lumina_resources(
texture_desc.Usage = D3D11_USAGE_DEFAULT;
texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET;
let render_texture = device.CreateTexture2D(&texture_desc, None)?;
let mut render_texture = std::mem::zeroed();
device.CreateTexture2D(&texture_desc, None, Some(&mut render_texture))?;
let render_texture = render_texture.unwrap();
texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
texture_desc.Usage = D3D11_USAGE_STAGING;
texture_desc.BindFlags = D3D11_BIND_FLAG::default();
let staging_texture = device.CreateTexture2D(&texture_desc, None)?;
let mut staging_texture = std::mem::zeroed();
device.CreateTexture2D(&texture_desc, None, Some(&mut staging_texture))?;
let viewport = D3D11_VIEWPORT {
TopLeftX: 0.0,
@@ -302,9 +336,15 @@ unsafe fn init_lumina_resources(
MaxDepth: 1.0,
};
let rtv = device.CreateRenderTargetView(&render_texture, None)?;
let mut rtv = None;
device.CreateRenderTargetView(&render_texture, None, Some(&mut rtv))?;
Ok((render_texture, staging_texture, viewport, rtv))
Ok((
render_texture,
staging_texture.unwrap(),
viewport,
rtv.unwrap(),
))
}
unsafe fn init_chrominance_resources(
@@ -327,13 +367,16 @@ unsafe fn init_chrominance_resources(
texture_desc.Usage = D3D11_USAGE_DEFAULT;
texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET;
let render_texture = device.CreateTexture2D(&texture_desc, None)?;
let mut render_texture = None;
device.CreateTexture2D(&texture_desc, None, Some(&mut render_texture))?;
let render_texture = render_texture.unwrap();
texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
texture_desc.Usage = D3D11_USAGE_STAGING;
texture_desc.BindFlags = D3D11_BIND_FLAG::default();
let staging_texture = device.CreateTexture2D(&texture_desc, None)?;
let mut staging_texture = None;
device.CreateTexture2D(&texture_desc, None, Some(&mut staging_texture))?;
let viewport = D3D11_VIEWPORT {
TopLeftX: 0.0,
@@ -344,9 +387,15 @@ unsafe fn init_chrominance_resources(
MaxDepth: 1.0,
};
let rtv = device.CreateRenderTargetView(&render_texture, None)?;
let mut rtv = None;
device.CreateRenderTargetView(&render_texture, None, Some(&mut rtv))?;
Ok((render_texture, staging_texture, viewport, rtv))
Ok((
render_texture,
staging_texture.unwrap(),
viewport,
rtv.unwrap(),
))
}
unsafe fn init_backend_resources(
@@ -364,13 +413,16 @@ unsafe fn init_backend_resources(
texture_desc.Usage = D3D11_USAGE_DEFAULT;
texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
let texture = device.CreateTexture2D(&texture_desc, None)?;
let mut texture = None;
device.CreateTexture2D(&texture_desc, None, Some(&mut texture))?;
let texture = texture.unwrap();
texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
texture_desc.Usage = D3D11_USAGE_STAGING;
texture_desc.BindFlags = D3D11_BIND_FLAG::default();
let rtv = device.CreateRenderTargetView(&texture, None)?;
let mut rtv = None;
device.CreateRenderTargetView(&texture, None, Some(&mut rtv))?;
let viewport = D3D11_VIEWPORT {
TopLeftX: 0.0,
@@ -381,7 +433,7 @@ unsafe fn init_backend_resources(
MaxDepth: 1.0,
};
Ok((texture, rtv, viewport))
Ok((texture, rtv.unwrap(), viewport))
}
unsafe fn init_sampler_state(device: &ID3D11Device) -> Result<ID3D11SamplerState> {
@@ -394,9 +446,10 @@ unsafe fn init_sampler_state(device: &ID3D11Device) -> Result<ID3D11SamplerState
sampler_desc.MinLOD = 0f32;
sampler_desc.MaxLOD = D3D11_FLOAT32_MAX;
let sampler_state = device.CreateSamplerState(&sampler_desc)?;
let mut sampler_state = None;
device.CreateSamplerState(&sampler_desc, Some(&mut sampler_state))?;
Ok(sampler_state)
Ok(sampler_state.unwrap())
}
unsafe fn init_input_layout(device: &ID3D11Device) -> Result<ID3D11InputLayout> {
@@ -421,8 +474,13 @@ unsafe fn init_input_layout(device: &ID3D11Device) -> Result<ID3D11InputLayout>
},
];
let input_layout =
device.CreateInputLayout(&input_element_desc_array, shader::VERTEX_SHADER_BYTES)?;
let mut input_layout = None;
Ok(input_layout)
device.CreateInputLayout(
&input_element_desc_array,
shader::VERTEX_SHADER_BYTES,
Some(&mut input_layout),
)?;
Ok(input_layout.unwrap())
}
src/config.rs
-1
View File
@@ -30,7 +30,6 @@ pub struct EncoderConfig {
pub encoder: String,
pub pixel_format: String,
pub encoding: String,
#[serde(serialize_with = "toml::ser::tables_last")]
pub options: HashMap<String, String>,
}