diff options
author | Thibault Saunier <tsaunier@igalia.com> | 2022-10-17 20:29:35 +0300 |
---|---|---|
committer | Mathieu Duponchelle <mathieu@centricular.com> | 2022-10-18 14:18:06 +0300 |
commit | 284ca6e1ac326c3232a633b56e4b876475b51a96 (patch) | |
tree | a91e9a32c8df2d50ad1919776f6e8f4a9b4a2431 | |
parent | f4692cb1dd940e1eb15f138dbd794fc300b30812 (diff) |
Update dependencies
-rw-r--r-- | Cargo.lock | 347 | ||||
-rw-r--r-- | plugins/src/gcc/imp.rs | 22 | ||||
-rw-r--r-- | plugins/src/signaller/imp.rs | 5 | ||||
-rw-r--r-- | plugins/src/signaller/mod.rs | 2 | ||||
-rw-r--r-- | plugins/src/webrtcsink/imp.rs | 36 | ||||
-rw-r--r-- | plugins/src/webrtcsink/mod.rs | 4 |
6 files changed, 256 insertions, 160 deletions
@@ -12,19 +12,10 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "anyhow" -version = "1.0.62" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" [[package]] name = "async-attributes" @@ -78,9 +69,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab006897723d9352f63e2b13047177c3982d8d79709d713ce7747a8f19fd1b0" +checksum = "83e21f3a490c72b3b0cf44962180e60045de2925d8dff97918f7ee43c8f637c7" dependencies = [ "autocfg", "concurrent-queue", @@ -239,9 +230,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" dependencies = [ "generic-array", ] @@ -319,9 +310,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.19" +version = "3.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d43934757334b5c0519ff882e1ab9647ac0258b47c24c4f490d78e42697fd5" +checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" dependencies = [ "atty", "bitflags", @@ -357,6 +348,16 @@ dependencies = [ ] [[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] name = "concurrent-queue" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -383,21 +384,20 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -421,10 +421,54 @@ dependencies = [ ] [[package]] +name = "cxx" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "digest" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c" dependencies = [ "block-buffer", "crypto-common", @@ -468,11 +512,10 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" dependencies = [ - "matches", "percent-encoding", ] @@ -602,9 +645,21 @@ dependencies = [ ] [[package]] +name = "gio-sys" +version = "0.16.0" +source = "git+https://github.com/gtk-rs/gtk-rs-core#bc63686118d9382a5e46260ed040e2028e88321c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] name = "glib" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +source = "git+https://github.com/gtk-rs/gtk-rs-core#bc63686118d9382a5e46260ed040e2028e88321c" dependencies = [ "bitflags", "futures-channel", @@ -612,6 +667,7 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", + "gio-sys", "glib-macros", "glib-sys", "gobject-sys", @@ -624,7 +680,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +source = "git+https://github.com/gtk-rs/gtk-rs-core#bc63686118d9382a5e46260ed040e2028e88321c" dependencies = [ "anyhow", "heck", @@ -638,7 +694,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +source = "git+https://github.com/gtk-rs/gtk-rs-core#bc63686118d9382a5e46260ed040e2028e88321c" dependencies = [ "libc", "system-deps", @@ -659,7 +715,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#61a082e6fb3cb50af8c936dc8858b7a67db4ac9a" +source = "git+https://github.com/gtk-rs/gtk-rs-core#bc63686118d9382a5e46260ed040e2028e88321c" dependencies = [ "glib-sys", "libc", @@ -678,7 +734,7 @@ dependencies = [ [[package]] name = "gstreamer" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "bitflags", "cfg-if", @@ -703,7 +759,7 @@ dependencies = [ [[package]] name = "gstreamer-app" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "bitflags", "futures-core", @@ -719,7 +775,7 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -731,7 +787,7 @@ dependencies = [ [[package]] name = "gstreamer-base" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "atomic_refcell", "bitflags", @@ -745,7 +801,7 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gobject-sys", @@ -757,7 +813,7 @@ dependencies = [ [[package]] name = "gstreamer-rtp" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "bitflags", "glib", @@ -770,7 +826,7 @@ dependencies = [ [[package]] name = "gstreamer-rtp-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -782,7 +838,7 @@ dependencies = [ [[package]] name = "gstreamer-sdp" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib", "gstreamer", @@ -792,7 +848,7 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gstreamer-sys", @@ -803,7 +859,7 @@ dependencies = [ [[package]] name = "gstreamer-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gobject-sys", @@ -814,7 +870,7 @@ dependencies = [ [[package]] name = "gstreamer-utils" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "gstreamer", "gstreamer-app", @@ -826,7 +882,7 @@ dependencies = [ [[package]] name = "gstreamer-video" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "bitflags", "cfg-if", @@ -843,7 +899,7 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gobject-sys", @@ -856,7 +912,7 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib", "gstreamer", @@ -868,7 +924,7 @@ dependencies = [ [[package]] name = "gstreamer-webrtc-sys" version = "0.19.0" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#92c6eefadd3d530b0ba6fdde2be487495e8c3bd7" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#7721030c15c9692bae262e2d5a4e696a743ec96e" dependencies = [ "glib-sys", "gstreamer-sdp-sys", @@ -923,25 +979,34 @@ checksum = "88a0d4dc39ec942e44c1c306aa196da67f2bd6a30dc7b4a475465c13ccf28817" [[package]] name = "iana-time-zone" -version = "0.1.47" +version = "0.1.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" +checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" dependencies = [ "android_system_properties", "core-foundation-sys", + "iana-time-zone-haiku", "js-sys", - "once_cell", "wasm-bindgen", "winapi", ] [[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -967,15 +1032,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "js-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" dependencies = [ "wasm-bindgen", ] @@ -997,9 +1062,18 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.132" +version = "0.2.135" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" + +[[package]] +name = "link-cplusplus" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +dependencies = [ + "cc", +] [[package]] name = "log" @@ -1021,12 +1095,6 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1057,6 +1125,16 @@ dependencies = [ ] [[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1089,15 +1167,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" [[package]] name = "openssl" -version = "0.10.41" +version = "0.10.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" dependencies = [ "bitflags", "cfg-if", @@ -1127,9 +1205,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.75" +version = "0.9.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" dependencies = [ "autocfg", "cc", @@ -1154,6 +1232,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" [[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] name = "parking" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1161,15 +1245,15 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" [[package]] name = "paste" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "pin-project-lite" @@ -1252,9 +1336,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" dependencies = [ "unicode-ident", ] @@ -1291,9 +1375,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] @@ -1357,6 +1441,12 @@ dependencies = [ ] [[package]] +name = "scratch" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" + +[[package]] name = "security-framework" version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1381,9 +1471,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" dependencies = [ "serde_derive", ] @@ -1399,9 +1489,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" dependencies = [ "proc-macro2", "quote", @@ -1410,9 +1500,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074" dependencies = [ "itoa", "ryu", @@ -1469,15 +1559,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -1491,9 +1581,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" dependencies = [ "proc-macro2", "quote", @@ -1549,24 +1639,24 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" dependencies = [ "proc-macro2", "quote", @@ -1608,9 +1698,9 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -1621,9 +1711,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", @@ -1632,9 +1722,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", "valuable", @@ -1653,12 +1743,12 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" dependencies = [ - "ansi_term", "matchers", + "nu-ansi-term", "once_cell", "regex", "sharded-slab", @@ -1703,28 +1793,33 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] name = "url" -version = "2.2.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] @@ -1791,9 +1886,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1801,9 +1896,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" dependencies = [ "bumpalo", "log", @@ -1816,9 +1911,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ "cfg-if", "js-sys", @@ -1828,9 +1923,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1838,9 +1933,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", @@ -1851,15 +1946,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.82" +version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "web-sys" -version = "0.3.59" +version = "0.3.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/plugins/src/gcc/imp.rs b/plugins/src/gcc/imp.rs index 4ea528b9..72fe8426 100644 --- a/plugins/src/gcc/imp.rs +++ b/plugins/src/gcc/imp.rs @@ -1148,7 +1148,7 @@ impl ObjectSubclass for BandwidthEstimator { BandwidthEstimator::catch_panic_pad_function( parent, || Err(gst::FlowError::Error), - |this, _element| { + |this| { let mut state = this.state.lock().unwrap(); let mutbuf = buffer.make_mut(); mutbuf.set_pts(None); @@ -1168,7 +1168,9 @@ impl ObjectSubclass for BandwidthEstimator { BandwidthEstimator::catch_panic_pad_function( parent, || false, - |this, bwe| { + |this| { + let bwe = this.instance(); + if let Some(structure) = event.structure() { if structure.name() == "RTPTWCCPackets" { let varray = structure.get::<glib::ValueArray>("packets").unwrap(); @@ -1183,8 +1185,8 @@ impl ObjectSubclass for BandwidthEstimator { let mut state = this.state.lock().unwrap(); state.detector.update(&mut packets); - if !state.delay_control(bwe) { - state.loss_control(bwe) + if !state.delay_control(&bwe) { + state.loss_control(&bwe) } else { true } @@ -1196,7 +1198,7 @@ impl ObjectSubclass for BandwidthEstimator { } } - pad.event_default(Some(bwe), event) + gst::Pad::event_default(pad, parent, event) }, ) }) @@ -1209,7 +1211,7 @@ impl ObjectSubclass for BandwidthEstimator { "Panic activating src pad with mode" )) }, - |this, bwe| this.src_activatemode(pad, bwe, mode, active), + |this| this.src_activatemode(pad, &this.instance(), mode, active), ) }) .flags(gst::PadFlags::PROXY_CAPS | gst::PadFlags::PROXY_ALLOCATION) @@ -1224,9 +1226,10 @@ impl ObjectSubclass for BandwidthEstimator { } impl ObjectImpl for BandwidthEstimator { - fn constructed(&self, obj: &Self::Type) { - self.parent_constructed(obj); + fn constructed(&self) { + self.parent_constructed(); + let obj = self.instance(); obj.add_pad(&self.sinkpad).unwrap(); obj.add_pad(&self.srcpad).unwrap(); } @@ -1277,7 +1280,6 @@ impl ObjectImpl for BandwidthEstimator { fn set_property( &self, - _obj: &Self::Type, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec, @@ -1302,7 +1304,7 @@ impl ObjectImpl for BandwidthEstimator { } } - fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "min-bitrate" => { let state = self.state.lock().unwrap(); diff --git a/plugins/src/signaller/imp.rs b/plugins/src/signaller/imp.rs index e7152517..74415c4b 100644 --- a/plugins/src/signaller/imp.rs +++ b/plugins/src/signaller/imp.rs @@ -246,7 +246,7 @@ impl Signaller { } pub fn start(&self, element: &WebRTCSink) { - let this = self.instance(); + let this = self.instance().clone(); let element_clone = element.clone(); task::spawn(async move { let this = Self::from_instance(&this); @@ -392,7 +392,6 @@ impl ObjectImpl for Signaller { fn set_property( &self, - _obj: &Self::Type, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec, @@ -419,7 +418,7 @@ impl ObjectImpl for Signaller { } } - fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "address" => self.settings.lock().unwrap().address.to_value(), "cafile" => { diff --git a/plugins/src/signaller/mod.rs b/plugins/src/signaller/mod.rs index 2959a24a..51374254 100644 --- a/plugins/src/signaller/mod.rs +++ b/plugins/src/signaller/mod.rs @@ -57,6 +57,6 @@ impl Signallable for Signaller { impl Default for Signaller { fn default() -> Self { - glib::Object::new(&[]).unwrap() + glib::Object::new::<Self>(&[]) } } diff --git a/plugins/src/webrtcsink/imp.rs b/plugins/src/webrtcsink/imp.rs index fc33014d..07f773a6 100644 --- a/plugins/src/webrtcsink/imp.rs +++ b/plugins/src/webrtcsink/imp.rs @@ -1162,7 +1162,7 @@ impl WebRTCSink { payload: pt, }) } else { - gst::warning!(CAT, obj: &self.instance(), + gst::warning!(CAT, imp: self, "Too many formats for available payload type range, ignoring {}", s); None @@ -2300,10 +2300,10 @@ impl WebRTCSink { }); } - pad.event_default(Some(element), event) + gst::Pad::event_default(pad, Some(element), event) } } - _ => pad.event_default(Some(element), event), + _ => gst::Pad::event_default(pad, Some(element), event), } } } @@ -2426,7 +2426,6 @@ impl ObjectImpl for WebRTCSink { fn set_property( &self, - _obj: &Self::Type, _id: usize, value: &glib::Value, pspec: &glib::ParamSpec, @@ -2499,7 +2498,7 @@ impl ObjectImpl for WebRTCSink { } } - fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { + fn property(&self, _id: usize, pspec: &glib::ParamSpec) -> glib::Value { match pspec.name() { "video-caps" => { let settings = self.settings.lock().unwrap(); @@ -2648,9 +2647,10 @@ impl ObjectImpl for WebRTCSink { SIGNALS.as_ref() } - fn constructed(&self, obj: &Self::Type) { - self.parent_constructed(obj); + fn constructed(&self) { + self.parent_constructed(); + let obj = self.instance(); obj.set_suppressed_flags(gst::ElementFlags::SINK | gst::ElementFlags::SOURCE); obj.set_element_flags(gst::ElementFlags::SINK); } @@ -2714,11 +2714,11 @@ impl ElementImpl for WebRTCSink { fn request_new_pad( &self, - element: &Self::Type, templ: &gst::PadTemplate, _name: Option<String>, _caps: Option<&gst::Caps>, ) -> Option<gst::Pad> { + let element = self.instance(); if element.current_state() > gst::State::Ready { gst::error!(CAT, "element pads can only be requested before starting"); return None; @@ -2741,7 +2741,7 @@ impl ElementImpl for WebRTCSink { WebRTCSink::catch_panic_pad_function( parent, || false, - |sink, element| sink.sink_event(pad.upcast_ref(), element, event), + |this| this.sink_event(pad.upcast_ref(), &*this.instance(), event), ) }) .build(); @@ -2766,11 +2766,11 @@ impl ElementImpl for WebRTCSink { fn change_state( &self, - element: &Self::Type, transition: gst::StateChange, ) -> Result<gst::StateChangeSuccess, gst::StateChangeError> { + let element = self.instance(); if let gst::StateChange::ReadyToPaused = transition { - if let Err(err) = self.prepare(element) { + if let Err(err) = self.prepare(&*element) { gst::element_error!( element, gst::StreamError::Failed, @@ -2780,11 +2780,11 @@ impl ElementImpl for WebRTCSink { } } - let mut ret = self.parent_change_state(element, transition); + let mut ret = self.parent_change_state(transition); match transition { gst::StateChange::PausedToReady => { - if let Err(err) = self.unprepare(element) { + if let Err(err) = self.unprepare(&*element) { gst::element_error!( element, gst::StreamError::Failed, @@ -2798,7 +2798,7 @@ impl ElementImpl for WebRTCSink { } gst::StateChange::PausedToPlaying => { let mut state = self.state.lock().unwrap(); - state.maybe_start_signaller(element); + state.maybe_start_signaller(&*element); } _ => (), } @@ -2810,15 +2810,15 @@ impl ElementImpl for WebRTCSink { impl BinImpl for WebRTCSink {} impl ChildProxyImpl for WebRTCSink { - fn child_by_index(&self, _object: &Self::Type, _index: u32) -> Option<glib::Object> { + fn child_by_index(&self, _index: u32) -> Option<glib::Object> { None } - fn children_count(&self, _object: &Self::Type) -> u32 { + fn children_count(&self) -> u32 { 0 } - fn child_by_name(&self, _object: &Self::Type, name: &str) -> Option<glib::Object> { + fn child_by_name(&self, name: &str) -> Option<glib::Object> { match name { "signaller" => Some( self.state @@ -2835,7 +2835,7 @@ impl ChildProxyImpl for WebRTCSink { } impl NavigationImpl for WebRTCSink { - fn send_event(&self, _imp: &Self::Type, event_def: gst::Structure) { + fn send_event(&self, event_def: gst::Structure) { let mut state = self.state.lock().unwrap(); let event = gst::event::Navigation::new(event_def); diff --git a/plugins/src/webrtcsink/mod.rs b/plugins/src/webrtcsink/mod.rs index da124e13..9d6913c9 100644 --- a/plugins/src/webrtcsink/mod.rs +++ b/plugins/src/webrtcsink/mod.rs @@ -73,13 +73,13 @@ impl<T: AsRef<glib::Object> + Signallable> SignallableObject for T {} impl Default for WebRTCSink { fn default() -> Self { - glib::Object::new(&[]).unwrap() + glib::Object::new::<Self>(&[]) } } impl WebRTCSink { pub fn with_signaller(signaller: Box<dyn SignallableObject>) -> Self { - let ret: WebRTCSink = glib::Object::new(&[]).unwrap(); + let ret: WebRTCSink = glib::Object::new(&[]); let ws = imp::WebRTCSink::from_instance(&ret); |