From ad2c84124b399217362af1851f96cc1a6afb7724 Mon Sep 17 00:00:00 2001 From: David Chen Date: Mon, 27 Oct 2025 22:44:58 -0700 Subject: [PATCH 01/19] wip --- Cargo.lock | 506 ++++++++++++++++++++++--- Cargo.toml | 1 + examples/local_video/Cargo.toml | 38 ++ examples/local_video/README.md | 22 ++ examples/local_video/src/publisher.rs | 200 ++++++++++ examples/local_video/src/subscriber.rs | 168 ++++++++ livekit-protocol/protocol | 2 +- 7 files changed, 883 insertions(+), 54 deletions(-) create mode 100644 examples/local_video/Cargo.toml create mode 100644 examples/local_video/README.md create mode 100644 examples/local_video/src/publisher.rs create mode 100644 examples/local_video/src/subscriber.rs diff --git a/Cargo.lock b/Cargo.lock index 940ee82c0..dc18295c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,7 +49,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "cipher", "cpufeatures", ] @@ -72,7 +72,7 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "getrandom 0.3.4", "once_cell", "serde", @@ -97,7 +97,7 @@ checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43" dependencies = [ "alsa-sys", "bitflags 2.9.4", - "cfg-if", + "cfg-if 1.0.3", "libc", ] @@ -335,7 +335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc" dependencies = [ "autocfg", - "cfg-if", + "cfg-if 1.0.3", "concurrent-queue", "futures-io", "futures-lite 2.6.1", @@ -491,12 +491,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 1.0.3", "libc", "miniz_oxide", "object", "rustc-demangle", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -539,6 +539,29 @@ dependencies = [ "tokio", ] +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.106", + "which", +] + [[package]] name = "bindgen" version = "0.72.1" @@ -776,6 +799,12 @@ dependencies = [ "nom", ] +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.3" @@ -798,7 +827,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -871,6 +900,34 @@ dependencies = [ "error-code", ] +[[package]] +name = "cocoa" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c49e86fc36d5704151f5996b7b3795385f50ce09e3be0f47a0cfde869681cf8" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-foundation 0.7.0", + "core-graphics 0.19.2", + "foreign-types 0.3.2", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" +dependencies = [ + "bitflags 2.9.4", + "block", + "core-foundation 0.10.1", + "core-graphics-types 0.2.0", + "objc", +] + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -975,13 +1032,23 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys 0.7.0", + "libc", +] + [[package]] name = "core-foundation" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.7", "libc", ] @@ -991,16 +1058,34 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.7", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + [[package]] name = "core-foundation-sys" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core-graphics" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" +dependencies = [ + "bitflags 1.3.2", + "core-foundation 0.7.0", + "foreign-types 0.3.2", + "libc", +] + [[package]] name = "core-graphics" version = "0.23.2" @@ -1009,7 +1094,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", "core-foundation 0.9.4", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types 0.5.0", "libc", ] @@ -1025,6 +1110,42 @@ dependencies = [ "libc", ] +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.9.4", + "core-foundation 0.10.1", + "libc", +] + +[[package]] +name = "core-media-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "273bf3fc5bf51fd06a7766a84788c1540b6527130a0bce39e00567d6ab9f31f1" +dependencies = [ + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "libc", +] + +[[package]] +name = "core-video-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" +dependencies = [ + "cfg-if 0.1.10", + "core-foundation-sys 0.7.0", + "core-graphics 0.19.2", + "libc", + "metal 0.18.0", + "objc", +] + [[package]] name = "coreaudio-rs" version = "0.11.3" @@ -1032,7 +1153,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" dependencies = [ "bitflags 1.3.2", - "core-foundation-sys", + "core-foundation-sys 0.8.7", "coreaudio-sys", ] @@ -1042,7 +1163,7 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6" dependencies = [ - "bindgen", + "bindgen 0.72.1", ] [[package]] @@ -1052,7 +1173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", - "core-foundation-sys", + "core-foundation-sys 0.8.7", "coreaudio-rs", "dasp_sample", "jni", @@ -1083,7 +1204,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", ] [[package]] @@ -1276,7 +1397,7 @@ version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "hashbrown 0.14.5", "lock_api", "once_cell", @@ -1500,7 +1621,7 @@ version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", ] [[package]] @@ -1723,6 +1844,18 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "spin", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1957,7 +2090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ "rustix 1.1.2", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -1966,7 +2099,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "js-sys", "libc", "wasi", @@ -1979,7 +2112,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "js-sys", "libc", "r-efi", @@ -2129,7 +2262,7 @@ version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "crunchy", "num-traits", "zerocopy", @@ -2419,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb" dependencies = [ "android_system_properties", - "core-foundation-sys", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "log", @@ -2623,7 +2756,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", ] [[package]] @@ -2770,7 +2903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if", + "cfg-if 1.0.3", "combine", "jni-sys", "log", @@ -2859,6 +2992,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + [[package]] name = "lebe" version = "0.5.3" @@ -2877,8 +3016,8 @@ version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55" dependencies = [ - "cfg-if", - "windows-link", + "cfg-if 1.0.3", + "windows-link 0.2.1", ] [[package]] @@ -3094,6 +3233,31 @@ dependencies = [ "tokio", ] +[[package]] +name = "local_video" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "eframe", + "egui", + "egui-wgpu", + "env_logger 0.10.2", + "futures", + "image 0.24.9", + "libwebrtc", + "livekit", + "livekit-api", + "log", + "nokhwa", + "objc2 0.6.3", + "parking_lot", + "tokio", + "webrtc-sys", + "wgpu 25.0.2", + "winit", +] + [[package]] name = "lock_api" version = "0.4.14" @@ -3166,6 +3330,21 @@ dependencies = [ "libc", ] +[[package]] +name = "metal" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e198a0ee42bdbe9ef2c09d0b9426f3b2b47d90d93a4a9b0395c4cea605e92dc0" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa", + "core-graphics 0.19.2", + "foreign-types 0.3.2", + "log", + "objc", +] + [[package]] name = "metal" version = "0.31.0" @@ -3174,7 +3353,7 @@ checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" dependencies = [ "bitflags 2.9.4", "block", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types 0.5.0", "log", "objc", @@ -3290,6 +3469,15 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom 0.2.16", +] + [[package]] name = "native-tls" version = "0.2.14" @@ -3366,6 +3554,72 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +[[package]] +name = "nokhwa" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c35ed9613f002f8095aafc97ad839e0bb6cebf79111c68265d8df212a5a294" +dependencies = [ + "flume", + "image 0.25.8", + "nokhwa-bindings-linux", + "nokhwa-bindings-macos", + "nokhwa-bindings-windows", + "nokhwa-core", + "parking_lot", + "paste", + "thiserror 2.0.17", +] + +[[package]] +name = "nokhwa-bindings-linux" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9201817bb00fa911c0aaf5ae7653b2f7a81a0492d119753ac85b74c2c5f177f" +dependencies = [ + "nokhwa-core", + "v4l", +] + +[[package]] +name = "nokhwa-bindings-macos" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de78eb4a2d47a68f490899aa0516070d7a972f853ec2bb374ab53be0bd39b60f" +dependencies = [ + "block", + "cocoa-foundation", + "core-foundation 0.10.1", + "core-media-sys", + "core-video-sys", + "flume", + "nokhwa-core", + "objc", + "once_cell", +] + +[[package]] +name = "nokhwa-bindings-windows" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2597245a984c92a9f2bcb239d85bbc62b34f8b277c2648f51f5c78b84b38da46" +dependencies = [ + "nokhwa-core", + "once_cell", + "windows 0.61.3", +] + +[[package]] +name = "nokhwa-core" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "903f3e0f406f7e9aad4fa0566c1d97cc7f88aab57847e1f919d1a34812dedee3" +dependencies = [ + "bytes", + "image 0.25.8", + "thiserror 2.0.17", +] + [[package]] name = "nom" version = "7.1.3" @@ -3441,6 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -3713,6 +3968,15 @@ dependencies = [ "objc2-foundation 0.2.2", ] +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + [[package]] name = "object" version = "0.37.3" @@ -3764,7 +4028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" dependencies = [ "bitflags 2.9.4", - "cfg-if", + "cfg-if 1.0.3", "foreign-types 0.3.2", "libc", "once_cell", @@ -3861,12 +4125,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "backtrace", - "cfg-if", + "cfg-if 1.0.3", "libc", "petgraph 0.6.5", "redox_syscall 0.5.18", "smallvec", - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -3935,6 +4199,12 @@ dependencies = [ "sha2", ] +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + [[package]] name = "percent-encoding" version = "2.3.2" @@ -4055,7 +4325,7 @@ checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if", + "cfg-if 1.0.3", "concurrent-queue", "libc", "log", @@ -4069,7 +4339,7 @@ version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "concurrent-queue", "hermit-abi", "pin-project-lite", @@ -4597,7 +4867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", - "cfg-if", + "cfg-if 1.0.3", "getrandom 0.2.16", "libc", "untrusted", @@ -4852,7 +5122,7 @@ checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.9.4", "core-foundation 0.9.4", - "core-foundation-sys", + "core-foundation-sys 0.8.7", "libc", "security-framework-sys", ] @@ -4865,7 +5135,7 @@ checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ "bitflags 2.9.4", "core-foundation 0.10.1", - "core-foundation-sys", + "core-foundation-sys 0.8.7", "libc", "security-framework-sys", ] @@ -4876,7 +5146,7 @@ version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.7", "libc", ] @@ -4960,7 +5230,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "cpufeatures", "digest", ] @@ -4971,7 +5241,7 @@ version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "cpufeatures", "digest", ] @@ -5111,6 +5381,15 @@ dependencies = [ "hound", ] +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" @@ -5316,7 +5595,7 @@ version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", ] [[package]] @@ -5372,7 +5651,7 @@ dependencies = [ "arrayref", "arrayvec", "bytemuck", - "cfg-if", + "cfg-if 1.0.3", "log", "tiny-skia-path", ] @@ -5853,6 +6132,26 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "v4l" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fbfea44a46799d62c55323f3c55d06df722fbe577851d848d328a1041c3403" +dependencies = [ + "bitflags 1.3.2", + "libc", + "v4l2-sys-mit", +] + +[[package]] +name = "v4l2-sys-mit" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6779878362b9bacadc7893eac76abe69612e8837ef746573c4a5239daf11990b" +dependencies = [ + "bindgen 0.65.1", +] + [[package]] name = "valuable" version = "0.1.1" @@ -5923,7 +6222,7 @@ version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -5950,7 +6249,7 @@ version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ - "cfg-if", + "cfg-if 1.0.3", "js-sys", "once_cell", "wasm-bindgen", @@ -6341,7 +6640,7 @@ dependencies = [ "block", "bytemuck", "cfg_aliases", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -6351,7 +6650,7 @@ dependencies = [ "libc", "libloading", "log", - "metal", + "metal 0.31.0", "naga 24.0.0", "ndk-sys 0.5.0+25.2.9519653", "objc", @@ -6383,9 +6682,9 @@ dependencies = [ "bitflags 2.9.4", "block", "bytemuck", - "cfg-if", + "cfg-if 1.0.3", "cfg_aliases", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "glutin_wgl_sys", "gpu-alloc", @@ -6397,7 +6696,7 @@ dependencies = [ "libc", "libloading", "log", - "metal", + "metal 0.31.0", "naga 25.0.1", "ndk-sys 0.5.0+25.2.9519653", "objc", @@ -6465,6 +6764,18 @@ dependencies = [ "winit", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.44", +] + [[package]] name = "winapi" version = "0.3.9" @@ -6516,6 +6827,28 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.61.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" +dependencies = [ + "windows-collections", + "windows-core 0.61.2", + "windows-future", + "windows-link 0.1.3", + "windows-numerics", +] + +[[package]] +name = "windows-collections" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8" +dependencies = [ + "windows-core 0.61.2", +] + [[package]] name = "windows-core" version = "0.54.0" @@ -6539,6 +6872,19 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement 0.60.2", + "windows-interface 0.59.3", + "windows-link 0.1.3", + "windows-result 0.3.4", + "windows-strings 0.4.2", +] + [[package]] name = "windows-core" version = "0.62.2" @@ -6547,11 +6893,22 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ "windows-implement 0.60.2", "windows-interface 0.59.3", - "windows-link", + "windows-link 0.2.1", "windows-result 0.4.1", "windows-strings 0.5.1", ] +[[package]] +name = "windows-future" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", + "windows-threading", +] + [[package]] name = "windows-implement" version = "0.58.0" @@ -6596,12 +6953,28 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "windows-link" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-numerics" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1" +dependencies = [ + "windows-core 0.61.2", + "windows-link 0.1.3", +] + [[package]] name = "windows-result" version = "0.1.2" @@ -6620,13 +6993,22 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-result" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -6639,13 +7021,22 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows-strings" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -6699,7 +7090,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link", + "windows-link 0.2.1", ] [[package]] @@ -6754,7 +7145,7 @@ version = "0.53.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" dependencies = [ - "windows-link", + "windows-link 0.2.1", "windows_aarch64_gnullvm 0.53.1", "windows_aarch64_msvc 0.53.1", "windows_i686_gnu 0.53.1", @@ -6765,6 +7156,15 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows-threading" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6" +dependencies = [ + "windows-link 0.1.3", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -6961,7 +7361,7 @@ dependencies = [ "cfg_aliases", "concurrent-queue", "core-foundation 0.9.4", - "core-graphics", + "core-graphics 0.23.2", "cursor-icon", "dpi", "js-sys", @@ -7109,7 +7509,7 @@ dependencies = [ name = "yuv-sys" version = "0.3.10" dependencies = [ - "bindgen", + "bindgen 0.72.1", "cc", "rayon", "regex", diff --git a/Cargo.toml b/Cargo.toml index 03f91301f..76fab7509 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,7 @@ members = [ "examples/basic_text_stream", "examples/encrypted_text_stream", "examples/local_audio", + "examples/local_video", "examples/mobile", "examples/play_from_disk", "examples/rpc", diff --git a/examples/local_video/Cargo.toml b/examples/local_video/Cargo.toml new file mode 100644 index 000000000..382e9744e --- /dev/null +++ b/examples/local_video/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "local_video" +version = "0.1.0" +edition = "2021" +publish = false + +[[bin]] +name = "publisher" +path = "src/publisher.rs" + +[[bin]] +name = "subscriber" +path = "src/subscriber.rs" + +[dependencies] +tokio = { version = "1", features = ["full", "parking_lot"] } +livekit = { workspace = true, features = ["rustls-tls-native-roots"] } +webrtc-sys = { workspace = true } +libwebrtc = { workspace = true } +livekit-api = { workspace = true } +futures = "0.3" +clap = { version = "4.5", features = ["derive"] } +log = "0.4" +env_logger = "0.10.0" +nokhwa = { version = "0.10", default-features = false, features = ["input-avfoundation", "input-v4l", "input-msmf", "output-threaded"] } +image = "0.24" +egui = "0.31.1" +egui-wgpu = "0.31.1" +eframe = { version = "0.31.1", default-features = false, features = ["default_fonts", "wgpu", "persistence"] } +wgpu = "25.0" +winit = { version = "0.30.11", features = ["android-native-activity"] } +parking_lot = { version = "0.12.1", features = ["deadlock_detection"] } +anyhow = "1" + +[target.'cfg(target_os = "macos")'.dependencies] +objc2 = { version = "0.6.0", features = ["relax-sign-encoding"] } + + diff --git a/examples/local_video/README.md b/examples/local_video/README.md new file mode 100644 index 000000000..5e3588fb9 --- /dev/null +++ b/examples/local_video/README.md @@ -0,0 +1,22 @@ +# local_video + +Two examples demonstrating capturing frames from a local camera video and publishing to LiveKit, and subscribing to render video in a window. + +- publisher: capture from a selected camera and publish a video track +- subscriber: connect to a room, subscribe to video tracks, and display in a window + +Environment variables required for both: +- LIVEKIT_URL +- LIVEKIT_API_KEY +- LIVEKIT_API_SECRET + +Publisher usage: +``` + cargo run -p local_video --bin publisher -- --list-cameras + cargo run -p local_video --bin publisher -- --camera-index 0 --room-name demo --identity cam-1 +``` + +Subscriber usage: +``` + cargo run -p local_video --bin subscriber -- --room-name demo --identity viewer-1 +``` diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs new file mode 100644 index 000000000..11936e3eb --- /dev/null +++ b/examples/local_video/src/publisher.rs @@ -0,0 +1,200 @@ +use anyhow::Result; +use clap::Parser; +use livekit::webrtc::native::yuv_helper; +use livekit::options::{TrackPublishOptions, VideoCodec}; +use livekit::prelude::*; +use livekit::webrtc::video_frame::{I420Buffer, VideoFrame, VideoRotation}; +use livekit::webrtc::video_source::native::NativeVideoSource; +use livekit::webrtc::video_source::{RtcVideoSource, VideoResolution}; +use livekit_api::access_token; +use log::{error, info, warn}; +use nokhwa::pixel_format::RgbFormat; +use nokhwa::utils::{ApiBackend, CameraFormat, CameraIndex, FrameFormat, RequestedFormat, RequestedFormatType, Resolution}; +use nokhwa::Camera; +use std::env; +use std::time::{Duration, Instant}; + +#[derive(Parser, Debug)] +#[command(author, version, about, long_about = None)] +struct Args { + /// List available cameras and exit + #[arg(long)] + list_cameras: bool, + + /// Camera index to use (numeric) + #[arg(long, default_value_t = 0)] + camera_index: usize, + + /// Desired width + #[arg(long, default_value_t = 1280)] + width: u32, + + /// Desired height + #[arg(long, default_value_t = 720)] + height: u32, + + /// Desired framerate + #[arg(long, default_value_t = 30)] + fps: u32, + + /// LiveKit participant identity + #[arg(long, default_value = "rust-camera-pub")] + identity: String, + + /// LiveKit room name + #[arg(long, default_value = "video-room")] + room_name: String, + + /// LiveKit server URL + #[arg(long)] + url: Option, + + /// LiveKit API key + #[arg(long)] + api_key: Option, + + /// LiveKit API secret + #[arg(long)] + api_secret: Option, +} + +fn list_cameras() -> Result<()> { + let cams = nokhwa::query(ApiBackend::Auto)?; + println!("Available cameras:"); + for (i, cam) in cams.iter().enumerate() { + println!("{}. {}", i, cam.human_name()); + } + Ok(()) +} + +#[tokio::main] +async fn main() -> Result<()> { + env_logger::init(); + let args = Args::parse(); + + if args.list_cameras { + return list_cameras(); + } + + // LiveKit connection details + let url = args.url.or_else(|| env::var("LIVEKIT_URL").ok()).expect( + "LIVEKIT_URL must be provided via --url or env", + ); + let api_key = args + .api_key + .or_else(|| env::var("LIVEKIT_API_KEY").ok()) + .expect("LIVEKIT_API_KEY must be provided via --api-key or env"); + let api_secret = args + .api_secret + .or_else(|| env::var("LIVEKIT_API_SECRET").ok()) + .expect("LIVEKIT_API_SECRET must be provided via --api-secret or env"); + + let token = access_token::AccessToken::with_api_key(&api_key, &api_secret) + .with_identity(&args.identity) + .with_name(&args.identity) + .with_grants(access_token::VideoGrants { + room_join: true, + room: args.room_name.clone(), + can_publish: true, + ..Default::default() + }) + .to_jwt()?; + + info!("Connecting to LiveKit room '{}' as '{}'...", args.room_name, args.identity); + let mut room_options = RoomOptions::default(); + room_options.auto_subscribe = true; + let (room, _) = Room::connect(&url, &token, room_options).await?; + let room = std::sync::Arc::new(room); + info!("Connected: {} - {}", room.name(), room.sid().await); + + // Setup camera + let index = CameraIndex::Index(args.camera_index as u32); + let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); + let mut camera = Camera::new(index, requested)?; + // Try to honor requested size/fps if supported + let _ = camera.set_camera_format(CameraFormat::new( + Resolution::new(args.width, args.height), + FrameFormat::MJPEG, + args.fps, + )); + camera.open_stream()?; + let fmt = camera.camera_format(); + let width = fmt.width(); + let height = fmt.height(); + let fps = fmt.frame_rate(); + info!("Camera opened: {}x{} @ {} fps", width, height, fps); + + // Create LiveKit video source and track + let rtc_source = NativeVideoSource::new(VideoResolution { width, height }); + let track = LocalVideoTrack::create_video_track( + "camera", + RtcVideoSource::Native(rtc_source.clone()), + ); + + room + .local_participant() + .publish_track( + LocalTrack::Video(track.clone()), + TrackPublishOptions { + source: TrackSource::Camera, + simulcast: true, + video_codec: VideoCodec::H264, + ..Default::default() + }, + ) + .await?; + info!("Published camera track"); + + // Reusable I420 buffer and frame + let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; + + // Capture loop + let mut last = Instant::now(); + loop { + // Get frame as RGB + let frame_buf = camera.frame()?; + let rgb = frame_buf.decode_image::()?; + let rgba_stride = (width * 4) as u32; + + // Convert RGB to ABGR in-place buffer (expand to 4 channels) + // Build a temporary ABGR buffer + let mut abgr = vec![0u8; (width * height * 4) as usize]; + for (i, chunk) in rgb.as_raw().chunks_exact(3).enumerate() { + let r = chunk[0]; + let g = chunk[1]; + let b = chunk[2]; + let o = i * 4; + // ABGR layout + abgr[o] = 255; + abgr[o + 1] = b; + abgr[o + 2] = g; + abgr[o + 3] = r; + } + + // Fill i420 buffer + let (stride_y, stride_u, stride_v) = frame.buffer.strides(); + let (data_y, data_u, data_v) = frame.buffer.data_mut(); + yuv_helper::abgr_to_i420( + &abgr, + rgba_stride, + data_y, + stride_y, + data_u, + stride_u, + data_v, + stride_v, + width as i32, + height as i32, + ); + + rtc_source.capture_frame(&frame); + + // Simple pacing + let elapsed = last.elapsed(); + let target = Duration::from_secs_f32(1.0 / fps as f32); + if elapsed < target { tokio::time::sleep(target - elapsed).await; } + last = Instant::now(); + } +} + + diff --git a/examples/local_video/src/subscriber.rs b/examples/local_video/src/subscriber.rs new file mode 100644 index 000000000..7722ad790 --- /dev/null +++ b/examples/local_video/src/subscriber.rs @@ -0,0 +1,168 @@ +use anyhow::Result; +use clap::Parser; +use eframe::egui; +use futures::StreamExt; +use livekit::prelude::*; +use libwebrtc::prelude::VideoBuffer; +use livekit::webrtc::video_stream::native::NativeVideoStream; +use livekit_api::access_token; +use log::{debug, info}; +use parking_lot::Mutex; +use std::sync::Arc; + +#[derive(Parser, Debug)] +#[command(author, version, about, long_about = None)] +struct Args { + /// LiveKit participant identity + #[arg(long, default_value = "rust-video-subscriber")] + identity: String, + + /// LiveKit room name + #[arg(long, default_value = "video-room")] + room_name: String, + + /// LiveKit server URL + #[arg(long)] + url: Option, + + /// LiveKit API key + #[arg(long)] + api_key: Option, + + /// LiveKit API secret + #[arg(long)] + api_secret: Option, +} + +struct SharedFrame { + width: u32, + height: u32, + rgba: Vec, + dirty: bool, +} + +struct VideoApp { + shared: Arc>, + texture: Option, +} + +impl eframe::App for VideoApp { + fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { + egui::CentralPanel::default().show(ctx, |ui| { + let mut shared = self.shared.lock(); + if shared.dirty { + let size = [shared.width as usize, shared.height as usize]; + let image = egui::ColorImage::from_rgba_unmultiplied(size, &shared.rgba); + match &mut self.texture { + Some(tex) => tex.set(image, egui::TextureOptions::LINEAR), + None => { + self.texture = Some(ui.ctx().load_texture( + "remote-video", + image, + egui::TextureOptions::LINEAR, + )); + } + } + shared.dirty = false; + } + + if let Some(tex) = &self.texture { + let tex_size = tex.size_vec2(); + let available = ui.available_size(); + let scale = (available.x / tex_size.x).min(available.y / tex_size.y).max(1.0); + let desired = tex_size * scale; + ui.image((tex.id(), desired)); + } else { + ui.heading("Waiting for video..."); + } + }); + + ctx.request_repaint(); + } +} + +#[tokio::main] +async fn main() -> Result<()> { + env_logger::init(); + let args = Args::parse(); + + // LiveKit connection details + let url = std::env::var("LIVEKIT_URL").ok().or(args.url).expect( + "LIVEKIT_URL must be provided via --url or env", + ); + let api_key = std::env::var("LIVEKIT_API_KEY").ok().or(args.api_key).expect( + "LIVEKIT_API_KEY must be provided via --api-key or env", + ); + let api_secret = std::env::var("LIVEKIT_API_SECRET").ok().or(args.api_secret).expect( + "LIVEKIT_API_SECRET must be provided via --api-secret or env", + ); + + let token = access_token::AccessToken::with_api_key(&api_key, &api_secret) + .with_identity(&args.identity) + .with_name(&args.identity) + .with_grants(access_token::VideoGrants { + room_join: true, + room: args.room_name.clone(), + can_subscribe: true, + ..Default::default() + }) + .to_jwt()?; + + info!("Connecting to LiveKit room '{}' as '{}'...", args.room_name, args.identity); + let mut room_options = RoomOptions::default(); + room_options.auto_subscribe = true; + let (room, _) = Room::connect(&url, &token, room_options).await?; + let room = Arc::new(room); + info!("Connected: {} - {}", room.name(), room.sid().await); + + // Shared frame buffer for UI + let shared = Arc::new(Mutex::new(SharedFrame { width: 0, height: 0, rgba: Vec::new(), dirty: false })); + + // Subscribe to room events: on first video track, start sink task + let shared_clone = shared.clone(); + let rt = tokio::runtime::Handle::current(); + tokio::spawn(async move { + let mut events = room.subscribe(); + while let Some(evt) = events.recv().await { + if let RoomEvent::TrackSubscribed { track, .. } = evt { + if let livekit::track::RemoteTrack::Video(video_track) = track { + info!("Subscribed to video track: {}", video_track.name()); + // Start background sink thread + let shared2 = shared_clone.clone(); + std::thread::spawn(move || { + let mut sink = NativeVideoStream::new(video_track.rtc_track()); + while let Some(frame) = rt.block_on(sink.next()) { + let buffer = frame.buffer.to_i420(); + let w = buffer.width(); + let h = buffer.height(); + + let (sy, su, sv) = buffer.strides(); + let (dy, du, dv) = buffer.data(); + + let mut rgba = vec![0u8; (w * h * 4) as usize]; + libwebrtc::native::yuv_helper::i420_to_rgba( + dy, sy, du, su, dv, sv, &mut rgba, w * 4, w as i32, h as i32, + ); + + let mut s = shared2.lock(); + s.width = w; + s.height = h; + s.rgba = rgba; + s.dirty = true; + } + }); + break; + } + } + } + }); + + // Start UI + let app = VideoApp { shared, texture: None }; + let native_options = eframe::NativeOptions::default(); + eframe::run_native("LiveKit Video Subscriber", native_options, Box::new(|_| Ok::, _>(Box::new(app))))?; + + Ok(()) +} + + diff --git a/livekit-protocol/protocol b/livekit-protocol/protocol index 2bc93ddc2..e038e7944 160000 --- a/livekit-protocol/protocol +++ b/livekit-protocol/protocol @@ -1 +1 @@ -Subproject commit 2bc93ddc27ccfa66ee8d270a1bcd115586fb601d +Subproject commit e038e7944595dd9a00871ee5ed52ba6062f76c1e From 664d4b338bee4b36d43e1b085892d0e64d3b599e Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 28 Oct 2025 00:04:03 -0700 Subject: [PATCH 02/19] wip publishing from local camera --- Cargo.lock | 1 + examples/local_video/Cargo.toml | 1 + examples/local_video/README.md | 26 +++- examples/local_video/src/publisher.rs | 197 +++++++++++++++++++------ examples/local_video/src/subscriber.rs | 61 ++++++-- 5 files changed, 220 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc18295c3..8a3df9840 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3256,6 +3256,7 @@ dependencies = [ "webrtc-sys", "wgpu 25.0.2", "winit", + "yuv-sys", ] [[package]] diff --git a/examples/local_video/Cargo.toml b/examples/local_video/Cargo.toml index 382e9744e..7ded6dc99 100644 --- a/examples/local_video/Cargo.toml +++ b/examples/local_video/Cargo.toml @@ -18,6 +18,7 @@ livekit = { workspace = true, features = ["rustls-tls-native-roots"] } webrtc-sys = { workspace = true } libwebrtc = { workspace = true } livekit-api = { workspace = true } +yuv-sys = { workspace = true } futures = "0.3" clap = { version = "4.5", features = ["derive"] } log = "0.4" diff --git a/examples/local_video/README.md b/examples/local_video/README.md index 5e3588fb9..5589638c4 100644 --- a/examples/local_video/README.md +++ b/examples/local_video/README.md @@ -5,18 +5,36 @@ Two examples demonstrating capturing frames from a local camera video and publis - publisher: capture from a selected camera and publish a video track - subscriber: connect to a room, subscribe to video tracks, and display in a window -Environment variables required for both: -- LIVEKIT_URL -- LIVEKIT_API_KEY -- LIVEKIT_API_SECRET +LiveKit connection can be provided via flags or environment variables: +- `--url` or `LIVEKIT_URL` +- `--api-key` or `LIVEKIT_API_KEY` +- `--api-secret` or `LIVEKIT_API_SECRET` Publisher usage: ``` cargo run -p local_video --bin publisher -- --list-cameras cargo run -p local_video --bin publisher -- --camera-index 0 --room-name demo --identity cam-1 + + # with explicit LiveKit connection flags + cargo run -p local_video --bin publisher -- \ + --camera-index 0 \ + --room-name demo \ + --identity cam-1 \ + --url https://your.livekit.server \ + --api-key YOUR_KEY \ + --api-secret YOUR_SECRET ``` Subscriber usage: ``` + # relies on env vars LIVEKIT_URL, LIVEKIT_API_KEY, LIVEKIT_API_SECRET cargo run -p local_video --bin subscriber -- --room-name demo --identity viewer-1 + + # or pass credentials via flags + cargo run -p local_video --bin subscriber -- \ + --room-name demo \ + --identity viewer-1 \ + --url https://your.livekit.server \ + --api-key YOUR_KEY \ + --api-secret YOUR_SECRET ``` diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 11936e3eb..197ae9dc0 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -1,13 +1,13 @@ use anyhow::Result; use clap::Parser; -use livekit::webrtc::native::yuv_helper; use livekit::options::{TrackPublishOptions, VideoCodec}; use livekit::prelude::*; use livekit::webrtc::video_frame::{I420Buffer, VideoFrame, VideoRotation}; use livekit::webrtc::video_source::native::NativeVideoSource; use livekit::webrtc::video_source::{RtcVideoSource, VideoResolution}; use livekit_api::access_token; -use log::{error, info, warn}; +use log::{debug, info}; +use yuv_sys as yuv_sys; use nokhwa::pixel_format::RgbFormat; use nokhwa::utils::{ApiBackend, CameraFormat, CameraIndex, FrameFormat, RequestedFormat, RequestedFormatType, Resolution}; use nokhwa::Camera; @@ -107,22 +107,46 @@ async fn main() -> Result<()> { let room = std::sync::Arc::new(room); info!("Connected: {} - {}", room.name(), room.sid().await); + // Log room events + { + let room_clone = room.clone(); + tokio::spawn(async move { + let mut events = room_clone.subscribe(); + info!("Subscribed to room events"); + while let Some(evt) = events.recv().await { + debug!("Room event: {:?}", evt); + } + }); + } + // Setup camera let index = CameraIndex::Index(args.camera_index as u32); let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); let mut camera = Camera::new(index, requested)?; - // Try to honor requested size/fps if supported - let _ = camera.set_camera_format(CameraFormat::new( + // Try raw YUYV first (cheaper than MJPEG), fall back to MJPEG + let wanted = CameraFormat::new( Resolution::new(args.width, args.height), - FrameFormat::MJPEG, + FrameFormat::YUYV, args.fps, - )); + ); + let mut using_fmt = "YUYV"; + if let Err(_) = camera.set_camera_format(wanted) { + let alt = CameraFormat::new( + Resolution::new(args.width, args.height), + FrameFormat::MJPEG, + args.fps, + ); + using_fmt = "MJPEG"; + let _ = camera.set_camera_format(alt); + } camera.open_stream()?; let fmt = camera.camera_format(); let width = fmt.width(); let height = fmt.height(); let fps = fmt.frame_rate(); - info!("Camera opened: {}x{} @ {} fps", width, height, fps); + info!("Camera opened: {}x{} @ {} fps (format: {})", width, height, fps, using_fmt); + // Pace publishing at the requested FPS (not the camera-reported FPS) to hit desired cadence + let pace_fps = args.fps as f64; // Create LiveKit video source and track let rtc_source = NativeVideoSource::new(VideoResolution { width, height }); @@ -137,7 +161,7 @@ async fn main() -> Result<()> { LocalTrack::Video(track.clone()), TrackPublishOptions { source: TrackSource::Camera, - simulcast: true, + simulcast: false, video_codec: VideoCodec::H264, ..Default::default() }, @@ -147,53 +171,134 @@ async fn main() -> Result<()> { // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; + let is_yuyv = using_fmt == "YUYV"; + + // Accurate pacing using absolute schedule (no drift) + let mut ticker = tokio::time::interval(Duration::from_secs_f64(1.0 / pace_fps)); + ticker.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip); + // Align the first tick to now + ticker.tick().await; + let start_ts = Instant::now(); // Capture loop - let mut last = Instant::now(); + let mut frames: u64 = 0; + let mut last_fps_log = Instant::now(); + let target = Duration::from_secs_f64(1.0 / pace_fps); + info!("Target frame interval: {:.2} ms", target.as_secs_f64() * 1000.0); + + // Timing accumulators (ms) for rolling stats + let mut sum_get_ms = 0.0; + let mut sum_decode_ms = 0.0; + let mut sum_convert_ms = 0.0; + let mut sum_capture_ms = 0.0; + let mut sum_sleep_ms = 0.0; + let mut sum_iter_ms = 0.0; loop { - // Get frame as RGB - let frame_buf = camera.frame()?; - let rgb = frame_buf.decode_image::()?; - let rgba_stride = (width * 4) as u32; - - // Convert RGB to ABGR in-place buffer (expand to 4 channels) - // Build a temporary ABGR buffer - let mut abgr = vec![0u8; (width * height * 4) as usize]; - for (i, chunk) in rgb.as_raw().chunks_exact(3).enumerate() { - let r = chunk[0]; - let g = chunk[1]; - let b = chunk[2]; - let o = i * 4; - // ABGR layout - abgr[o] = 255; - abgr[o + 1] = b; - abgr[o + 2] = g; - abgr[o + 3] = r; - } + // Wait until the scheduled next frame time + let wait_start = Instant::now(); + ticker.tick().await; + let iter_start = Instant::now(); - // Fill i420 buffer + // Get frame as RGB24 (decoded by nokhwa if needed) + let t0 = Instant::now(); + let frame_buf = camera.frame()?; + let t1 = Instant::now(); let (stride_y, stride_u, stride_v) = frame.buffer.strides(); let (data_y, data_u, data_v) = frame.buffer.data_mut(); - yuv_helper::abgr_to_i420( - &abgr, - rgba_stride, - data_y, - stride_y, - data_u, - stride_u, - data_v, - stride_v, - width as i32, - height as i32, - ); + // Fast path for YUYV: convert directly to I420 via libyuv + let t2 = if is_yuyv { + let src = frame_buf.buffer(); + let src_bytes = src.as_ref(); + let src_stride = (width * 2) as i32; // YUYV packed 4:2:2 + let t2_local = t1; // no decode step in YUYV path + unsafe { + // returns 0 on success + let _ = yuv_sys::rs_YUY2ToI420( + src_bytes.as_ptr(), + src_stride, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + t2_local + } else { + // Fallback (e.g., MJPEG): decode to RGB24 then convert to I420 + let rgb = frame_buf.decode_image::()?; + let t2_local = Instant::now(); + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + rgb.as_raw().as_ptr(), + (width * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + t2_local + }; + let t3 = Instant::now(); + // Update RTP timestamp (monotonic, microseconds since start) + frame.timestamp_us = start_ts.elapsed().as_micros() as i64; rtc_source.capture_frame(&frame); + let t4 = Instant::now(); - // Simple pacing - let elapsed = last.elapsed(); - let target = Duration::from_secs_f32(1.0 / fps as f32); - if elapsed < target { tokio::time::sleep(target - elapsed).await; } - last = Instant::now(); + frames += 1; + // We already paced via interval; measure actual sleep time for logging only + let sleep_dur = (iter_start - wait_start); + + // Per-iteration timing bookkeeping + let t_end = Instant::now(); + let get_ms = (t1 - t0).as_secs_f64() * 1000.0; + let decode_ms = (t2 - t1).as_secs_f64() * 1000.0; + let convert_ms = (t3 - t2).as_secs_f64() * 1000.0; + let capture_ms = (t4 - t3).as_secs_f64() * 1000.0; + let sleep_ms = sleep_dur.as_secs_f64() * 1000.0; + let iter_ms = (t_end - iter_start).as_secs_f64() * 1000.0; + sum_get_ms += get_ms; + sum_decode_ms += decode_ms; + sum_convert_ms += convert_ms; + sum_capture_ms += capture_ms; + sum_sleep_ms += sleep_ms; + sum_iter_ms += iter_ms; + + if last_fps_log.elapsed() >= std::time::Duration::from_secs(2) { + let secs = last_fps_log.elapsed().as_secs_f64(); + let fps_est = frames as f64 / secs; + let n = frames.max(1) as f64; + info!( + "Publishing video: {}x{}, ~{:.1} fps | avg ms: get {:.2}, decode {:.2}, convert {:.2}, capture {:.2}, sleep {:.2}, iter {:.2} | target {:.2}", + width, + height, + fps_est, + sum_get_ms / n, + sum_decode_ms / n, + sum_convert_ms / n, + sum_capture_ms / n, + sum_sleep_ms / n, + sum_iter_ms / n, + target.as_secs_f64() * 1000.0, + ); + frames = 0; + sum_get_ms = 0.0; + sum_decode_ms = 0.0; + sum_convert_ms = 0.0; + sum_capture_ms = 0.0; + sum_sleep_ms = 0.0; + sum_iter_ms = 0.0; + last_fps_log = Instant::now(); + } } } diff --git a/examples/local_video/src/subscriber.rs b/examples/local_video/src/subscriber.rs index 7722ad790..14484d212 100644 --- a/examples/local_video/src/subscriber.rs +++ b/examples/local_video/src/subscriber.rs @@ -8,7 +8,7 @@ use livekit::webrtc::video_stream::native::NativeVideoStream; use livekit_api::access_token; use log::{debug, info}; use parking_lot::Mutex; -use std::sync::Arc; +use std::{env, sync::Arc, time::{Duration, Instant}}; #[derive(Parser, Debug)] #[command(author, version, about, long_about = None)] @@ -25,11 +25,11 @@ struct Args { #[arg(long)] url: Option, - /// LiveKit API key + /// LiveKit API key (can also be set via LIVEKIT_API_KEY environment variable) #[arg(long)] api_key: Option, - /// LiveKit API secret + /// LiveKit API secret (can also be set via LIVEKIT_API_SECRET environment variable) #[arg(long)] api_secret: Option, } @@ -54,8 +54,11 @@ impl eframe::App for VideoApp { let size = [shared.width as usize, shared.height as usize]; let image = egui::ColorImage::from_rgba_unmultiplied(size, &shared.rgba); match &mut self.texture { - Some(tex) => tex.set(image, egui::TextureOptions::LINEAR), + Some(tex) => { + tex.set(image, egui::TextureOptions::LINEAR) + } None => { + debug!("Creating texture for remote video: {}x{}", shared.width, shared.height); self.texture = Some(ui.ctx().load_texture( "remote-video", image, @@ -69,7 +72,7 @@ impl eframe::App for VideoApp { if let Some(tex) = &self.texture { let tex_size = tex.size_vec2(); let available = ui.available_size(); - let scale = (available.x / tex_size.x).min(available.y / tex_size.y).max(1.0); + let scale = (available.x / tex_size.x).min(available.y / tex_size.y); let desired = tex_size * scale; ui.image((tex.id(), desired)); } else { @@ -77,7 +80,7 @@ impl eframe::App for VideoApp { } }); - ctx.request_repaint(); + ctx.request_repaint_after(Duration::from_millis(16)); } } @@ -86,16 +89,19 @@ async fn main() -> Result<()> { env_logger::init(); let args = Args::parse(); - // LiveKit connection details - let url = std::env::var("LIVEKIT_URL").ok().or(args.url).expect( - "LIVEKIT_URL must be provided via --url or env", - ); - let api_key = std::env::var("LIVEKIT_API_KEY").ok().or(args.api_key).expect( - "LIVEKIT_API_KEY must be provided via --api-key or env", - ); - let api_secret = std::env::var("LIVEKIT_API_SECRET").ok().or(args.api_secret).expect( - "LIVEKIT_API_SECRET must be provided via --api-secret or env", - ); + // LiveKit connection details (prefer CLI args, fallback to env vars) + let url = args + .url + .or_else(|| env::var("LIVEKIT_URL").ok()) + .expect("LiveKit URL must be provided via --url argument or LIVEKIT_URL environment variable"); + let api_key = args + .api_key + .or_else(|| env::var("LIVEKIT_API_KEY").ok()) + .expect("LiveKit API key must be provided via --api-key argument or LIVEKIT_API_KEY environment variable"); + let api_secret = args + .api_secret + .or_else(|| env::var("LIVEKIT_API_SECRET").ok()) + .expect("LiveKit API secret must be provided via --api-secret argument or LIVEKIT_API_SECRET environment variable"); let token = access_token::AccessToken::with_api_key(&api_key, &api_secret) .with_identity(&args.identity) @@ -123,7 +129,9 @@ async fn main() -> Result<()> { let rt = tokio::runtime::Handle::current(); tokio::spawn(async move { let mut events = room.subscribe(); + info!("Subscribed to room events"); while let Some(evt) = events.recv().await { + debug!("Room event: {:?}", evt); if let RoomEvent::TrackSubscribed { track, .. } = evt { if let livekit::track::RemoteTrack::Video(video_track) = track { info!("Subscribed to video track: {}", video_track.name()); @@ -131,6 +139,9 @@ async fn main() -> Result<()> { let shared2 = shared_clone.clone(); std::thread::spawn(move || { let mut sink = NativeVideoStream::new(video_track.rtc_track()); + let mut frames: u64 = 0; + let mut last_log = Instant::now(); + let mut logged_first = false; while let Some(frame) = rt.block_on(sink.next()) { let buffer = frame.buffer.to_i420(); let w = buffer.width(); @@ -139,6 +150,14 @@ async fn main() -> Result<()> { let (sy, su, sv) = buffer.strides(); let (dy, du, dv) = buffer.data(); + if !logged_first { + debug!( + "First frame I420: {}x{}, strides Y/U/V = {}/{}/{}", + w, h, sy, su, sv + ); + logged_first = true; + } + let mut rgba = vec![0u8; (w * h * 4) as usize]; libwebrtc::native::yuv_helper::i420_to_rgba( dy, sy, du, su, dv, sv, &mut rgba, w * 4, w as i32, h as i32, @@ -149,7 +168,17 @@ async fn main() -> Result<()> { s.height = h; s.rgba = rgba; s.dirty = true; + + frames += 1; + let elapsed = last_log.elapsed(); + if elapsed >= Duration::from_secs(2) { + let fps = frames as f64 / elapsed.as_secs_f64(); + info!("Receiving video: {}x{}, ~{:.1} fps", w, h, fps); + frames = 0; + last_log = Instant::now(); + } } + info!("Video stream ended"); }); break; } From af08d3f921892e1db84a9e03e680a700c9ae61a4 Mon Sep 17 00:00:00 2001 From: David Chen Date: Tue, 28 Oct 2025 15:29:55 -0700 Subject: [PATCH 03/19] clean up warnings --- examples/local_video/src/publisher.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 197ae9dc0..ee130b179 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -130,14 +130,14 @@ async fn main() -> Result<()> { args.fps, ); let mut using_fmt = "YUYV"; - if let Err(_) = camera.set_camera_format(wanted) { + if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { let alt = CameraFormat::new( Resolution::new(args.width, args.height), FrameFormat::MJPEG, args.fps, ); using_fmt = "MJPEG"; - let _ = camera.set_camera_format(alt); + let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); } camera.open_stream()?; let fmt = camera.camera_format(); @@ -256,7 +256,7 @@ async fn main() -> Result<()> { frames += 1; // We already paced via interval; measure actual sleep time for logging only - let sleep_dur = (iter_start - wait_start); + let sleep_dur = iter_start - wait_start; // Per-iteration timing bookkeeping let t_end = Instant::now(); From dff3168316d7aef9e2215d77329fa562c71a96bf Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 23:08:26 +0000 Subject: [PATCH 04/19] generated protobuf --- livekit-protocol/src/livekit.rs | 251 +--- livekit-protocol/src/livekit.serde.rs | 1579 +------------------------ 2 files changed, 36 insertions(+), 1794 deletions(-) diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index 676becb62..e39604819 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -199,12 +199,6 @@ pub struct Pagination { #[prost(int32, tag="2")] pub limit: i32, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct TokenPagination { - #[prost(string, tag="1")] - pub token: ::prost::alloc::string::String, -} /// ListUpdate is used for updated APIs where 'repeated string' field is modified. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -212,15 +206,6 @@ pub struct ListUpdate { /// set the field to a new list #[prost(string, repeated, tag="1")] pub set: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// append items to a list, avoiding duplicates - #[prost(string, repeated, tag="2")] - pub add: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// delete items from a list - #[prost(string, repeated, tag="3")] - pub del: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// sets the list to an empty list - #[prost(bool, tag="4")] - pub clear: bool, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -499,14 +484,6 @@ pub struct SimulcastCodecInfo { pub cid: ::prost::alloc::string::String, #[prost(message, repeated, tag="4")] pub layers: ::prost::alloc::vec::Vec, - #[prost(enumeration="video_layer::Mode", tag="5")] - pub video_layer_mode: i32, - /// cid (client side id for track) could be different between - /// signalling (AddTrackRequest) and SDP offer. This field - /// will be populated only if it is different to avoid - /// duplication and keep the representation concise. - #[prost(string, tag="6")] - pub sdp_cid: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -521,30 +498,20 @@ pub struct TrackInfo { pub muted: bool, /// original width of video (unset for audio) /// clients may receive a lower resolution version with simulcast - #[deprecated] #[prost(uint32, tag="5")] pub width: u32, /// original height of video (unset for audio) - #[deprecated] #[prost(uint32, tag="6")] pub height: u32, /// true if track is simulcasted - /// - /// see `video_layer_mode` in `codecs` - #[deprecated] #[prost(bool, tag="7")] pub simulcast: bool, /// true if DTX (Discontinuous Transmission) is disabled for audio - /// - /// deprecated in favor of `audio_features` - #[deprecated] #[prost(bool, tag="8")] pub disable_dtx: bool, /// source of media #[prost(enumeration="TrackSource", tag="9")] pub source: i32, - /// see `codecs` for layers of individual codec - #[deprecated] #[prost(message, repeated, tag="10")] pub layers: ::prost::alloc::vec::Vec, /// mime type of codec @@ -554,8 +521,6 @@ pub struct TrackInfo { pub mid: ::prost::alloc::string::String, #[prost(message, repeated, tag="13")] pub codecs: ::prost::alloc::vec::Vec, - /// deprecated in favor of `audio_features` - #[deprecated] #[prost(bool, tag="14")] pub stereo: bool, /// true if RED (Redundant Encoding) is disabled for audio @@ -588,42 +553,6 @@ pub struct VideoLayer { pub bitrate: u32, #[prost(uint32, tag="5")] pub ssrc: u32, - #[prost(int32, tag="6")] - pub spatial_layer: i32, - #[prost(string, tag="7")] - pub rid: ::prost::alloc::string::String, -} -/// Nested message and enum types in `VideoLayer`. -pub mod video_layer { - #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] - #[repr(i32)] - pub enum Mode { - Unused = 0, - OneSpatialLayerPerStream = 1, - MultipleSpatialLayersPerStream = 2, - } - impl Mode { - /// String value of the enum field names used in the ProtoBuf definition. - /// - /// The values are not transformed in any way and thus are considered stable - /// (if the ProtoBuf definition does not change) and safe for programmatic use. - pub fn as_str_name(&self) -> &'static str { - match self { - Mode::Unused => "MODE_UNUSED", - Mode::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", - Mode::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", - } - } - /// Creates an enum from field names used in the ProtoBuf definition. - pub fn from_str_name(value: &str) -> ::core::option::Option { - match value { - "MODE_UNUSED" => Some(Self::Unused), - "ONE_SPATIAL_LAYER_PER_STREAM" => Some(Self::OneSpatialLayerPerStream), - "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Some(Self::MultipleSpatialLayersPerStream), - _ => None, - } - } - } } /// new DataPacket API #[allow(clippy::derive_partial_eq_without_eq)] @@ -644,7 +573,7 @@ pub struct DataPacket { /// sid of the user that sent the message #[prost(string, tag="17")] pub participant_sid: ::prost::alloc::string::String, - #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18")] + #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15")] pub value: ::core::option::Option, } /// Nested message and enum types in `DataPacket`. @@ -702,50 +631,6 @@ pub mod data_packet { StreamChunk(super::data_stream::Chunk), #[prost(message, tag="15")] StreamTrailer(super::data_stream::Trailer), - #[prost(message, tag="18")] - EncryptedPacket(super::EncryptedPacket), - } -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct EncryptedPacket { - #[prost(enumeration="encryption::Type", tag="1")] - pub encryption_type: i32, - #[prost(bytes="vec", tag="2")] - pub iv: ::prost::alloc::vec::Vec, - #[prost(uint32, tag="3")] - pub key_index: u32, - /// This is an encrypted EncryptedPacketPayload message representation - #[prost(bytes="vec", tag="4")] - pub encrypted_value: ::prost::alloc::vec::Vec, -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct EncryptedPacketPayload { - #[prost(oneof="encrypted_packet_payload::Value", tags="1, 3, 4, 5, 6, 7, 8, 9")] - pub value: ::core::option::Option, -} -/// Nested message and enum types in `EncryptedPacketPayload`. -pub mod encrypted_packet_payload { - #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Oneof)] - pub enum Value { - #[prost(message, tag="1")] - User(super::UserPacket), - #[prost(message, tag="3")] - ChatMessage(super::ChatMessage), - #[prost(message, tag="4")] - RpcRequest(super::RpcRequest), - #[prost(message, tag="5")] - RpcAck(super::RpcAck), - #[prost(message, tag="6")] - RpcResponse(super::RpcResponse), - #[prost(message, tag="7")] - StreamHeader(super::data_stream::Header), - #[prost(message, tag="8")] - StreamChunk(super::data_stream::Chunk), - #[prost(message, tag="9")] - StreamTrailer(super::data_stream::Trailer), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -790,7 +675,7 @@ pub struct UserPacket { /// topic under which the message was published #[prost(string, optional, tag="4")] pub topic: ::core::option::Option<::prost::alloc::string::String>, - /// Unique ID to identify the message + /// Unique ID to indentify the message #[prost(string, optional, tag="8")] pub id: ::core::option::Option<::prost::alloc::string::String>, /// start and end time allow relating the message to specific media time @@ -1013,7 +898,6 @@ pub mod client_info { UnityWeb = 11, Node = 12, Unreal = 13, - Esp32 = 14, } impl Sdk { /// String value of the enum field names used in the ProtoBuf definition. @@ -1036,7 +920,6 @@ pub mod client_info { Sdk::UnityWeb => "UNITY_WEB", Sdk::Node => "NODE", Sdk::Unreal => "UNREAL", - Sdk::Esp32 => "ESP32", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -1056,7 +939,6 @@ pub mod client_info { "UNITY_WEB" => Some(Self::UnityWeb), "NODE" => Some(Self::Node), "UNREAL" => Some(Self::Unreal), - "ESP32" => Some(Self::Esp32), _ => None, } } @@ -1349,8 +1231,7 @@ pub mod data_stream { /// only populated for finite streams, if it's a stream of unknown size this stays empty #[prost(uint64, optional, tag="5")] pub total_length: ::core::option::Option, - /// this is set on the DataPacket - #[deprecated] + /// defaults to NONE #[prost(enumeration="super::encryption::Type", tag="7")] pub encryption_type: i32, /// user defined attributes map that can carry additional info @@ -1386,8 +1267,7 @@ pub mod data_stream { /// a version indicating that this chunk_index has been retroactively modified and the original one needs to be replaced #[prost(int32, tag="4")] pub version: i32, - /// this is set on the DataPacket - #[deprecated] + /// optional, initialization vector for AES-GCM encryption #[prost(bytes="vec", optional, tag="5")] pub iv: ::core::option::Option<::prost::alloc::vec::Vec>, } @@ -2308,12 +2188,6 @@ pub struct S3Upload { pub secret: ::prost::alloc::string::String, #[prost(string, tag="11")] pub session_token: ::prost::alloc::string::String, - /// ARN of the role to assume for file upload. Egress will make an AssumeRole API call using the provided access_key and secret to assume that role. On LiveKit cloud, this is only available on accounts that have the feature enabled - #[prost(string, tag="12")] - pub assume_role_arn: ::prost::alloc::string::String, - /// ExternalID to use when assuming role for upload - #[prost(string, tag="13")] - pub assume_role_external_id: ::prost::alloc::string::String, #[prost(string, tag="3")] pub region: ::prost::alloc::string::String, #[prost(string, tag="4")] @@ -3000,10 +2874,10 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Message { - /// participant offer for publisher + /// initial join exchange, for publisher #[prost(message, tag="1")] Offer(super::SessionDescription), - /// participant answering subscriber offer + /// participant answering publisher offer #[prost(message, tag="2")] Answer(super::SessionDescription), #[prost(message, tag="3")] @@ -3056,7 +2930,7 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SignalResponse { - #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25")] + #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24")] pub message: ::core::option::Option, } /// Nested message and enum types in `SignalResponse`. @@ -3136,9 +3010,6 @@ pub mod signal_response { /// notify to the participant when they have been moved to a new room #[prost(message, tag="24")] RoomMoved(super::RoomMovedResponse), - /// notify number of required media sections to satisfy subscribed tracks - #[prost(message, tag="25")] - MediaSectionsRequirement(super::MediaSectionsRequirement), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -3148,10 +3019,6 @@ pub struct SimulcastCodec { pub codec: ::prost::alloc::string::String, #[prost(string, tag="2")] pub cid: ::prost::alloc::string::String, - #[prost(message, repeated, tag="4")] - pub layers: ::prost::alloc::vec::Vec, - #[prost(enumeration="video_layer::Mode", tag="5")] - pub video_layer_mode: i32, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -3163,6 +3030,7 @@ pub struct AddTrackRequest { pub name: ::prost::alloc::string::String, #[prost(enumeration="TrackType", tag="3")] pub r#type: i32, + /// to be deprecated in favor of layers #[prost(uint32, tag="4")] pub width: u32, #[prost(uint32, tag="5")] @@ -3566,9 +3434,7 @@ pub struct RoomMovedResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SyncState { - /// last subscribe/publish answer before reconnecting - /// subscribe answer if using dual peer connection - /// publish answer if using single peer connection + /// last subscribe answer before reconnecting #[prost(message, optional, tag="1")] pub answer: ::core::option::Option, #[prost(message, optional, tag="2")] @@ -3577,9 +3443,7 @@ pub struct SyncState { pub publish_tracks: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag="4")] pub data_channels: ::prost::alloc::vec::Vec, - /// last received server side offer/sent client side offer before reconnecting - /// received server side offer if using dual peer connection - /// sent client side offer if using single peer connection + /// last received server side offer before reconnecting #[prost(message, optional, tag="5")] pub offer: ::core::option::Option, #[prost(string, repeated, tag="6")] @@ -3739,92 +3603,6 @@ pub struct TrackSubscribed { #[prost(string, tag="1")] pub track_sid: ::prost::alloc::string::String, } -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct ConnectionSettings { - #[prost(bool, tag="1")] - pub auto_subscribe: bool, - #[prost(bool, tag="2")] - pub adaptive_stream: bool, - #[prost(bool, optional, tag="3")] - pub subscriber_allow_pause: ::core::option::Option, - #[prost(bool, tag="4")] - pub disable_ice_lite: bool, -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct JoinRequest { - #[prost(message, optional, tag="1")] - pub client_info: ::core::option::Option, - #[prost(message, optional, tag="2")] - pub connection_settings: ::core::option::Option, - /// if not empty, will overwrite `metadata` in token - #[prost(string, tag="3")] - pub metadata: ::prost::alloc::string::String, - /// will set keys provided via this - /// will overwrite if the same key is in the token - /// will not delete keys from token if there is a key collision and this sets that key to empty value - #[prost(map="string, string", tag="4")] - pub participant_attributes: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, - #[prost(message, repeated, tag="5")] - pub add_track_requests: ::prost::alloc::vec::Vec, - #[prost(message, optional, tag="6")] - pub publisher_offer: ::core::option::Option, - #[prost(bool, tag="7")] - pub reconnect: bool, - #[prost(enumeration="ReconnectReason", tag="8")] - pub reconnect_reason: i32, - #[prost(string, tag="9")] - pub participant_sid: ::prost::alloc::string::String, - #[prost(message, optional, tag="10")] - pub sync_state: ::core::option::Option, -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct WrappedJoinRequest { - #[prost(enumeration="wrapped_join_request::Compression", tag="1")] - pub compression: i32, - /// marshalled JoinRequest + potentially compressed - #[prost(bytes="vec", tag="2")] - pub join_request: ::prost::alloc::vec::Vec, -} -/// Nested message and enum types in `WrappedJoinRequest`. -pub mod wrapped_join_request { - #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] - #[repr(i32)] - pub enum Compression { - None = 0, - Gzip = 1, - } - impl Compression { - /// String value of the enum field names used in the ProtoBuf definition. - /// - /// The values are not transformed in any way and thus are considered stable - /// (if the ProtoBuf definition does not change) and safe for programmatic use. - pub fn as_str_name(&self) -> &'static str { - match self { - Compression::None => "NONE", - Compression::Gzip => "GZIP", - } - } - /// Creates an enum from field names used in the ProtoBuf definition. - pub fn from_str_name(value: &str) -> ::core::option::Option { - match value { - "NONE" => Some(Self::None), - "GZIP" => Some(Self::Gzip), - _ => None, - } - } - } -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct MediaSectionsRequirement { - #[prost(uint32, tag="1")] - pub num_audios: u32, - #[prost(uint32, tag="2")] - pub num_videos: u32, -} #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SignalTarget { @@ -3944,10 +3722,6 @@ pub struct JobState { pub updated_at: i64, #[prost(string, tag="6")] pub participant_identity: ::prost::alloc::string::String, - #[prost(string, tag="7")] - pub worker_id: ::prost::alloc::string::String, - #[prost(string, tag="8")] - pub agent_id: ::prost::alloc::string::String, } /// from Worker to Server #[allow(clippy::derive_partial_eq_without_eq)] @@ -4516,9 +4290,6 @@ pub struct RoomConfiguration { /// limit number of participants that can be in a room, excluding Egress and Ingress participants #[prost(uint32, tag="4")] pub max_participants: u32, - /// metadata of room - #[prost(string, tag="11")] - pub metadata: ::prost::alloc::string::String, /// egress #[prost(message, optional, tag="5")] pub egress: ::core::option::Option, @@ -4980,7 +4751,7 @@ impl IngressVideoEncodingPreset { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WebhookEvent { - /// one of room_started, room_finished, participant_joined, participant_left, participant_connection_aborted, + /// one of room_started, room_finished, participant_joined, participant_left, /// track_published, track_unpublished, egress_started, egress_updated, egress_ended, /// ingress_started, ingress_ended #[prost(string, tag="1")] diff --git a/livekit-protocol/src/livekit.serde.rs b/livekit-protocol/src/livekit.serde.rs index 3c79f6c7a..5c411a433 100644 --- a/livekit-protocol/src/livekit.serde.rs +++ b/livekit-protocol/src/livekit.serde.rs @@ -2848,7 +2848,6 @@ impl serde::Serialize for client_info::Sdk { Self::UnityWeb => "UNITY_WEB", Self::Node => "NODE", Self::Unreal => "UNREAL", - Self::Esp32 => "ESP32", }; serializer.serialize_str(variant) } @@ -2874,7 +2873,6 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB", "NODE", "UNREAL", - "ESP32", ]; struct GeneratedVisitor; @@ -2929,7 +2927,6 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB" => Ok(client_info::Sdk::UnityWeb), "NODE" => Ok(client_info::Sdk::Node), "UNREAL" => Ok(client_info::Sdk::Unreal), - "ESP32" => Ok(client_info::Sdk::Esp32), _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), } } @@ -3356,156 +3353,6 @@ impl<'de> serde::Deserialize<'de> for ConnectionQualityUpdate { deserializer.deserialize_struct("livekit.ConnectionQualityUpdate", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for ConnectionSettings { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.auto_subscribe { - len += 1; - } - if self.adaptive_stream { - len += 1; - } - if self.subscriber_allow_pause.is_some() { - len += 1; - } - if self.disable_ice_lite { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.ConnectionSettings", len)?; - if self.auto_subscribe { - struct_ser.serialize_field("autoSubscribe", &self.auto_subscribe)?; - } - if self.adaptive_stream { - struct_ser.serialize_field("adaptiveStream", &self.adaptive_stream)?; - } - if let Some(v) = self.subscriber_allow_pause.as_ref() { - struct_ser.serialize_field("subscriberAllowPause", v)?; - } - if self.disable_ice_lite { - struct_ser.serialize_field("disableIceLite", &self.disable_ice_lite)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for ConnectionSettings { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "auto_subscribe", - "autoSubscribe", - "adaptive_stream", - "adaptiveStream", - "subscriber_allow_pause", - "subscriberAllowPause", - "disable_ice_lite", - "disableIceLite", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - AutoSubscribe, - AdaptiveStream, - SubscriberAllowPause, - DisableIceLite, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "autoSubscribe" | "auto_subscribe" => Ok(GeneratedField::AutoSubscribe), - "adaptiveStream" | "adaptive_stream" => Ok(GeneratedField::AdaptiveStream), - "subscriberAllowPause" | "subscriber_allow_pause" => Ok(GeneratedField::SubscriberAllowPause), - "disableIceLite" | "disable_ice_lite" => Ok(GeneratedField::DisableIceLite), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = ConnectionSettings; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.ConnectionSettings") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut auto_subscribe__ = None; - let mut adaptive_stream__ = None; - let mut subscriber_allow_pause__ = None; - let mut disable_ice_lite__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::AutoSubscribe => { - if auto_subscribe__.is_some() { - return Err(serde::de::Error::duplicate_field("autoSubscribe")); - } - auto_subscribe__ = Some(map_.next_value()?); - } - GeneratedField::AdaptiveStream => { - if adaptive_stream__.is_some() { - return Err(serde::de::Error::duplicate_field("adaptiveStream")); - } - adaptive_stream__ = Some(map_.next_value()?); - } - GeneratedField::SubscriberAllowPause => { - if subscriber_allow_pause__.is_some() { - return Err(serde::de::Error::duplicate_field("subscriberAllowPause")); - } - subscriber_allow_pause__ = map_.next_value()?; - } - GeneratedField::DisableIceLite => { - if disable_ice_lite__.is_some() { - return Err(serde::de::Error::duplicate_field("disableIceLite")); - } - disable_ice_lite__ = Some(map_.next_value()?); - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(ConnectionSettings { - auto_subscribe: auto_subscribe__.unwrap_or_default(), - adaptive_stream: adaptive_stream__.unwrap_or_default(), - subscriber_allow_pause: subscriber_allow_pause__, - disable_ice_lite: disable_ice_lite__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("livekit.ConnectionSettings", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for CreateAgentDispatchRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -5739,9 +5586,6 @@ impl serde::Serialize for DataPacket { data_packet::Value::StreamTrailer(v) => { struct_ser.serialize_field("streamTrailer", v)?; } - data_packet::Value::EncryptedPacket(v) => { - struct_ser.serialize_field("encryptedPacket", v)?; - } } } struct_ser.end() @@ -5782,8 +5626,6 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamChunk", "stream_trailer", "streamTrailer", - "encrypted_packet", - "encryptedPacket", ]; #[allow(clippy::enum_variant_names)] @@ -5805,7 +5647,6 @@ impl<'de> serde::Deserialize<'de> for DataPacket { StreamHeader, StreamChunk, StreamTrailer, - EncryptedPacket, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -5845,7 +5686,6 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), - "encryptedPacket" | "encrypted_packet" => Ok(GeneratedField::EncryptedPacket), _ => Ok(GeneratedField::__SkipField__), } } @@ -5987,13 +5827,6 @@ impl<'de> serde::Deserialize<'de> for DataPacket { return Err(serde::de::Error::duplicate_field("streamTrailer")); } value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::StreamTrailer) -; - } - GeneratedField::EncryptedPacket => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("encryptedPacket")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::EncryptedPacket) ; } GeneratedField::__SkipField__ => { @@ -9378,365 +9211,6 @@ impl<'de> serde::Deserialize<'de> for EncodingOptionsPreset { deserializer.deserialize_any(GeneratedVisitor) } } -impl serde::Serialize for EncryptedPacket { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.encryption_type != 0 { - len += 1; - } - if !self.iv.is_empty() { - len += 1; - } - if self.key_index != 0 { - len += 1; - } - if !self.encrypted_value.is_empty() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacket", len)?; - if self.encryption_type != 0 { - let v = encryption::Type::try_from(self.encryption_type) - .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.encryption_type)))?; - struct_ser.serialize_field("encryptionType", &v)?; - } - if !self.iv.is_empty() { - #[allow(clippy::needless_borrow)] - #[allow(clippy::needless_borrows_for_generic_args)] - struct_ser.serialize_field("iv", pbjson::private::base64::encode(&self.iv).as_str())?; - } - if self.key_index != 0 { - struct_ser.serialize_field("keyIndex", &self.key_index)?; - } - if !self.encrypted_value.is_empty() { - #[allow(clippy::needless_borrow)] - #[allow(clippy::needless_borrows_for_generic_args)] - struct_ser.serialize_field("encryptedValue", pbjson::private::base64::encode(&self.encrypted_value).as_str())?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for EncryptedPacket { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "encryption_type", - "encryptionType", - "iv", - "key_index", - "keyIndex", - "encrypted_value", - "encryptedValue", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - EncryptionType, - Iv, - KeyIndex, - EncryptedValue, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "encryptionType" | "encryption_type" => Ok(GeneratedField::EncryptionType), - "iv" => Ok(GeneratedField::Iv), - "keyIndex" | "key_index" => Ok(GeneratedField::KeyIndex), - "encryptedValue" | "encrypted_value" => Ok(GeneratedField::EncryptedValue), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = EncryptedPacket; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.EncryptedPacket") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut encryption_type__ = None; - let mut iv__ = None; - let mut key_index__ = None; - let mut encrypted_value__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::EncryptionType => { - if encryption_type__.is_some() { - return Err(serde::de::Error::duplicate_field("encryptionType")); - } - encryption_type__ = Some(map_.next_value::()? as i32); - } - GeneratedField::Iv => { - if iv__.is_some() { - return Err(serde::de::Error::duplicate_field("iv")); - } - iv__ = - Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) - ; - } - GeneratedField::KeyIndex => { - if key_index__.is_some() { - return Err(serde::de::Error::duplicate_field("keyIndex")); - } - key_index__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::EncryptedValue => { - if encrypted_value__.is_some() { - return Err(serde::de::Error::duplicate_field("encryptedValue")); - } - encrypted_value__ = - Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(EncryptedPacket { - encryption_type: encryption_type__.unwrap_or_default(), - iv: iv__.unwrap_or_default(), - key_index: key_index__.unwrap_or_default(), - encrypted_value: encrypted_value__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("livekit.EncryptedPacket", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for EncryptedPacketPayload { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.value.is_some() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacketPayload", len)?; - if let Some(v) = self.value.as_ref() { - match v { - encrypted_packet_payload::Value::User(v) => { - struct_ser.serialize_field("user", v)?; - } - encrypted_packet_payload::Value::ChatMessage(v) => { - struct_ser.serialize_field("chatMessage", v)?; - } - encrypted_packet_payload::Value::RpcRequest(v) => { - struct_ser.serialize_field("rpcRequest", v)?; - } - encrypted_packet_payload::Value::RpcAck(v) => { - struct_ser.serialize_field("rpcAck", v)?; - } - encrypted_packet_payload::Value::RpcResponse(v) => { - struct_ser.serialize_field("rpcResponse", v)?; - } - encrypted_packet_payload::Value::StreamHeader(v) => { - struct_ser.serialize_field("streamHeader", v)?; - } - encrypted_packet_payload::Value::StreamChunk(v) => { - struct_ser.serialize_field("streamChunk", v)?; - } - encrypted_packet_payload::Value::StreamTrailer(v) => { - struct_ser.serialize_field("streamTrailer", v)?; - } - } - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for EncryptedPacketPayload { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "user", - "chat_message", - "chatMessage", - "rpc_request", - "rpcRequest", - "rpc_ack", - "rpcAck", - "rpc_response", - "rpcResponse", - "stream_header", - "streamHeader", - "stream_chunk", - "streamChunk", - "stream_trailer", - "streamTrailer", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - User, - ChatMessage, - RpcRequest, - RpcAck, - RpcResponse, - StreamHeader, - StreamChunk, - StreamTrailer, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "user" => Ok(GeneratedField::User), - "chatMessage" | "chat_message" => Ok(GeneratedField::ChatMessage), - "rpcRequest" | "rpc_request" => Ok(GeneratedField::RpcRequest), - "rpcAck" | "rpc_ack" => Ok(GeneratedField::RpcAck), - "rpcResponse" | "rpc_response" => Ok(GeneratedField::RpcResponse), - "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), - "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), - "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = EncryptedPacketPayload; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.EncryptedPacketPayload") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut value__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::User => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("user")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::User) -; - } - GeneratedField::ChatMessage => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("chatMessage")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::ChatMessage) -; - } - GeneratedField::RpcRequest => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("rpcRequest")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcRequest) -; - } - GeneratedField::RpcAck => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("rpcAck")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcAck) -; - } - GeneratedField::RpcResponse => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("rpcResponse")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcResponse) -; - } - GeneratedField::StreamHeader => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("streamHeader")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamHeader) -; - } - GeneratedField::StreamChunk => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("streamChunk")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamChunk) -; - } - GeneratedField::StreamTrailer => { - if value__.is_some() { - return Err(serde::de::Error::duplicate_field("streamTrailer")); - } - value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamTrailer) -; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(EncryptedPacketPayload { - value: value__, - }) - } - } - deserializer.deserialize_struct("livekit.EncryptedPacketPayload", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for Encryption { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -14011,12 +13485,6 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { len += 1; } - if !self.worker_id.is_empty() { - len += 1; - } - if !self.agent_id.is_empty() { - len += 1; - } let mut struct_ser = serializer.serialize_struct("livekit.JobState", len)?; if self.status != 0 { let v = JobStatus::try_from(self.status) @@ -14044,12 +13512,6 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { struct_ser.serialize_field("participantIdentity", &self.participant_identity)?; } - if !self.worker_id.is_empty() { - struct_ser.serialize_field("workerId", &self.worker_id)?; - } - if !self.agent_id.is_empty() { - struct_ser.serialize_field("agentId", &self.agent_id)?; - } struct_ser.end() } } @@ -14070,10 +13532,6 @@ impl<'de> serde::Deserialize<'de> for JobState { "updatedAt", "participant_identity", "participantIdentity", - "worker_id", - "workerId", - "agent_id", - "agentId", ]; #[allow(clippy::enum_variant_names)] @@ -14084,8 +13542,6 @@ impl<'de> serde::Deserialize<'de> for JobState { EndedAt, UpdatedAt, ParticipantIdentity, - WorkerId, - AgentId, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -14114,8 +13570,6 @@ impl<'de> serde::Deserialize<'de> for JobState { "endedAt" | "ended_at" => Ok(GeneratedField::EndedAt), "updatedAt" | "updated_at" => Ok(GeneratedField::UpdatedAt), "participantIdentity" | "participant_identity" => Ok(GeneratedField::ParticipantIdentity), - "workerId" | "worker_id" => Ok(GeneratedField::WorkerId), - "agentId" | "agent_id" => Ok(GeneratedField::AgentId), _ => Ok(GeneratedField::__SkipField__), } } @@ -14141,8 +13595,6 @@ impl<'de> serde::Deserialize<'de> for JobState { let mut ended_at__ = None; let mut updated_at__ = None; let mut participant_identity__ = None; - let mut worker_id__ = None; - let mut agent_id__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Status => { @@ -14187,18 +13639,6 @@ impl<'de> serde::Deserialize<'de> for JobState { } participant_identity__ = Some(map_.next_value()?); } - GeneratedField::WorkerId => { - if worker_id__.is_some() { - return Err(serde::de::Error::duplicate_field("workerId")); - } - worker_id__ = Some(map_.next_value()?); - } - GeneratedField::AgentId => { - if agent_id__.is_some() { - return Err(serde::de::Error::duplicate_field("agentId")); - } - agent_id__ = Some(map_.next_value()?); - } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -14211,8 +13651,6 @@ impl<'de> serde::Deserialize<'de> for JobState { ended_at: ended_at__.unwrap_or_default(), updated_at: updated_at__.unwrap_or_default(), participant_identity: participant_identity__.unwrap_or_default(), - worker_id: worker_id__.unwrap_or_default(), - agent_id: agent_id__.unwrap_or_default(), }) } } @@ -14466,266 +13904,6 @@ impl<'de> serde::Deserialize<'de> for JobType { deserializer.deserialize_any(GeneratedVisitor) } } -impl serde::Serialize for JoinRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.client_info.is_some() { - len += 1; - } - if self.connection_settings.is_some() { - len += 1; - } - if !self.metadata.is_empty() { - len += 1; - } - if !self.participant_attributes.is_empty() { - len += 1; - } - if !self.add_track_requests.is_empty() { - len += 1; - } - if self.publisher_offer.is_some() { - len += 1; - } - if self.reconnect { - len += 1; - } - if self.reconnect_reason != 0 { - len += 1; - } - if !self.participant_sid.is_empty() { - len += 1; - } - if self.sync_state.is_some() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.JoinRequest", len)?; - if let Some(v) = self.client_info.as_ref() { - struct_ser.serialize_field("clientInfo", v)?; - } - if let Some(v) = self.connection_settings.as_ref() { - struct_ser.serialize_field("connectionSettings", v)?; - } - if !self.metadata.is_empty() { - struct_ser.serialize_field("metadata", &self.metadata)?; - } - if !self.participant_attributes.is_empty() { - struct_ser.serialize_field("participantAttributes", &self.participant_attributes)?; - } - if !self.add_track_requests.is_empty() { - struct_ser.serialize_field("addTrackRequests", &self.add_track_requests)?; - } - if let Some(v) = self.publisher_offer.as_ref() { - struct_ser.serialize_field("publisherOffer", v)?; - } - if self.reconnect { - struct_ser.serialize_field("reconnect", &self.reconnect)?; - } - if self.reconnect_reason != 0 { - let v = ReconnectReason::try_from(self.reconnect_reason) - .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.reconnect_reason)))?; - struct_ser.serialize_field("reconnectReason", &v)?; - } - if !self.participant_sid.is_empty() { - struct_ser.serialize_field("participantSid", &self.participant_sid)?; - } - if let Some(v) = self.sync_state.as_ref() { - struct_ser.serialize_field("syncState", v)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for JoinRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "client_info", - "clientInfo", - "connection_settings", - "connectionSettings", - "metadata", - "participant_attributes", - "participantAttributes", - "add_track_requests", - "addTrackRequests", - "publisher_offer", - "publisherOffer", - "reconnect", - "reconnect_reason", - "reconnectReason", - "participant_sid", - "participantSid", - "sync_state", - "syncState", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - ClientInfo, - ConnectionSettings, - Metadata, - ParticipantAttributes, - AddTrackRequests, - PublisherOffer, - Reconnect, - ReconnectReason, - ParticipantSid, - SyncState, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "clientInfo" | "client_info" => Ok(GeneratedField::ClientInfo), - "connectionSettings" | "connection_settings" => Ok(GeneratedField::ConnectionSettings), - "metadata" => Ok(GeneratedField::Metadata), - "participantAttributes" | "participant_attributes" => Ok(GeneratedField::ParticipantAttributes), - "addTrackRequests" | "add_track_requests" => Ok(GeneratedField::AddTrackRequests), - "publisherOffer" | "publisher_offer" => Ok(GeneratedField::PublisherOffer), - "reconnect" => Ok(GeneratedField::Reconnect), - "reconnectReason" | "reconnect_reason" => Ok(GeneratedField::ReconnectReason), - "participantSid" | "participant_sid" => Ok(GeneratedField::ParticipantSid), - "syncState" | "sync_state" => Ok(GeneratedField::SyncState), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = JoinRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.JoinRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut client_info__ = None; - let mut connection_settings__ = None; - let mut metadata__ = None; - let mut participant_attributes__ = None; - let mut add_track_requests__ = None; - let mut publisher_offer__ = None; - let mut reconnect__ = None; - let mut reconnect_reason__ = None; - let mut participant_sid__ = None; - let mut sync_state__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::ClientInfo => { - if client_info__.is_some() { - return Err(serde::de::Error::duplicate_field("clientInfo")); - } - client_info__ = map_.next_value()?; - } - GeneratedField::ConnectionSettings => { - if connection_settings__.is_some() { - return Err(serde::de::Error::duplicate_field("connectionSettings")); - } - connection_settings__ = map_.next_value()?; - } - GeneratedField::Metadata => { - if metadata__.is_some() { - return Err(serde::de::Error::duplicate_field("metadata")); - } - metadata__ = Some(map_.next_value()?); - } - GeneratedField::ParticipantAttributes => { - if participant_attributes__.is_some() { - return Err(serde::de::Error::duplicate_field("participantAttributes")); - } - participant_attributes__ = Some( - map_.next_value::>()? - ); - } - GeneratedField::AddTrackRequests => { - if add_track_requests__.is_some() { - return Err(serde::de::Error::duplicate_field("addTrackRequests")); - } - add_track_requests__ = Some(map_.next_value()?); - } - GeneratedField::PublisherOffer => { - if publisher_offer__.is_some() { - return Err(serde::de::Error::duplicate_field("publisherOffer")); - } - publisher_offer__ = map_.next_value()?; - } - GeneratedField::Reconnect => { - if reconnect__.is_some() { - return Err(serde::de::Error::duplicate_field("reconnect")); - } - reconnect__ = Some(map_.next_value()?); - } - GeneratedField::ReconnectReason => { - if reconnect_reason__.is_some() { - return Err(serde::de::Error::duplicate_field("reconnectReason")); - } - reconnect_reason__ = Some(map_.next_value::()? as i32); - } - GeneratedField::ParticipantSid => { - if participant_sid__.is_some() { - return Err(serde::de::Error::duplicate_field("participantSid")); - } - participant_sid__ = Some(map_.next_value()?); - } - GeneratedField::SyncState => { - if sync_state__.is_some() { - return Err(serde::de::Error::duplicate_field("syncState")); - } - sync_state__ = map_.next_value()?; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(JoinRequest { - client_info: client_info__, - connection_settings: connection_settings__, - metadata: metadata__.unwrap_or_default(), - participant_attributes: participant_attributes__.unwrap_or_default(), - add_track_requests: add_track_requests__.unwrap_or_default(), - publisher_offer: publisher_offer__, - reconnect: reconnect__.unwrap_or_default(), - reconnect_reason: reconnect_reason__.unwrap_or_default(), - participant_sid: participant_sid__.unwrap_or_default(), - sync_state: sync_state__, - }) - } - } - deserializer.deserialize_struct("livekit.JoinRequest", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for JoinResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -17206,28 +16384,10 @@ impl serde::Serialize for ListUpdate { if !self.set.is_empty() { len += 1; } - if !self.add.is_empty() { - len += 1; - } - if !self.del.is_empty() { - len += 1; - } - if self.clear { - len += 1; - } let mut struct_ser = serializer.serialize_struct("livekit.ListUpdate", len)?; if !self.set.is_empty() { struct_ser.serialize_field("set", &self.set)?; } - if !self.add.is_empty() { - struct_ser.serialize_field("add", &self.add)?; - } - if !self.del.is_empty() { - struct_ser.serialize_field("del", &self.del)?; - } - if self.clear { - struct_ser.serialize_field("clear", &self.clear)?; - } struct_ser.end() } } @@ -17239,17 +16399,11 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { const FIELDS: &[&str] = &[ "set", - "add", - "del", - "clear", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Set, - Add, - Del, - Clear, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -17273,9 +16427,6 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { match value { "set" => Ok(GeneratedField::Set), - "add" => Ok(GeneratedField::Add), - "del" => Ok(GeneratedField::Del), - "clear" => Ok(GeneratedField::Clear), _ => Ok(GeneratedField::__SkipField__), } } @@ -17296,9 +16447,6 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { V: serde::de::MapAccess<'de>, { let mut set__ = None; - let mut add__ = None; - let mut del__ = None; - let mut clear__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Set => { @@ -17307,24 +16455,6 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } set__ = Some(map_.next_value()?); } - GeneratedField::Add => { - if add__.is_some() { - return Err(serde::de::Error::duplicate_field("add")); - } - add__ = Some(map_.next_value()?); - } - GeneratedField::Del => { - if del__.is_some() { - return Err(serde::de::Error::duplicate_field("del")); - } - del__ = Some(map_.next_value()?); - } - GeneratedField::Clear => { - if clear__.is_some() { - return Err(serde::de::Error::duplicate_field("clear")); - } - clear__ = Some(map_.next_value()?); - } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -17332,133 +16462,12 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } Ok(ListUpdate { set: set__.unwrap_or_default(), - add: add__.unwrap_or_default(), - del: del__.unwrap_or_default(), - clear: clear__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.ListUpdate", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for MediaSectionsRequirement { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.num_audios != 0 { - len += 1; - } - if self.num_videos != 0 { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.MediaSectionsRequirement", len)?; - if self.num_audios != 0 { - struct_ser.serialize_field("numAudios", &self.num_audios)?; - } - if self.num_videos != 0 { - struct_ser.serialize_field("numVideos", &self.num_videos)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for MediaSectionsRequirement { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "num_audios", - "numAudios", - "num_videos", - "numVideos", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - NumAudios, - NumVideos, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "numAudios" | "num_audios" => Ok(GeneratedField::NumAudios), - "numVideos" | "num_videos" => Ok(GeneratedField::NumVideos), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = MediaSectionsRequirement; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.MediaSectionsRequirement") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut num_audios__ = None; - let mut num_videos__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::NumAudios => { - if num_audios__.is_some() { - return Err(serde::de::Error::duplicate_field("numAudios")); - } - num_audios__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::NumVideos => { - if num_videos__.is_some() { - return Err(serde::de::Error::duplicate_field("numVideos")); - } - num_videos__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(MediaSectionsRequirement { - num_audios: num_audios__.unwrap_or_default(), - num_videos: num_videos__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("livekit.MediaSectionsRequirement", FIELDS, GeneratedVisitor) - } -} impl serde::Serialize for MetricLabel { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -24343,9 +23352,6 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { len += 1; } - if !self.metadata.is_empty() { - len += 1; - } if self.egress.is_some() { len += 1; } @@ -24374,9 +23380,6 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { struct_ser.serialize_field("maxParticipants", &self.max_participants)?; } - if !self.metadata.is_empty() { - struct_ser.serialize_field("metadata", &self.metadata)?; - } if let Some(v) = self.egress.as_ref() { struct_ser.serialize_field("egress", v)?; } @@ -24409,7 +23412,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "departureTimeout", "max_participants", "maxParticipants", - "metadata", "egress", "min_playout_delay", "minPlayoutDelay", @@ -24426,7 +23428,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { EmptyTimeout, DepartureTimeout, MaxParticipants, - Metadata, Egress, MinPlayoutDelay, MaxPlayoutDelay, @@ -24458,7 +23459,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "emptyTimeout" | "empty_timeout" => Ok(GeneratedField::EmptyTimeout), "departureTimeout" | "departure_timeout" => Ok(GeneratedField::DepartureTimeout), "maxParticipants" | "max_participants" => Ok(GeneratedField::MaxParticipants), - "metadata" => Ok(GeneratedField::Metadata), "egress" => Ok(GeneratedField::Egress), "minPlayoutDelay" | "min_playout_delay" => Ok(GeneratedField::MinPlayoutDelay), "maxPlayoutDelay" | "max_playout_delay" => Ok(GeneratedField::MaxPlayoutDelay), @@ -24487,7 +23487,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { let mut empty_timeout__ = None; let mut departure_timeout__ = None; let mut max_participants__ = None; - let mut metadata__ = None; let mut egress__ = None; let mut min_playout_delay__ = None; let mut max_playout_delay__ = None; @@ -24525,12 +23524,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } - GeneratedField::Metadata => { - if metadata__.is_some() { - return Err(serde::de::Error::duplicate_field("metadata")); - } - metadata__ = Some(map_.next_value()?); - } GeneratedField::Egress => { if egress__.is_some() { return Err(serde::de::Error::duplicate_field("egress")); @@ -24575,7 +23568,6 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { empty_timeout: empty_timeout__.unwrap_or_default(), departure_timeout: departure_timeout__.unwrap_or_default(), max_participants: max_participants__.unwrap_or_default(), - metadata: metadata__.unwrap_or_default(), egress: egress__, min_playout_delay: min_playout_delay__.unwrap_or_default(), max_playout_delay: max_playout_delay__.unwrap_or_default(), @@ -25612,12 +24604,6 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { len += 1; } - if !self.assume_role_arn.is_empty() { - len += 1; - } - if !self.assume_role_external_id.is_empty() { - len += 1; - } if !self.region.is_empty() { len += 1; } @@ -25652,12 +24638,6 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { struct_ser.serialize_field("sessionToken", &self.session_token)?; } - if !self.assume_role_arn.is_empty() { - struct_ser.serialize_field("assumeRoleArn", &self.assume_role_arn)?; - } - if !self.assume_role_external_id.is_empty() { - struct_ser.serialize_field("assumeRoleExternalId", &self.assume_role_external_id)?; - } if !self.region.is_empty() { struct_ser.serialize_field("region", &self.region)?; } @@ -25697,10 +24677,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "secret", "session_token", "sessionToken", - "assume_role_arn", - "assumeRoleArn", - "assume_role_external_id", - "assumeRoleExternalId", "region", "endpoint", "bucket", @@ -25718,8 +24694,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { AccessKey, Secret, SessionToken, - AssumeRoleArn, - AssumeRoleExternalId, Region, Endpoint, Bucket, @@ -25753,8 +24727,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "accessKey" | "access_key" => Ok(GeneratedField::AccessKey), "secret" => Ok(GeneratedField::Secret), "sessionToken" | "session_token" => Ok(GeneratedField::SessionToken), - "assumeRoleArn" | "assume_role_arn" => Ok(GeneratedField::AssumeRoleArn), - "assumeRoleExternalId" | "assume_role_external_id" => Ok(GeneratedField::AssumeRoleExternalId), "region" => Ok(GeneratedField::Region), "endpoint" => Ok(GeneratedField::Endpoint), "bucket" => Ok(GeneratedField::Bucket), @@ -25785,8 +24757,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { let mut access_key__ = None; let mut secret__ = None; let mut session_token__ = None; - let mut assume_role_arn__ = None; - let mut assume_role_external_id__ = None; let mut region__ = None; let mut endpoint__ = None; let mut bucket__ = None; @@ -25815,18 +24785,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { } session_token__ = Some(map_.next_value()?); } - GeneratedField::AssumeRoleArn => { - if assume_role_arn__.is_some() { - return Err(serde::de::Error::duplicate_field("assumeRoleArn")); - } - assume_role_arn__ = Some(map_.next_value()?); - } - GeneratedField::AssumeRoleExternalId => { - if assume_role_external_id__.is_some() { - return Err(serde::de::Error::duplicate_field("assumeRoleExternalId")); - } - assume_role_external_id__ = Some(map_.next_value()?); - } GeneratedField::Region => { if region__.is_some() { return Err(serde::de::Error::duplicate_field("region")); @@ -25886,8 +24844,6 @@ impl<'de> serde::Deserialize<'de> for S3Upload { access_key: access_key__.unwrap_or_default(), secret: secret__.unwrap_or_default(), session_token: session_token__.unwrap_or_default(), - assume_role_arn: assume_role_arn__.unwrap_or_default(), - assume_role_external_id: assume_role_external_id__.unwrap_or_default(), region: region__.unwrap_or_default(), endpoint: endpoint__.unwrap_or_default(), bucket: bucket__.unwrap_or_default(), @@ -32503,9 +31459,6 @@ impl serde::Serialize for SignalResponse { signal_response::Message::RoomMoved(v) => { struct_ser.serialize_field("roomMoved", v)?; } - signal_response::Message::MediaSectionsRequirement(v) => { - struct_ser.serialize_field("mediaSectionsRequirement", v)?; - } } } struct_ser.end() @@ -32555,8 +31508,6 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "trackSubscribed", "room_moved", "roomMoved", - "media_sections_requirement", - "mediaSectionsRequirement", ]; #[allow(clippy::enum_variant_names)] @@ -32584,7 +31535,6 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { RequestResponse, TrackSubscribed, RoomMoved, - MediaSectionsRequirement, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -32630,7 +31580,6 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "requestResponse" | "request_response" => Ok(GeneratedField::RequestResponse), "trackSubscribed" | "track_subscribed" => Ok(GeneratedField::TrackSubscribed), "roomMoved" | "room_moved" => Ok(GeneratedField::RoomMoved), - "mediaSectionsRequirement" | "media_sections_requirement" => Ok(GeneratedField::MediaSectionsRequirement), _ => Ok(GeneratedField::__SkipField__), } } @@ -32810,13 +31759,6 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { return Err(serde::de::Error::duplicate_field("roomMoved")); } message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::RoomMoved) -; - } - GeneratedField::MediaSectionsRequirement => { - if message__.is_some() { - return Err(serde::de::Error::duplicate_field("mediaSectionsRequirement")); - } - message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::MediaSectionsRequirement) ; } GeneratedField::__SkipField__ => { @@ -33255,12 +32197,6 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { len += 1; } - if !self.layers.is_empty() { - len += 1; - } - if self.video_layer_mode != 0 { - len += 1; - } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodec", len)?; if !self.codec.is_empty() { struct_ser.serialize_field("codec", &self.codec)?; @@ -33268,14 +32204,6 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { struct_ser.serialize_field("cid", &self.cid)?; } - if !self.layers.is_empty() { - struct_ser.serialize_field("layers", &self.layers)?; - } - if self.video_layer_mode != 0 { - let v = video_layer::Mode::try_from(self.video_layer_mode) - .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; - struct_ser.serialize_field("videoLayerMode", &v)?; - } struct_ser.end() } } @@ -33288,17 +32216,12 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { const FIELDS: &[&str] = &[ "codec", "cid", - "layers", - "video_layer_mode", - "videoLayerMode", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Codec, Cid, - Layers, - VideoLayerMode, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -33323,8 +32246,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { match value { "codec" => Ok(GeneratedField::Codec), "cid" => Ok(GeneratedField::Cid), - "layers" => Ok(GeneratedField::Layers), - "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), _ => Ok(GeneratedField::__SkipField__), } } @@ -33346,8 +32267,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { { let mut codec__ = None; let mut cid__ = None; - let mut layers__ = None; - let mut video_layer_mode__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Codec => { @@ -33362,18 +32281,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { } cid__ = Some(map_.next_value()?); } - GeneratedField::Layers => { - if layers__.is_some() { - return Err(serde::de::Error::duplicate_field("layers")); - } - layers__ = Some(map_.next_value()?); - } - GeneratedField::VideoLayerMode => { - if video_layer_mode__.is_some() { - return Err(serde::de::Error::duplicate_field("videoLayerMode")); - } - video_layer_mode__ = Some(map_.next_value::()? as i32); - } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -33382,8 +32289,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { Ok(SimulcastCodec { codec: codec__.unwrap_or_default(), cid: cid__.unwrap_or_default(), - layers: layers__.unwrap_or_default(), - video_layer_mode: video_layer_mode__.unwrap_or_default(), }) } } @@ -33410,12 +32315,6 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { len += 1; } - if self.video_layer_mode != 0 { - len += 1; - } - if !self.sdp_cid.is_empty() { - len += 1; - } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodecInfo", len)?; if !self.mime_type.is_empty() { struct_ser.serialize_field("mimeType", &self.mime_type)?; @@ -33429,14 +32328,6 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { struct_ser.serialize_field("layers", &self.layers)?; } - if self.video_layer_mode != 0 { - let v = video_layer::Mode::try_from(self.video_layer_mode) - .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; - struct_ser.serialize_field("videoLayerMode", &v)?; - } - if !self.sdp_cid.is_empty() { - struct_ser.serialize_field("sdpCid", &self.sdp_cid)?; - } struct_ser.end() } } @@ -33452,10 +32343,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid", "cid", "layers", - "video_layer_mode", - "videoLayerMode", - "sdp_cid", - "sdpCid", ]; #[allow(clippy::enum_variant_names)] @@ -33464,8 +32351,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { Mid, Cid, Layers, - VideoLayerMode, - SdpCid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -33492,8 +32377,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid" => Ok(GeneratedField::Mid), "cid" => Ok(GeneratedField::Cid), "layers" => Ok(GeneratedField::Layers), - "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), - "sdpCid" | "sdp_cid" => Ok(GeneratedField::SdpCid), _ => Ok(GeneratedField::__SkipField__), } } @@ -33517,8 +32400,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { let mut mid__ = None; let mut cid__ = None; let mut layers__ = None; - let mut video_layer_mode__ = None; - let mut sdp_cid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::MimeType => { @@ -33545,18 +32426,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { } layers__ = Some(map_.next_value()?); } - GeneratedField::VideoLayerMode => { - if video_layer_mode__.is_some() { - return Err(serde::de::Error::duplicate_field("videoLayerMode")); - } - video_layer_mode__ = Some(map_.next_value::()? as i32); - } - GeneratedField::SdpCid => { - if sdp_cid__.is_some() { - return Err(serde::de::Error::duplicate_field("sdpCid")); - } - sdp_cid__ = Some(map_.next_value()?); - } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -33567,8 +32436,6 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { mid: mid__.unwrap_or_default(), cid: cid__.unwrap_or_default(), layers: layers__.unwrap_or_default(), - video_layer_mode: video_layer_mode__.unwrap_or_default(), - sdp_cid: sdp_cid__.unwrap_or_default(), }) } } @@ -36094,115 +34961,8 @@ impl<'de> serde::Deserialize<'de> for TimedVersion { E: serde::de::Error, { match value { - "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), - "ticks" => Ok(GeneratedField::Ticks), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = TimedVersion; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.TimedVersion") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut unix_micro__ = None; - let mut ticks__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::UnixMicro => { - if unix_micro__.is_some() { - return Err(serde::de::Error::duplicate_field("unixMicro")); - } - unix_micro__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::Ticks => { - if ticks__.is_some() { - return Err(serde::de::Error::duplicate_field("ticks")); - } - ticks__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(TimedVersion { - unix_micro: unix_micro__.unwrap_or_default(), - ticks: ticks__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for TokenPagination { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if !self.token.is_empty() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.TokenPagination", len)?; - if !self.token.is_empty() { - struct_ser.serialize_field("token", &self.token)?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for TokenPagination { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "token", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Token, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "token" => Ok(GeneratedField::Token), + "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), + "ticks" => Ok(GeneratedField::Ticks), _ => Ok(GeneratedField::__SkipField__), } } @@ -36212,36 +34972,48 @@ impl<'de> serde::Deserialize<'de> for TokenPagination { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = TokenPagination; + type Value = TimedVersion; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.TokenPagination") + formatter.write_str("struct livekit.TimedVersion") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut token__ = None; + let mut unix_micro__ = None; + let mut ticks__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::Token => { - if token__.is_some() { - return Err(serde::de::Error::duplicate_field("token")); + GeneratedField::UnixMicro => { + if unix_micro__.is_some() { + return Err(serde::de::Error::duplicate_field("unixMicro")); } - token__ = Some(map_.next_value()?); + unix_micro__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::Ticks => { + if ticks__.is_some() { + return Err(serde::de::Error::duplicate_field("ticks")); + } + ticks__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(TokenPagination { - token: token__.unwrap_or_default(), + Ok(TimedVersion { + unix_micro: unix_micro__.unwrap_or_default(), + ticks: ticks__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("livekit.TokenPagination", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) } } impl serde::Serialize for TrackCompositeEgressRequest { @@ -41645,12 +40417,6 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { len += 1; } - if self.spatial_layer != 0 { - len += 1; - } - if !self.rid.is_empty() { - len += 1; - } let mut struct_ser = serializer.serialize_struct("livekit.VideoLayer", len)?; if self.quality != 0 { let v = VideoQuality::try_from(self.quality) @@ -41669,12 +40435,6 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { struct_ser.serialize_field("ssrc", &self.ssrc)?; } - if self.spatial_layer != 0 { - struct_ser.serialize_field("spatialLayer", &self.spatial_layer)?; - } - if !self.rid.is_empty() { - struct_ser.serialize_field("rid", &self.rid)?; - } struct_ser.end() } } @@ -41690,9 +40450,6 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height", "bitrate", "ssrc", - "spatial_layer", - "spatialLayer", - "rid", ]; #[allow(clippy::enum_variant_names)] @@ -41702,8 +40459,6 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Height, Bitrate, Ssrc, - SpatialLayer, - Rid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -41731,8 +40486,6 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height" => Ok(GeneratedField::Height), "bitrate" => Ok(GeneratedField::Bitrate), "ssrc" => Ok(GeneratedField::Ssrc), - "spatialLayer" | "spatial_layer" => Ok(GeneratedField::SpatialLayer), - "rid" => Ok(GeneratedField::Rid), _ => Ok(GeneratedField::__SkipField__), } } @@ -41757,8 +40510,6 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { let mut height__ = None; let mut bitrate__ = None; let mut ssrc__ = None; - let mut spatial_layer__ = None; - let mut rid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Quality => { @@ -41799,20 +40550,6 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } - GeneratedField::SpatialLayer => { - if spatial_layer__.is_some() { - return Err(serde::de::Error::duplicate_field("spatialLayer")); - } - spatial_layer__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::Rid => { - if rid__.is_some() { - return Err(serde::de::Error::duplicate_field("rid")); - } - rid__ = Some(map_.next_value()?); - } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -41824,88 +40561,12 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { height: height__.unwrap_or_default(), bitrate: bitrate__.unwrap_or_default(), ssrc: ssrc__.unwrap_or_default(), - spatial_layer: spatial_layer__.unwrap_or_default(), - rid: rid__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.VideoLayer", FIELDS, GeneratedVisitor) } } -impl serde::Serialize for video_layer::Mode { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - let variant = match self { - Self::Unused => "MODE_UNUSED", - Self::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", - Self::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", - }; - serializer.serialize_str(variant) - } -} -impl<'de> serde::Deserialize<'de> for video_layer::Mode { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "MODE_UNUSED", - "ONE_SPATIAL_LAYER_PER_STREAM", - "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", - ]; - - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = video_layer::Mode; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - fn visit_i64(self, v: i64) -> std::result::Result - where - E: serde::de::Error, - { - i32::try_from(v) - .ok() - .and_then(|x| x.try_into().ok()) - .ok_or_else(|| { - serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) - }) - } - - fn visit_u64(self, v: u64) -> std::result::Result - where - E: serde::de::Error, - { - i32::try_from(v) - .ok() - .and_then(|x| x.try_into().ok()) - .ok_or_else(|| { - serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) - }) - } - - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "MODE_UNUSED" => Ok(video_layer::Mode::Unused), - "ONE_SPATIAL_LAYER_PER_STREAM" => Ok(video_layer::Mode::OneSpatialLayerPerStream), - "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Ok(video_layer::Mode::MultipleSpatialLayersPerStream), - _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), - } - } - } - deserializer.deserialize_any(GeneratedVisitor) - } -} impl serde::Serialize for VideoQuality { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -43132,193 +41793,3 @@ impl<'de> serde::Deserialize<'de> for WorkerStatus { deserializer.deserialize_any(GeneratedVisitor) } } -impl serde::Serialize for WrappedJoinRequest { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - use serde::ser::SerializeStruct; - let mut len = 0; - if self.compression != 0 { - len += 1; - } - if !self.join_request.is_empty() { - len += 1; - } - let mut struct_ser = serializer.serialize_struct("livekit.WrappedJoinRequest", len)?; - if self.compression != 0 { - let v = wrapped_join_request::Compression::try_from(self.compression) - .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.compression)))?; - struct_ser.serialize_field("compression", &v)?; - } - if !self.join_request.is_empty() { - #[allow(clippy::needless_borrow)] - #[allow(clippy::needless_borrows_for_generic_args)] - struct_ser.serialize_field("joinRequest", pbjson::private::base64::encode(&self.join_request).as_str())?; - } - struct_ser.end() - } -} -impl<'de> serde::Deserialize<'de> for WrappedJoinRequest { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "compression", - "join_request", - "joinRequest", - ]; - - #[allow(clippy::enum_variant_names)] - enum GeneratedField { - Compression, - JoinRequest, - __SkipField__, - } - impl<'de> serde::Deserialize<'de> for GeneratedField { - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = GeneratedField; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - #[allow(unused_variables)] - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "compression" => Ok(GeneratedField::Compression), - "joinRequest" | "join_request" => Ok(GeneratedField::JoinRequest), - _ => Ok(GeneratedField::__SkipField__), - } - } - } - deserializer.deserialize_identifier(GeneratedVisitor) - } - } - struct GeneratedVisitor; - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = WrappedJoinRequest; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.WrappedJoinRequest") - } - - fn visit_map(self, mut map_: V) -> std::result::Result - where - V: serde::de::MapAccess<'de>, - { - let mut compression__ = None; - let mut join_request__ = None; - while let Some(k) = map_.next_key()? { - match k { - GeneratedField::Compression => { - if compression__.is_some() { - return Err(serde::de::Error::duplicate_field("compression")); - } - compression__ = Some(map_.next_value::()? as i32); - } - GeneratedField::JoinRequest => { - if join_request__.is_some() { - return Err(serde::de::Error::duplicate_field("joinRequest")); - } - join_request__ = - Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) - ; - } - GeneratedField::__SkipField__ => { - let _ = map_.next_value::()?; - } - } - } - Ok(WrappedJoinRequest { - compression: compression__.unwrap_or_default(), - join_request: join_request__.unwrap_or_default(), - }) - } - } - deserializer.deserialize_struct("livekit.WrappedJoinRequest", FIELDS, GeneratedVisitor) - } -} -impl serde::Serialize for wrapped_join_request::Compression { - #[allow(deprecated)] - fn serialize(&self, serializer: S) -> std::result::Result - where - S: serde::Serializer, - { - let variant = match self { - Self::None => "NONE", - Self::Gzip => "GZIP", - }; - serializer.serialize_str(variant) - } -} -impl<'de> serde::Deserialize<'de> for wrapped_join_request::Compression { - #[allow(deprecated)] - fn deserialize(deserializer: D) -> std::result::Result - where - D: serde::Deserializer<'de>, - { - const FIELDS: &[&str] = &[ - "NONE", - "GZIP", - ]; - - struct GeneratedVisitor; - - impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = wrapped_join_request::Compression; - - fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(formatter, "expected one of: {:?}", &FIELDS) - } - - fn visit_i64(self, v: i64) -> std::result::Result - where - E: serde::de::Error, - { - i32::try_from(v) - .ok() - .and_then(|x| x.try_into().ok()) - .ok_or_else(|| { - serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) - }) - } - - fn visit_u64(self, v: u64) -> std::result::Result - where - E: serde::de::Error, - { - i32::try_from(v) - .ok() - .and_then(|x| x.try_into().ok()) - .ok_or_else(|| { - serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) - }) - } - - fn visit_str(self, value: &str) -> std::result::Result - where - E: serde::de::Error, - { - match value { - "NONE" => Ok(wrapped_join_request::Compression::None), - "GZIP" => Ok(wrapped_join_request::Compression::Gzip), - _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), - } - } - } - deserializer.deserialize_any(GeneratedVisitor) - } -} From 9f1ebe6bcbb10da4a5f46ae0040d7b2906ca6220 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 09:44:14 -0700 Subject: [PATCH 05/19] support UYUV format --- examples/local_video/src/publisher.rs | 68 ++++++++++++++++++--------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index ee130b179..5f3f6763e 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -123,7 +123,7 @@ async fn main() -> Result<()> { let index = CameraIndex::Index(args.camera_index as u32); let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); let mut camera = Camera::new(index, requested)?; - // Try raw YUYV first (cheaper than MJPEG), fall back to MJPEG + // Try raw YUYV first (cheaper than MJPEG), then UYVY, fall back to MJPEG let wanted = CameraFormat::new( Resolution::new(args.width, args.height), FrameFormat::YUYV, @@ -131,13 +131,23 @@ async fn main() -> Result<()> { ); let mut using_fmt = "YUYV"; if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { - let alt = CameraFormat::new( + // Try UYVY as an alternative packed 4:2:2 format + let alt_uyvy = CameraFormat::new( Resolution::new(args.width, args.height), - FrameFormat::MJPEG, + FrameFormat::UYVY, args.fps, ); - using_fmt = "MJPEG"; - let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); + if camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt_uyvy))).is_ok() { + using_fmt = "UYVY"; + } else { + let alt = CameraFormat::new( + Resolution::new(args.width, args.height), + FrameFormat::MJPEG, + args.fps, + ); + using_fmt = "MJPEG"; + let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); + } } camera.open_stream()?; let fmt = camera.camera_format(); @@ -172,6 +182,7 @@ async fn main() -> Result<()> { // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; let is_yuyv = using_fmt == "YUYV"; + let is_uyvy = using_fmt == "UYVY"; // Accurate pacing using absolute schedule (no drift) let mut ticker = tokio::time::interval(Duration::from_secs_f64(1.0 / pace_fps)); @@ -205,26 +216,41 @@ async fn main() -> Result<()> { let t1 = Instant::now(); let (stride_y, stride_u, stride_v) = frame.buffer.strides(); let (data_y, data_u, data_v) = frame.buffer.data_mut(); - // Fast path for YUYV: convert directly to I420 via libyuv - let t2 = if is_yuyv { + // Fast path for YUYV/UYVY: convert directly to I420 via libyuv + let t2 = if is_yuyv || is_uyvy { let src = frame_buf.buffer(); let src_bytes = src.as_ref(); - let src_stride = (width * 2) as i32; // YUYV packed 4:2:2 - let t2_local = t1; // no decode step in YUYV path + let src_stride = (width * 2) as i32; // packed 4:2:2 + let t2_local = t1; // no decode step in packed YUV path unsafe { // returns 0 on success - let _ = yuv_sys::rs_YUY2ToI420( - src_bytes.as_ptr(), - src_stride, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); + if is_yuyv { + let _ = yuv_sys::rs_YUY2ToI420( + src_bytes.as_ptr(), + src_stride, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } else { + let _ = yuv_sys::rs_UYVYToI420( + src_bytes.as_ptr(), + src_stride, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } } t2_local } else { From 1a808e79b496fc9be5fa0debd7a6d0eeaf777ce7 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 12:56:24 -0700 Subject: [PATCH 06/19] update protocol --- livekit-protocol/protocol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livekit-protocol/protocol b/livekit-protocol/protocol index e038e7944..2bc93ddc2 160000 --- a/livekit-protocol/protocol +++ b/livekit-protocol/protocol @@ -1 +1 @@ -Subproject commit e038e7944595dd9a00871ee5ed52ba6062f76c1e +Subproject commit 2bc93ddc27ccfa66ee8d270a1bcd115586fb601d From ae42dfbed88a7cbdfa71b4be2231522a561bff94 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 29 Oct 2025 20:00:12 +0000 Subject: [PATCH 07/19] generated protobuf --- livekit-protocol/src/livekit.rs | 251 +++- livekit-protocol/src/livekit.serde.rs | 1579 ++++++++++++++++++++++++- 2 files changed, 1794 insertions(+), 36 deletions(-) diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index e39604819..676becb62 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -199,6 +199,12 @@ pub struct Pagination { #[prost(int32, tag="2")] pub limit: i32, } +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct TokenPagination { + #[prost(string, tag="1")] + pub token: ::prost::alloc::string::String, +} /// ListUpdate is used for updated APIs where 'repeated string' field is modified. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -206,6 +212,15 @@ pub struct ListUpdate { /// set the field to a new list #[prost(string, repeated, tag="1")] pub set: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// append items to a list, avoiding duplicates + #[prost(string, repeated, tag="2")] + pub add: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// delete items from a list + #[prost(string, repeated, tag="3")] + pub del: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// sets the list to an empty list + #[prost(bool, tag="4")] + pub clear: bool, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -484,6 +499,14 @@ pub struct SimulcastCodecInfo { pub cid: ::prost::alloc::string::String, #[prost(message, repeated, tag="4")] pub layers: ::prost::alloc::vec::Vec, + #[prost(enumeration="video_layer::Mode", tag="5")] + pub video_layer_mode: i32, + /// cid (client side id for track) could be different between + /// signalling (AddTrackRequest) and SDP offer. This field + /// will be populated only if it is different to avoid + /// duplication and keep the representation concise. + #[prost(string, tag="6")] + pub sdp_cid: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -498,20 +521,30 @@ pub struct TrackInfo { pub muted: bool, /// original width of video (unset for audio) /// clients may receive a lower resolution version with simulcast + #[deprecated] #[prost(uint32, tag="5")] pub width: u32, /// original height of video (unset for audio) + #[deprecated] #[prost(uint32, tag="6")] pub height: u32, /// true if track is simulcasted + /// + /// see `video_layer_mode` in `codecs` + #[deprecated] #[prost(bool, tag="7")] pub simulcast: bool, /// true if DTX (Discontinuous Transmission) is disabled for audio + /// + /// deprecated in favor of `audio_features` + #[deprecated] #[prost(bool, tag="8")] pub disable_dtx: bool, /// source of media #[prost(enumeration="TrackSource", tag="9")] pub source: i32, + /// see `codecs` for layers of individual codec + #[deprecated] #[prost(message, repeated, tag="10")] pub layers: ::prost::alloc::vec::Vec, /// mime type of codec @@ -521,6 +554,8 @@ pub struct TrackInfo { pub mid: ::prost::alloc::string::String, #[prost(message, repeated, tag="13")] pub codecs: ::prost::alloc::vec::Vec, + /// deprecated in favor of `audio_features` + #[deprecated] #[prost(bool, tag="14")] pub stereo: bool, /// true if RED (Redundant Encoding) is disabled for audio @@ -553,6 +588,42 @@ pub struct VideoLayer { pub bitrate: u32, #[prost(uint32, tag="5")] pub ssrc: u32, + #[prost(int32, tag="6")] + pub spatial_layer: i32, + #[prost(string, tag="7")] + pub rid: ::prost::alloc::string::String, +} +/// Nested message and enum types in `VideoLayer`. +pub mod video_layer { + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[repr(i32)] + pub enum Mode { + Unused = 0, + OneSpatialLayerPerStream = 1, + MultipleSpatialLayersPerStream = 2, + } + impl Mode { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + Mode::Unused => "MODE_UNUSED", + Mode::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", + Mode::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option { + match value { + "MODE_UNUSED" => Some(Self::Unused), + "ONE_SPATIAL_LAYER_PER_STREAM" => Some(Self::OneSpatialLayerPerStream), + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Some(Self::MultipleSpatialLayersPerStream), + _ => None, + } + } + } } /// new DataPacket API #[allow(clippy::derive_partial_eq_without_eq)] @@ -573,7 +644,7 @@ pub struct DataPacket { /// sid of the user that sent the message #[prost(string, tag="17")] pub participant_sid: ::prost::alloc::string::String, - #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15")] + #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18")] pub value: ::core::option::Option, } /// Nested message and enum types in `DataPacket`. @@ -631,6 +702,50 @@ pub mod data_packet { StreamChunk(super::data_stream::Chunk), #[prost(message, tag="15")] StreamTrailer(super::data_stream::Trailer), + #[prost(message, tag="18")] + EncryptedPacket(super::EncryptedPacket), + } +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct EncryptedPacket { + #[prost(enumeration="encryption::Type", tag="1")] + pub encryption_type: i32, + #[prost(bytes="vec", tag="2")] + pub iv: ::prost::alloc::vec::Vec, + #[prost(uint32, tag="3")] + pub key_index: u32, + /// This is an encrypted EncryptedPacketPayload message representation + #[prost(bytes="vec", tag="4")] + pub encrypted_value: ::prost::alloc::vec::Vec, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct EncryptedPacketPayload { + #[prost(oneof="encrypted_packet_payload::Value", tags="1, 3, 4, 5, 6, 7, 8, 9")] + pub value: ::core::option::Option, +} +/// Nested message and enum types in `EncryptedPacketPayload`. +pub mod encrypted_packet_payload { + #[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Oneof)] + pub enum Value { + #[prost(message, tag="1")] + User(super::UserPacket), + #[prost(message, tag="3")] + ChatMessage(super::ChatMessage), + #[prost(message, tag="4")] + RpcRequest(super::RpcRequest), + #[prost(message, tag="5")] + RpcAck(super::RpcAck), + #[prost(message, tag="6")] + RpcResponse(super::RpcResponse), + #[prost(message, tag="7")] + StreamHeader(super::data_stream::Header), + #[prost(message, tag="8")] + StreamChunk(super::data_stream::Chunk), + #[prost(message, tag="9")] + StreamTrailer(super::data_stream::Trailer), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -675,7 +790,7 @@ pub struct UserPacket { /// topic under which the message was published #[prost(string, optional, tag="4")] pub topic: ::core::option::Option<::prost::alloc::string::String>, - /// Unique ID to indentify the message + /// Unique ID to identify the message #[prost(string, optional, tag="8")] pub id: ::core::option::Option<::prost::alloc::string::String>, /// start and end time allow relating the message to specific media time @@ -898,6 +1013,7 @@ pub mod client_info { UnityWeb = 11, Node = 12, Unreal = 13, + Esp32 = 14, } impl Sdk { /// String value of the enum field names used in the ProtoBuf definition. @@ -920,6 +1036,7 @@ pub mod client_info { Sdk::UnityWeb => "UNITY_WEB", Sdk::Node => "NODE", Sdk::Unreal => "UNREAL", + Sdk::Esp32 => "ESP32", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -939,6 +1056,7 @@ pub mod client_info { "UNITY_WEB" => Some(Self::UnityWeb), "NODE" => Some(Self::Node), "UNREAL" => Some(Self::Unreal), + "ESP32" => Some(Self::Esp32), _ => None, } } @@ -1231,7 +1349,8 @@ pub mod data_stream { /// only populated for finite streams, if it's a stream of unknown size this stays empty #[prost(uint64, optional, tag="5")] pub total_length: ::core::option::Option, - /// defaults to NONE + /// this is set on the DataPacket + #[deprecated] #[prost(enumeration="super::encryption::Type", tag="7")] pub encryption_type: i32, /// user defined attributes map that can carry additional info @@ -1267,7 +1386,8 @@ pub mod data_stream { /// a version indicating that this chunk_index has been retroactively modified and the original one needs to be replaced #[prost(int32, tag="4")] pub version: i32, - /// optional, initialization vector for AES-GCM encryption + /// this is set on the DataPacket + #[deprecated] #[prost(bytes="vec", optional, tag="5")] pub iv: ::core::option::Option<::prost::alloc::vec::Vec>, } @@ -2188,6 +2308,12 @@ pub struct S3Upload { pub secret: ::prost::alloc::string::String, #[prost(string, tag="11")] pub session_token: ::prost::alloc::string::String, + /// ARN of the role to assume for file upload. Egress will make an AssumeRole API call using the provided access_key and secret to assume that role. On LiveKit cloud, this is only available on accounts that have the feature enabled + #[prost(string, tag="12")] + pub assume_role_arn: ::prost::alloc::string::String, + /// ExternalID to use when assuming role for upload + #[prost(string, tag="13")] + pub assume_role_external_id: ::prost::alloc::string::String, #[prost(string, tag="3")] pub region: ::prost::alloc::string::String, #[prost(string, tag="4")] @@ -2874,10 +3000,10 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Message { - /// initial join exchange, for publisher + /// participant offer for publisher #[prost(message, tag="1")] Offer(super::SessionDescription), - /// participant answering publisher offer + /// participant answering subscriber offer #[prost(message, tag="2")] Answer(super::SessionDescription), #[prost(message, tag="3")] @@ -2930,7 +3056,7 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SignalResponse { - #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24")] + #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25")] pub message: ::core::option::Option, } /// Nested message and enum types in `SignalResponse`. @@ -3010,6 +3136,9 @@ pub mod signal_response { /// notify to the participant when they have been moved to a new room #[prost(message, tag="24")] RoomMoved(super::RoomMovedResponse), + /// notify number of required media sections to satisfy subscribed tracks + #[prost(message, tag="25")] + MediaSectionsRequirement(super::MediaSectionsRequirement), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -3019,6 +3148,10 @@ pub struct SimulcastCodec { pub codec: ::prost::alloc::string::String, #[prost(string, tag="2")] pub cid: ::prost::alloc::string::String, + #[prost(message, repeated, tag="4")] + pub layers: ::prost::alloc::vec::Vec, + #[prost(enumeration="video_layer::Mode", tag="5")] + pub video_layer_mode: i32, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -3030,7 +3163,6 @@ pub struct AddTrackRequest { pub name: ::prost::alloc::string::String, #[prost(enumeration="TrackType", tag="3")] pub r#type: i32, - /// to be deprecated in favor of layers #[prost(uint32, tag="4")] pub width: u32, #[prost(uint32, tag="5")] @@ -3434,7 +3566,9 @@ pub struct RoomMovedResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SyncState { - /// last subscribe answer before reconnecting + /// last subscribe/publish answer before reconnecting + /// subscribe answer if using dual peer connection + /// publish answer if using single peer connection #[prost(message, optional, tag="1")] pub answer: ::core::option::Option, #[prost(message, optional, tag="2")] @@ -3443,7 +3577,9 @@ pub struct SyncState { pub publish_tracks: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag="4")] pub data_channels: ::prost::alloc::vec::Vec, - /// last received server side offer before reconnecting + /// last received server side offer/sent client side offer before reconnecting + /// received server side offer if using dual peer connection + /// sent client side offer if using single peer connection #[prost(message, optional, tag="5")] pub offer: ::core::option::Option, #[prost(string, repeated, tag="6")] @@ -3603,6 +3739,92 @@ pub struct TrackSubscribed { #[prost(string, tag="1")] pub track_sid: ::prost::alloc::string::String, } +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct ConnectionSettings { + #[prost(bool, tag="1")] + pub auto_subscribe: bool, + #[prost(bool, tag="2")] + pub adaptive_stream: bool, + #[prost(bool, optional, tag="3")] + pub subscriber_allow_pause: ::core::option::Option, + #[prost(bool, tag="4")] + pub disable_ice_lite: bool, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct JoinRequest { + #[prost(message, optional, tag="1")] + pub client_info: ::core::option::Option, + #[prost(message, optional, tag="2")] + pub connection_settings: ::core::option::Option, + /// if not empty, will overwrite `metadata` in token + #[prost(string, tag="3")] + pub metadata: ::prost::alloc::string::String, + /// will set keys provided via this + /// will overwrite if the same key is in the token + /// will not delete keys from token if there is a key collision and this sets that key to empty value + #[prost(map="string, string", tag="4")] + pub participant_attributes: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, + #[prost(message, repeated, tag="5")] + pub add_track_requests: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag="6")] + pub publisher_offer: ::core::option::Option, + #[prost(bool, tag="7")] + pub reconnect: bool, + #[prost(enumeration="ReconnectReason", tag="8")] + pub reconnect_reason: i32, + #[prost(string, tag="9")] + pub participant_sid: ::prost::alloc::string::String, + #[prost(message, optional, tag="10")] + pub sync_state: ::core::option::Option, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct WrappedJoinRequest { + #[prost(enumeration="wrapped_join_request::Compression", tag="1")] + pub compression: i32, + /// marshalled JoinRequest + potentially compressed + #[prost(bytes="vec", tag="2")] + pub join_request: ::prost::alloc::vec::Vec, +} +/// Nested message and enum types in `WrappedJoinRequest`. +pub mod wrapped_join_request { + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[repr(i32)] + pub enum Compression { + None = 0, + Gzip = 1, + } + impl Compression { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + Compression::None => "NONE", + Compression::Gzip => "GZIP", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option { + match value { + "NONE" => Some(Self::None), + "GZIP" => Some(Self::Gzip), + _ => None, + } + } + } +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct MediaSectionsRequirement { + #[prost(uint32, tag="1")] + pub num_audios: u32, + #[prost(uint32, tag="2")] + pub num_videos: u32, +} #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SignalTarget { @@ -3722,6 +3944,10 @@ pub struct JobState { pub updated_at: i64, #[prost(string, tag="6")] pub participant_identity: ::prost::alloc::string::String, + #[prost(string, tag="7")] + pub worker_id: ::prost::alloc::string::String, + #[prost(string, tag="8")] + pub agent_id: ::prost::alloc::string::String, } /// from Worker to Server #[allow(clippy::derive_partial_eq_without_eq)] @@ -4290,6 +4516,9 @@ pub struct RoomConfiguration { /// limit number of participants that can be in a room, excluding Egress and Ingress participants #[prost(uint32, tag="4")] pub max_participants: u32, + /// metadata of room + #[prost(string, tag="11")] + pub metadata: ::prost::alloc::string::String, /// egress #[prost(message, optional, tag="5")] pub egress: ::core::option::Option, @@ -4751,7 +4980,7 @@ impl IngressVideoEncodingPreset { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WebhookEvent { - /// one of room_started, room_finished, participant_joined, participant_left, + /// one of room_started, room_finished, participant_joined, participant_left, participant_connection_aborted, /// track_published, track_unpublished, egress_started, egress_updated, egress_ended, /// ingress_started, ingress_ended #[prost(string, tag="1")] diff --git a/livekit-protocol/src/livekit.serde.rs b/livekit-protocol/src/livekit.serde.rs index 5c411a433..3c79f6c7a 100644 --- a/livekit-protocol/src/livekit.serde.rs +++ b/livekit-protocol/src/livekit.serde.rs @@ -2848,6 +2848,7 @@ impl serde::Serialize for client_info::Sdk { Self::UnityWeb => "UNITY_WEB", Self::Node => "NODE", Self::Unreal => "UNREAL", + Self::Esp32 => "ESP32", }; serializer.serialize_str(variant) } @@ -2873,6 +2874,7 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB", "NODE", "UNREAL", + "ESP32", ]; struct GeneratedVisitor; @@ -2927,6 +2929,7 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB" => Ok(client_info::Sdk::UnityWeb), "NODE" => Ok(client_info::Sdk::Node), "UNREAL" => Ok(client_info::Sdk::Unreal), + "ESP32" => Ok(client_info::Sdk::Esp32), _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), } } @@ -3353,6 +3356,156 @@ impl<'de> serde::Deserialize<'de> for ConnectionQualityUpdate { deserializer.deserialize_struct("livekit.ConnectionQualityUpdate", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for ConnectionSettings { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.auto_subscribe { + len += 1; + } + if self.adaptive_stream { + len += 1; + } + if self.subscriber_allow_pause.is_some() { + len += 1; + } + if self.disable_ice_lite { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.ConnectionSettings", len)?; + if self.auto_subscribe { + struct_ser.serialize_field("autoSubscribe", &self.auto_subscribe)?; + } + if self.adaptive_stream { + struct_ser.serialize_field("adaptiveStream", &self.adaptive_stream)?; + } + if let Some(v) = self.subscriber_allow_pause.as_ref() { + struct_ser.serialize_field("subscriberAllowPause", v)?; + } + if self.disable_ice_lite { + struct_ser.serialize_field("disableIceLite", &self.disable_ice_lite)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for ConnectionSettings { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "auto_subscribe", + "autoSubscribe", + "adaptive_stream", + "adaptiveStream", + "subscriber_allow_pause", + "subscriberAllowPause", + "disable_ice_lite", + "disableIceLite", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + AutoSubscribe, + AdaptiveStream, + SubscriberAllowPause, + DisableIceLite, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "autoSubscribe" | "auto_subscribe" => Ok(GeneratedField::AutoSubscribe), + "adaptiveStream" | "adaptive_stream" => Ok(GeneratedField::AdaptiveStream), + "subscriberAllowPause" | "subscriber_allow_pause" => Ok(GeneratedField::SubscriberAllowPause), + "disableIceLite" | "disable_ice_lite" => Ok(GeneratedField::DisableIceLite), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = ConnectionSettings; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.ConnectionSettings") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut auto_subscribe__ = None; + let mut adaptive_stream__ = None; + let mut subscriber_allow_pause__ = None; + let mut disable_ice_lite__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::AutoSubscribe => { + if auto_subscribe__.is_some() { + return Err(serde::de::Error::duplicate_field("autoSubscribe")); + } + auto_subscribe__ = Some(map_.next_value()?); + } + GeneratedField::AdaptiveStream => { + if adaptive_stream__.is_some() { + return Err(serde::de::Error::duplicate_field("adaptiveStream")); + } + adaptive_stream__ = Some(map_.next_value()?); + } + GeneratedField::SubscriberAllowPause => { + if subscriber_allow_pause__.is_some() { + return Err(serde::de::Error::duplicate_field("subscriberAllowPause")); + } + subscriber_allow_pause__ = map_.next_value()?; + } + GeneratedField::DisableIceLite => { + if disable_ice_lite__.is_some() { + return Err(serde::de::Error::duplicate_field("disableIceLite")); + } + disable_ice_lite__ = Some(map_.next_value()?); + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(ConnectionSettings { + auto_subscribe: auto_subscribe__.unwrap_or_default(), + adaptive_stream: adaptive_stream__.unwrap_or_default(), + subscriber_allow_pause: subscriber_allow_pause__, + disable_ice_lite: disable_ice_lite__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.ConnectionSettings", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for CreateAgentDispatchRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -5586,6 +5739,9 @@ impl serde::Serialize for DataPacket { data_packet::Value::StreamTrailer(v) => { struct_ser.serialize_field("streamTrailer", v)?; } + data_packet::Value::EncryptedPacket(v) => { + struct_ser.serialize_field("encryptedPacket", v)?; + } } } struct_ser.end() @@ -5626,6 +5782,8 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamChunk", "stream_trailer", "streamTrailer", + "encrypted_packet", + "encryptedPacket", ]; #[allow(clippy::enum_variant_names)] @@ -5647,6 +5805,7 @@ impl<'de> serde::Deserialize<'de> for DataPacket { StreamHeader, StreamChunk, StreamTrailer, + EncryptedPacket, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -5686,6 +5845,7 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), + "encryptedPacket" | "encrypted_packet" => Ok(GeneratedField::EncryptedPacket), _ => Ok(GeneratedField::__SkipField__), } } @@ -5827,6 +5987,13 @@ impl<'de> serde::Deserialize<'de> for DataPacket { return Err(serde::de::Error::duplicate_field("streamTrailer")); } value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::StreamTrailer) +; + } + GeneratedField::EncryptedPacket => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptedPacket")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::EncryptedPacket) ; } GeneratedField::__SkipField__ => { @@ -9211,6 +9378,365 @@ impl<'de> serde::Deserialize<'de> for EncodingOptionsPreset { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for EncryptedPacket { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.encryption_type != 0 { + len += 1; + } + if !self.iv.is_empty() { + len += 1; + } + if self.key_index != 0 { + len += 1; + } + if !self.encrypted_value.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacket", len)?; + if self.encryption_type != 0 { + let v = encryption::Type::try_from(self.encryption_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.encryption_type)))?; + struct_ser.serialize_field("encryptionType", &v)?; + } + if !self.iv.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("iv", pbjson::private::base64::encode(&self.iv).as_str())?; + } + if self.key_index != 0 { + struct_ser.serialize_field("keyIndex", &self.key_index)?; + } + if !self.encrypted_value.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("encryptedValue", pbjson::private::base64::encode(&self.encrypted_value).as_str())?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for EncryptedPacket { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "encryption_type", + "encryptionType", + "iv", + "key_index", + "keyIndex", + "encrypted_value", + "encryptedValue", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + EncryptionType, + Iv, + KeyIndex, + EncryptedValue, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "encryptionType" | "encryption_type" => Ok(GeneratedField::EncryptionType), + "iv" => Ok(GeneratedField::Iv), + "keyIndex" | "key_index" => Ok(GeneratedField::KeyIndex), + "encryptedValue" | "encrypted_value" => Ok(GeneratedField::EncryptedValue), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = EncryptedPacket; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.EncryptedPacket") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut encryption_type__ = None; + let mut iv__ = None; + let mut key_index__ = None; + let mut encrypted_value__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::EncryptionType => { + if encryption_type__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptionType")); + } + encryption_type__ = Some(map_.next_value::()? as i32); + } + GeneratedField::Iv => { + if iv__.is_some() { + return Err(serde::de::Error::duplicate_field("iv")); + } + iv__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::KeyIndex => { + if key_index__.is_some() { + return Err(serde::de::Error::duplicate_field("keyIndex")); + } + key_index__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::EncryptedValue => { + if encrypted_value__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptedValue")); + } + encrypted_value__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(EncryptedPacket { + encryption_type: encryption_type__.unwrap_or_default(), + iv: iv__.unwrap_or_default(), + key_index: key_index__.unwrap_or_default(), + encrypted_value: encrypted_value__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.EncryptedPacket", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for EncryptedPacketPayload { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.value.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacketPayload", len)?; + if let Some(v) = self.value.as_ref() { + match v { + encrypted_packet_payload::Value::User(v) => { + struct_ser.serialize_field("user", v)?; + } + encrypted_packet_payload::Value::ChatMessage(v) => { + struct_ser.serialize_field("chatMessage", v)?; + } + encrypted_packet_payload::Value::RpcRequest(v) => { + struct_ser.serialize_field("rpcRequest", v)?; + } + encrypted_packet_payload::Value::RpcAck(v) => { + struct_ser.serialize_field("rpcAck", v)?; + } + encrypted_packet_payload::Value::RpcResponse(v) => { + struct_ser.serialize_field("rpcResponse", v)?; + } + encrypted_packet_payload::Value::StreamHeader(v) => { + struct_ser.serialize_field("streamHeader", v)?; + } + encrypted_packet_payload::Value::StreamChunk(v) => { + struct_ser.serialize_field("streamChunk", v)?; + } + encrypted_packet_payload::Value::StreamTrailer(v) => { + struct_ser.serialize_field("streamTrailer", v)?; + } + } + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for EncryptedPacketPayload { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "user", + "chat_message", + "chatMessage", + "rpc_request", + "rpcRequest", + "rpc_ack", + "rpcAck", + "rpc_response", + "rpcResponse", + "stream_header", + "streamHeader", + "stream_chunk", + "streamChunk", + "stream_trailer", + "streamTrailer", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + User, + ChatMessage, + RpcRequest, + RpcAck, + RpcResponse, + StreamHeader, + StreamChunk, + StreamTrailer, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "user" => Ok(GeneratedField::User), + "chatMessage" | "chat_message" => Ok(GeneratedField::ChatMessage), + "rpcRequest" | "rpc_request" => Ok(GeneratedField::RpcRequest), + "rpcAck" | "rpc_ack" => Ok(GeneratedField::RpcAck), + "rpcResponse" | "rpc_response" => Ok(GeneratedField::RpcResponse), + "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), + "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), + "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = EncryptedPacketPayload; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.EncryptedPacketPayload") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut value__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::User => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("user")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::User) +; + } + GeneratedField::ChatMessage => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("chatMessage")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::ChatMessage) +; + } + GeneratedField::RpcRequest => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcRequest")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcRequest) +; + } + GeneratedField::RpcAck => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcAck")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcAck) +; + } + GeneratedField::RpcResponse => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcResponse")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcResponse) +; + } + GeneratedField::StreamHeader => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamHeader")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamHeader) +; + } + GeneratedField::StreamChunk => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamChunk")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamChunk) +; + } + GeneratedField::StreamTrailer => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamTrailer")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamTrailer) +; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(EncryptedPacketPayload { + value: value__, + }) + } + } + deserializer.deserialize_struct("livekit.EncryptedPacketPayload", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for Encryption { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -13485,6 +14011,12 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { len += 1; } + if !self.worker_id.is_empty() { + len += 1; + } + if !self.agent_id.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.JobState", len)?; if self.status != 0 { let v = JobStatus::try_from(self.status) @@ -13512,6 +14044,12 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { struct_ser.serialize_field("participantIdentity", &self.participant_identity)?; } + if !self.worker_id.is_empty() { + struct_ser.serialize_field("workerId", &self.worker_id)?; + } + if !self.agent_id.is_empty() { + struct_ser.serialize_field("agentId", &self.agent_id)?; + } struct_ser.end() } } @@ -13532,6 +14070,10 @@ impl<'de> serde::Deserialize<'de> for JobState { "updatedAt", "participant_identity", "participantIdentity", + "worker_id", + "workerId", + "agent_id", + "agentId", ]; #[allow(clippy::enum_variant_names)] @@ -13542,6 +14084,8 @@ impl<'de> serde::Deserialize<'de> for JobState { EndedAt, UpdatedAt, ParticipantIdentity, + WorkerId, + AgentId, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -13570,6 +14114,8 @@ impl<'de> serde::Deserialize<'de> for JobState { "endedAt" | "ended_at" => Ok(GeneratedField::EndedAt), "updatedAt" | "updated_at" => Ok(GeneratedField::UpdatedAt), "participantIdentity" | "participant_identity" => Ok(GeneratedField::ParticipantIdentity), + "workerId" | "worker_id" => Ok(GeneratedField::WorkerId), + "agentId" | "agent_id" => Ok(GeneratedField::AgentId), _ => Ok(GeneratedField::__SkipField__), } } @@ -13595,6 +14141,8 @@ impl<'de> serde::Deserialize<'de> for JobState { let mut ended_at__ = None; let mut updated_at__ = None; let mut participant_identity__ = None; + let mut worker_id__ = None; + let mut agent_id__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Status => { @@ -13639,6 +14187,18 @@ impl<'de> serde::Deserialize<'de> for JobState { } participant_identity__ = Some(map_.next_value()?); } + GeneratedField::WorkerId => { + if worker_id__.is_some() { + return Err(serde::de::Error::duplicate_field("workerId")); + } + worker_id__ = Some(map_.next_value()?); + } + GeneratedField::AgentId => { + if agent_id__.is_some() { + return Err(serde::de::Error::duplicate_field("agentId")); + } + agent_id__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -13651,6 +14211,8 @@ impl<'de> serde::Deserialize<'de> for JobState { ended_at: ended_at__.unwrap_or_default(), updated_at: updated_at__.unwrap_or_default(), participant_identity: participant_identity__.unwrap_or_default(), + worker_id: worker_id__.unwrap_or_default(), + agent_id: agent_id__.unwrap_or_default(), }) } } @@ -13904,6 +14466,266 @@ impl<'de> serde::Deserialize<'de> for JobType { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for JoinRequest { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.client_info.is_some() { + len += 1; + } + if self.connection_settings.is_some() { + len += 1; + } + if !self.metadata.is_empty() { + len += 1; + } + if !self.participant_attributes.is_empty() { + len += 1; + } + if !self.add_track_requests.is_empty() { + len += 1; + } + if self.publisher_offer.is_some() { + len += 1; + } + if self.reconnect { + len += 1; + } + if self.reconnect_reason != 0 { + len += 1; + } + if !self.participant_sid.is_empty() { + len += 1; + } + if self.sync_state.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.JoinRequest", len)?; + if let Some(v) = self.client_info.as_ref() { + struct_ser.serialize_field("clientInfo", v)?; + } + if let Some(v) = self.connection_settings.as_ref() { + struct_ser.serialize_field("connectionSettings", v)?; + } + if !self.metadata.is_empty() { + struct_ser.serialize_field("metadata", &self.metadata)?; + } + if !self.participant_attributes.is_empty() { + struct_ser.serialize_field("participantAttributes", &self.participant_attributes)?; + } + if !self.add_track_requests.is_empty() { + struct_ser.serialize_field("addTrackRequests", &self.add_track_requests)?; + } + if let Some(v) = self.publisher_offer.as_ref() { + struct_ser.serialize_field("publisherOffer", v)?; + } + if self.reconnect { + struct_ser.serialize_field("reconnect", &self.reconnect)?; + } + if self.reconnect_reason != 0 { + let v = ReconnectReason::try_from(self.reconnect_reason) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.reconnect_reason)))?; + struct_ser.serialize_field("reconnectReason", &v)?; + } + if !self.participant_sid.is_empty() { + struct_ser.serialize_field("participantSid", &self.participant_sid)?; + } + if let Some(v) = self.sync_state.as_ref() { + struct_ser.serialize_field("syncState", v)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for JoinRequest { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "client_info", + "clientInfo", + "connection_settings", + "connectionSettings", + "metadata", + "participant_attributes", + "participantAttributes", + "add_track_requests", + "addTrackRequests", + "publisher_offer", + "publisherOffer", + "reconnect", + "reconnect_reason", + "reconnectReason", + "participant_sid", + "participantSid", + "sync_state", + "syncState", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + ClientInfo, + ConnectionSettings, + Metadata, + ParticipantAttributes, + AddTrackRequests, + PublisherOffer, + Reconnect, + ReconnectReason, + ParticipantSid, + SyncState, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "clientInfo" | "client_info" => Ok(GeneratedField::ClientInfo), + "connectionSettings" | "connection_settings" => Ok(GeneratedField::ConnectionSettings), + "metadata" => Ok(GeneratedField::Metadata), + "participantAttributes" | "participant_attributes" => Ok(GeneratedField::ParticipantAttributes), + "addTrackRequests" | "add_track_requests" => Ok(GeneratedField::AddTrackRequests), + "publisherOffer" | "publisher_offer" => Ok(GeneratedField::PublisherOffer), + "reconnect" => Ok(GeneratedField::Reconnect), + "reconnectReason" | "reconnect_reason" => Ok(GeneratedField::ReconnectReason), + "participantSid" | "participant_sid" => Ok(GeneratedField::ParticipantSid), + "syncState" | "sync_state" => Ok(GeneratedField::SyncState), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = JoinRequest; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.JoinRequest") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut client_info__ = None; + let mut connection_settings__ = None; + let mut metadata__ = None; + let mut participant_attributes__ = None; + let mut add_track_requests__ = None; + let mut publisher_offer__ = None; + let mut reconnect__ = None; + let mut reconnect_reason__ = None; + let mut participant_sid__ = None; + let mut sync_state__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::ClientInfo => { + if client_info__.is_some() { + return Err(serde::de::Error::duplicate_field("clientInfo")); + } + client_info__ = map_.next_value()?; + } + GeneratedField::ConnectionSettings => { + if connection_settings__.is_some() { + return Err(serde::de::Error::duplicate_field("connectionSettings")); + } + connection_settings__ = map_.next_value()?; + } + GeneratedField::Metadata => { + if metadata__.is_some() { + return Err(serde::de::Error::duplicate_field("metadata")); + } + metadata__ = Some(map_.next_value()?); + } + GeneratedField::ParticipantAttributes => { + if participant_attributes__.is_some() { + return Err(serde::de::Error::duplicate_field("participantAttributes")); + } + participant_attributes__ = Some( + map_.next_value::>()? + ); + } + GeneratedField::AddTrackRequests => { + if add_track_requests__.is_some() { + return Err(serde::de::Error::duplicate_field("addTrackRequests")); + } + add_track_requests__ = Some(map_.next_value()?); + } + GeneratedField::PublisherOffer => { + if publisher_offer__.is_some() { + return Err(serde::de::Error::duplicate_field("publisherOffer")); + } + publisher_offer__ = map_.next_value()?; + } + GeneratedField::Reconnect => { + if reconnect__.is_some() { + return Err(serde::de::Error::duplicate_field("reconnect")); + } + reconnect__ = Some(map_.next_value()?); + } + GeneratedField::ReconnectReason => { + if reconnect_reason__.is_some() { + return Err(serde::de::Error::duplicate_field("reconnectReason")); + } + reconnect_reason__ = Some(map_.next_value::()? as i32); + } + GeneratedField::ParticipantSid => { + if participant_sid__.is_some() { + return Err(serde::de::Error::duplicate_field("participantSid")); + } + participant_sid__ = Some(map_.next_value()?); + } + GeneratedField::SyncState => { + if sync_state__.is_some() { + return Err(serde::de::Error::duplicate_field("syncState")); + } + sync_state__ = map_.next_value()?; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(JoinRequest { + client_info: client_info__, + connection_settings: connection_settings__, + metadata: metadata__.unwrap_or_default(), + participant_attributes: participant_attributes__.unwrap_or_default(), + add_track_requests: add_track_requests__.unwrap_or_default(), + publisher_offer: publisher_offer__, + reconnect: reconnect__.unwrap_or_default(), + reconnect_reason: reconnect_reason__.unwrap_or_default(), + participant_sid: participant_sid__.unwrap_or_default(), + sync_state: sync_state__, + }) + } + } + deserializer.deserialize_struct("livekit.JoinRequest", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for JoinResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -16384,10 +17206,28 @@ impl serde::Serialize for ListUpdate { if !self.set.is_empty() { len += 1; } + if !self.add.is_empty() { + len += 1; + } + if !self.del.is_empty() { + len += 1; + } + if self.clear { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.ListUpdate", len)?; if !self.set.is_empty() { struct_ser.serialize_field("set", &self.set)?; } + if !self.add.is_empty() { + struct_ser.serialize_field("add", &self.add)?; + } + if !self.del.is_empty() { + struct_ser.serialize_field("del", &self.del)?; + } + if self.clear { + struct_ser.serialize_field("clear", &self.clear)?; + } struct_ser.end() } } @@ -16399,11 +17239,17 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { const FIELDS: &[&str] = &[ "set", + "add", + "del", + "clear", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Set, + Add, + Del, + Clear, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -16427,6 +17273,9 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { match value { "set" => Ok(GeneratedField::Set), + "add" => Ok(GeneratedField::Add), + "del" => Ok(GeneratedField::Del), + "clear" => Ok(GeneratedField::Clear), _ => Ok(GeneratedField::__SkipField__), } } @@ -16447,6 +17296,9 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { V: serde::de::MapAccess<'de>, { let mut set__ = None; + let mut add__ = None; + let mut del__ = None; + let mut clear__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Set => { @@ -16455,6 +17307,24 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } set__ = Some(map_.next_value()?); } + GeneratedField::Add => { + if add__.is_some() { + return Err(serde::de::Error::duplicate_field("add")); + } + add__ = Some(map_.next_value()?); + } + GeneratedField::Del => { + if del__.is_some() { + return Err(serde::de::Error::duplicate_field("del")); + } + del__ = Some(map_.next_value()?); + } + GeneratedField::Clear => { + if clear__.is_some() { + return Err(serde::de::Error::duplicate_field("clear")); + } + clear__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -16462,12 +17332,133 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } Ok(ListUpdate { set: set__.unwrap_or_default(), + add: add__.unwrap_or_default(), + del: del__.unwrap_or_default(), + clear: clear__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.ListUpdate", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for MediaSectionsRequirement { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.num_audios != 0 { + len += 1; + } + if self.num_videos != 0 { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.MediaSectionsRequirement", len)?; + if self.num_audios != 0 { + struct_ser.serialize_field("numAudios", &self.num_audios)?; + } + if self.num_videos != 0 { + struct_ser.serialize_field("numVideos", &self.num_videos)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for MediaSectionsRequirement { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "num_audios", + "numAudios", + "num_videos", + "numVideos", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + NumAudios, + NumVideos, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "numAudios" | "num_audios" => Ok(GeneratedField::NumAudios), + "numVideos" | "num_videos" => Ok(GeneratedField::NumVideos), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = MediaSectionsRequirement; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.MediaSectionsRequirement") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut num_audios__ = None; + let mut num_videos__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::NumAudios => { + if num_audios__.is_some() { + return Err(serde::de::Error::duplicate_field("numAudios")); + } + num_audios__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::NumVideos => { + if num_videos__.is_some() { + return Err(serde::de::Error::duplicate_field("numVideos")); + } + num_videos__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(MediaSectionsRequirement { + num_audios: num_audios__.unwrap_or_default(), + num_videos: num_videos__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.MediaSectionsRequirement", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for MetricLabel { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -23352,6 +24343,9 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { len += 1; } + if !self.metadata.is_empty() { + len += 1; + } if self.egress.is_some() { len += 1; } @@ -23380,6 +24374,9 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { struct_ser.serialize_field("maxParticipants", &self.max_participants)?; } + if !self.metadata.is_empty() { + struct_ser.serialize_field("metadata", &self.metadata)?; + } if let Some(v) = self.egress.as_ref() { struct_ser.serialize_field("egress", v)?; } @@ -23412,6 +24409,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "departureTimeout", "max_participants", "maxParticipants", + "metadata", "egress", "min_playout_delay", "minPlayoutDelay", @@ -23428,6 +24426,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { EmptyTimeout, DepartureTimeout, MaxParticipants, + Metadata, Egress, MinPlayoutDelay, MaxPlayoutDelay, @@ -23459,6 +24458,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "emptyTimeout" | "empty_timeout" => Ok(GeneratedField::EmptyTimeout), "departureTimeout" | "departure_timeout" => Ok(GeneratedField::DepartureTimeout), "maxParticipants" | "max_participants" => Ok(GeneratedField::MaxParticipants), + "metadata" => Ok(GeneratedField::Metadata), "egress" => Ok(GeneratedField::Egress), "minPlayoutDelay" | "min_playout_delay" => Ok(GeneratedField::MinPlayoutDelay), "maxPlayoutDelay" | "max_playout_delay" => Ok(GeneratedField::MaxPlayoutDelay), @@ -23487,6 +24487,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { let mut empty_timeout__ = None; let mut departure_timeout__ = None; let mut max_participants__ = None; + let mut metadata__ = None; let mut egress__ = None; let mut min_playout_delay__ = None; let mut max_playout_delay__ = None; @@ -23524,6 +24525,12 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } + GeneratedField::Metadata => { + if metadata__.is_some() { + return Err(serde::de::Error::duplicate_field("metadata")); + } + metadata__ = Some(map_.next_value()?); + } GeneratedField::Egress => { if egress__.is_some() { return Err(serde::de::Error::duplicate_field("egress")); @@ -23568,6 +24575,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { empty_timeout: empty_timeout__.unwrap_or_default(), departure_timeout: departure_timeout__.unwrap_or_default(), max_participants: max_participants__.unwrap_or_default(), + metadata: metadata__.unwrap_or_default(), egress: egress__, min_playout_delay: min_playout_delay__.unwrap_or_default(), max_playout_delay: max_playout_delay__.unwrap_or_default(), @@ -24604,6 +25612,12 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { len += 1; } + if !self.assume_role_arn.is_empty() { + len += 1; + } + if !self.assume_role_external_id.is_empty() { + len += 1; + } if !self.region.is_empty() { len += 1; } @@ -24638,6 +25652,12 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { struct_ser.serialize_field("sessionToken", &self.session_token)?; } + if !self.assume_role_arn.is_empty() { + struct_ser.serialize_field("assumeRoleArn", &self.assume_role_arn)?; + } + if !self.assume_role_external_id.is_empty() { + struct_ser.serialize_field("assumeRoleExternalId", &self.assume_role_external_id)?; + } if !self.region.is_empty() { struct_ser.serialize_field("region", &self.region)?; } @@ -24677,6 +25697,10 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "secret", "session_token", "sessionToken", + "assume_role_arn", + "assumeRoleArn", + "assume_role_external_id", + "assumeRoleExternalId", "region", "endpoint", "bucket", @@ -24694,6 +25718,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { AccessKey, Secret, SessionToken, + AssumeRoleArn, + AssumeRoleExternalId, Region, Endpoint, Bucket, @@ -24727,6 +25753,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "accessKey" | "access_key" => Ok(GeneratedField::AccessKey), "secret" => Ok(GeneratedField::Secret), "sessionToken" | "session_token" => Ok(GeneratedField::SessionToken), + "assumeRoleArn" | "assume_role_arn" => Ok(GeneratedField::AssumeRoleArn), + "assumeRoleExternalId" | "assume_role_external_id" => Ok(GeneratedField::AssumeRoleExternalId), "region" => Ok(GeneratedField::Region), "endpoint" => Ok(GeneratedField::Endpoint), "bucket" => Ok(GeneratedField::Bucket), @@ -24757,6 +25785,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { let mut access_key__ = None; let mut secret__ = None; let mut session_token__ = None; + let mut assume_role_arn__ = None; + let mut assume_role_external_id__ = None; let mut region__ = None; let mut endpoint__ = None; let mut bucket__ = None; @@ -24785,6 +25815,18 @@ impl<'de> serde::Deserialize<'de> for S3Upload { } session_token__ = Some(map_.next_value()?); } + GeneratedField::AssumeRoleArn => { + if assume_role_arn__.is_some() { + return Err(serde::de::Error::duplicate_field("assumeRoleArn")); + } + assume_role_arn__ = Some(map_.next_value()?); + } + GeneratedField::AssumeRoleExternalId => { + if assume_role_external_id__.is_some() { + return Err(serde::de::Error::duplicate_field("assumeRoleExternalId")); + } + assume_role_external_id__ = Some(map_.next_value()?); + } GeneratedField::Region => { if region__.is_some() { return Err(serde::de::Error::duplicate_field("region")); @@ -24844,6 +25886,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { access_key: access_key__.unwrap_or_default(), secret: secret__.unwrap_or_default(), session_token: session_token__.unwrap_or_default(), + assume_role_arn: assume_role_arn__.unwrap_or_default(), + assume_role_external_id: assume_role_external_id__.unwrap_or_default(), region: region__.unwrap_or_default(), endpoint: endpoint__.unwrap_or_default(), bucket: bucket__.unwrap_or_default(), @@ -31459,6 +32503,9 @@ impl serde::Serialize for SignalResponse { signal_response::Message::RoomMoved(v) => { struct_ser.serialize_field("roomMoved", v)?; } + signal_response::Message::MediaSectionsRequirement(v) => { + struct_ser.serialize_field("mediaSectionsRequirement", v)?; + } } } struct_ser.end() @@ -31508,6 +32555,8 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "trackSubscribed", "room_moved", "roomMoved", + "media_sections_requirement", + "mediaSectionsRequirement", ]; #[allow(clippy::enum_variant_names)] @@ -31535,6 +32584,7 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { RequestResponse, TrackSubscribed, RoomMoved, + MediaSectionsRequirement, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -31580,6 +32630,7 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "requestResponse" | "request_response" => Ok(GeneratedField::RequestResponse), "trackSubscribed" | "track_subscribed" => Ok(GeneratedField::TrackSubscribed), "roomMoved" | "room_moved" => Ok(GeneratedField::RoomMoved), + "mediaSectionsRequirement" | "media_sections_requirement" => Ok(GeneratedField::MediaSectionsRequirement), _ => Ok(GeneratedField::__SkipField__), } } @@ -31759,6 +32810,13 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { return Err(serde::de::Error::duplicate_field("roomMoved")); } message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::RoomMoved) +; + } + GeneratedField::MediaSectionsRequirement => { + if message__.is_some() { + return Err(serde::de::Error::duplicate_field("mediaSectionsRequirement")); + } + message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::MediaSectionsRequirement) ; } GeneratedField::__SkipField__ => { @@ -32197,6 +33255,12 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { len += 1; } + if !self.layers.is_empty() { + len += 1; + } + if self.video_layer_mode != 0 { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodec", len)?; if !self.codec.is_empty() { struct_ser.serialize_field("codec", &self.codec)?; @@ -32204,6 +33268,14 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { struct_ser.serialize_field("cid", &self.cid)?; } + if !self.layers.is_empty() { + struct_ser.serialize_field("layers", &self.layers)?; + } + if self.video_layer_mode != 0 { + let v = video_layer::Mode::try_from(self.video_layer_mode) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; + struct_ser.serialize_field("videoLayerMode", &v)?; + } struct_ser.end() } } @@ -32216,12 +33288,17 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { const FIELDS: &[&str] = &[ "codec", "cid", + "layers", + "video_layer_mode", + "videoLayerMode", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Codec, Cid, + Layers, + VideoLayerMode, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -32246,6 +33323,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { match value { "codec" => Ok(GeneratedField::Codec), "cid" => Ok(GeneratedField::Cid), + "layers" => Ok(GeneratedField::Layers), + "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), _ => Ok(GeneratedField::__SkipField__), } } @@ -32267,6 +33346,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { { let mut codec__ = None; let mut cid__ = None; + let mut layers__ = None; + let mut video_layer_mode__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Codec => { @@ -32281,6 +33362,18 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { } cid__ = Some(map_.next_value()?); } + GeneratedField::Layers => { + if layers__.is_some() { + return Err(serde::de::Error::duplicate_field("layers")); + } + layers__ = Some(map_.next_value()?); + } + GeneratedField::VideoLayerMode => { + if video_layer_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("videoLayerMode")); + } + video_layer_mode__ = Some(map_.next_value::()? as i32); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -32289,6 +33382,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { Ok(SimulcastCodec { codec: codec__.unwrap_or_default(), cid: cid__.unwrap_or_default(), + layers: layers__.unwrap_or_default(), + video_layer_mode: video_layer_mode__.unwrap_or_default(), }) } } @@ -32315,6 +33410,12 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { len += 1; } + if self.video_layer_mode != 0 { + len += 1; + } + if !self.sdp_cid.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodecInfo", len)?; if !self.mime_type.is_empty() { struct_ser.serialize_field("mimeType", &self.mime_type)?; @@ -32328,6 +33429,14 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { struct_ser.serialize_field("layers", &self.layers)?; } + if self.video_layer_mode != 0 { + let v = video_layer::Mode::try_from(self.video_layer_mode) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; + struct_ser.serialize_field("videoLayerMode", &v)?; + } + if !self.sdp_cid.is_empty() { + struct_ser.serialize_field("sdpCid", &self.sdp_cid)?; + } struct_ser.end() } } @@ -32343,6 +33452,10 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid", "cid", "layers", + "video_layer_mode", + "videoLayerMode", + "sdp_cid", + "sdpCid", ]; #[allow(clippy::enum_variant_names)] @@ -32351,6 +33464,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { Mid, Cid, Layers, + VideoLayerMode, + SdpCid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -32377,6 +33492,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid" => Ok(GeneratedField::Mid), "cid" => Ok(GeneratedField::Cid), "layers" => Ok(GeneratedField::Layers), + "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), + "sdpCid" | "sdp_cid" => Ok(GeneratedField::SdpCid), _ => Ok(GeneratedField::__SkipField__), } } @@ -32400,6 +33517,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { let mut mid__ = None; let mut cid__ = None; let mut layers__ = None; + let mut video_layer_mode__ = None; + let mut sdp_cid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::MimeType => { @@ -32426,6 +33545,18 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { } layers__ = Some(map_.next_value()?); } + GeneratedField::VideoLayerMode => { + if video_layer_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("videoLayerMode")); + } + video_layer_mode__ = Some(map_.next_value::()? as i32); + } + GeneratedField::SdpCid => { + if sdp_cid__.is_some() { + return Err(serde::de::Error::duplicate_field("sdpCid")); + } + sdp_cid__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -32436,6 +33567,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { mid: mid__.unwrap_or_default(), cid: cid__.unwrap_or_default(), layers: layers__.unwrap_or_default(), + video_layer_mode: video_layer_mode__.unwrap_or_default(), + sdp_cid: sdp_cid__.unwrap_or_default(), }) } } @@ -34961,8 +36094,115 @@ impl<'de> serde::Deserialize<'de> for TimedVersion { E: serde::de::Error, { match value { - "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), - "ticks" => Ok(GeneratedField::Ticks), + "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), + "ticks" => Ok(GeneratedField::Ticks), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = TimedVersion; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.TimedVersion") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut unix_micro__ = None; + let mut ticks__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::UnixMicro => { + if unix_micro__.is_some() { + return Err(serde::de::Error::duplicate_field("unixMicro")); + } + unix_micro__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::Ticks => { + if ticks__.is_some() { + return Err(serde::de::Error::duplicate_field("ticks")); + } + ticks__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(TimedVersion { + unix_micro: unix_micro__.unwrap_or_default(), + ticks: ticks__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for TokenPagination { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if !self.token.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.TokenPagination", len)?; + if !self.token.is_empty() { + struct_ser.serialize_field("token", &self.token)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for TokenPagination { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "token", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Token, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "token" => Ok(GeneratedField::Token), _ => Ok(GeneratedField::__SkipField__), } } @@ -34972,48 +36212,36 @@ impl<'de> serde::Deserialize<'de> for TimedVersion { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = TimedVersion; + type Value = TokenPagination; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.TimedVersion") + formatter.write_str("struct livekit.TokenPagination") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut unix_micro__ = None; - let mut ticks__ = None; + let mut token__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::UnixMicro => { - if unix_micro__.is_some() { - return Err(serde::de::Error::duplicate_field("unixMicro")); - } - unix_micro__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::Ticks => { - if ticks__.is_some() { - return Err(serde::de::Error::duplicate_field("ticks")); + GeneratedField::Token => { + if token__.is_some() { + return Err(serde::de::Error::duplicate_field("token")); } - ticks__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; + token__ = Some(map_.next_value()?); } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(TimedVersion { - unix_micro: unix_micro__.unwrap_or_default(), - ticks: ticks__.unwrap_or_default(), + Ok(TokenPagination { + token: token__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("livekit.TokenPagination", FIELDS, GeneratedVisitor) } } impl serde::Serialize for TrackCompositeEgressRequest { @@ -40417,6 +41645,12 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { len += 1; } + if self.spatial_layer != 0 { + len += 1; + } + if !self.rid.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.VideoLayer", len)?; if self.quality != 0 { let v = VideoQuality::try_from(self.quality) @@ -40435,6 +41669,12 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { struct_ser.serialize_field("ssrc", &self.ssrc)?; } + if self.spatial_layer != 0 { + struct_ser.serialize_field("spatialLayer", &self.spatial_layer)?; + } + if !self.rid.is_empty() { + struct_ser.serialize_field("rid", &self.rid)?; + } struct_ser.end() } } @@ -40450,6 +41690,9 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height", "bitrate", "ssrc", + "spatial_layer", + "spatialLayer", + "rid", ]; #[allow(clippy::enum_variant_names)] @@ -40459,6 +41702,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Height, Bitrate, Ssrc, + SpatialLayer, + Rid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -40486,6 +41731,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height" => Ok(GeneratedField::Height), "bitrate" => Ok(GeneratedField::Bitrate), "ssrc" => Ok(GeneratedField::Ssrc), + "spatialLayer" | "spatial_layer" => Ok(GeneratedField::SpatialLayer), + "rid" => Ok(GeneratedField::Rid), _ => Ok(GeneratedField::__SkipField__), } } @@ -40510,6 +41757,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { let mut height__ = None; let mut bitrate__ = None; let mut ssrc__ = None; + let mut spatial_layer__ = None; + let mut rid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Quality => { @@ -40550,6 +41799,20 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } + GeneratedField::SpatialLayer => { + if spatial_layer__.is_some() { + return Err(serde::de::Error::duplicate_field("spatialLayer")); + } + spatial_layer__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::Rid => { + if rid__.is_some() { + return Err(serde::de::Error::duplicate_field("rid")); + } + rid__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -40561,12 +41824,88 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { height: height__.unwrap_or_default(), bitrate: bitrate__.unwrap_or_default(), ssrc: ssrc__.unwrap_or_default(), + spatial_layer: spatial_layer__.unwrap_or_default(), + rid: rid__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.VideoLayer", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for video_layer::Mode { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + let variant = match self { + Self::Unused => "MODE_UNUSED", + Self::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", + Self::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + }; + serializer.serialize_str(variant) + } +} +impl<'de> serde::Deserialize<'de> for video_layer::Mode { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "MODE_UNUSED", + "ONE_SPATIAL_LAYER_PER_STREAM", + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + ]; + + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = video_layer::Mode; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + fn visit_i64(self, v: i64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) + }) + } + + fn visit_u64(self, v: u64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) + }) + } + + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "MODE_UNUSED" => Ok(video_layer::Mode::Unused), + "ONE_SPATIAL_LAYER_PER_STREAM" => Ok(video_layer::Mode::OneSpatialLayerPerStream), + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Ok(video_layer::Mode::MultipleSpatialLayersPerStream), + _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), + } + } + } + deserializer.deserialize_any(GeneratedVisitor) + } +} impl serde::Serialize for VideoQuality { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -41793,3 +43132,193 @@ impl<'de> serde::Deserialize<'de> for WorkerStatus { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for WrappedJoinRequest { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.compression != 0 { + len += 1; + } + if !self.join_request.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.WrappedJoinRequest", len)?; + if self.compression != 0 { + let v = wrapped_join_request::Compression::try_from(self.compression) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.compression)))?; + struct_ser.serialize_field("compression", &v)?; + } + if !self.join_request.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("joinRequest", pbjson::private::base64::encode(&self.join_request).as_str())?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for WrappedJoinRequest { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "compression", + "join_request", + "joinRequest", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Compression, + JoinRequest, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "compression" => Ok(GeneratedField::Compression), + "joinRequest" | "join_request" => Ok(GeneratedField::JoinRequest), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = WrappedJoinRequest; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.WrappedJoinRequest") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut compression__ = None; + let mut join_request__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::Compression => { + if compression__.is_some() { + return Err(serde::de::Error::duplicate_field("compression")); + } + compression__ = Some(map_.next_value::()? as i32); + } + GeneratedField::JoinRequest => { + if join_request__.is_some() { + return Err(serde::de::Error::duplicate_field("joinRequest")); + } + join_request__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(WrappedJoinRequest { + compression: compression__.unwrap_or_default(), + join_request: join_request__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.WrappedJoinRequest", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for wrapped_join_request::Compression { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + let variant = match self { + Self::None => "NONE", + Self::Gzip => "GZIP", + }; + serializer.serialize_str(variant) + } +} +impl<'de> serde::Deserialize<'de> for wrapped_join_request::Compression { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "NONE", + "GZIP", + ]; + + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = wrapped_join_request::Compression; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + fn visit_i64(self, v: i64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) + }) + } + + fn visit_u64(self, v: u64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) + }) + } + + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "NONE" => Ok(wrapped_join_request::Compression::None), + "GZIP" => Ok(wrapped_join_request::Compression::Gzip), + _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), + } + } + } + deserializer.deserialize_any(GeneratedVisitor) + } +} From 58382963f51446050f8651b57f67c47798f2f5a9 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 22:25:04 -0700 Subject: [PATCH 08/19] remove UYVY --- examples/local_video/src/publisher.rs | 68 +- livekit-protocol/src/livekit.rs | 251 +++- livekit-protocol/src/livekit.serde.rs | 1579 ++++++++++++++++++++++++- 3 files changed, 1815 insertions(+), 83 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 5f3f6763e..ee130b179 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -123,7 +123,7 @@ async fn main() -> Result<()> { let index = CameraIndex::Index(args.camera_index as u32); let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); let mut camera = Camera::new(index, requested)?; - // Try raw YUYV first (cheaper than MJPEG), then UYVY, fall back to MJPEG + // Try raw YUYV first (cheaper than MJPEG), fall back to MJPEG let wanted = CameraFormat::new( Resolution::new(args.width, args.height), FrameFormat::YUYV, @@ -131,23 +131,13 @@ async fn main() -> Result<()> { ); let mut using_fmt = "YUYV"; if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { - // Try UYVY as an alternative packed 4:2:2 format - let alt_uyvy = CameraFormat::new( + let alt = CameraFormat::new( Resolution::new(args.width, args.height), - FrameFormat::UYVY, + FrameFormat::MJPEG, args.fps, ); - if camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt_uyvy))).is_ok() { - using_fmt = "UYVY"; - } else { - let alt = CameraFormat::new( - Resolution::new(args.width, args.height), - FrameFormat::MJPEG, - args.fps, - ); - using_fmt = "MJPEG"; - let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); - } + using_fmt = "MJPEG"; + let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); } camera.open_stream()?; let fmt = camera.camera_format(); @@ -182,7 +172,6 @@ async fn main() -> Result<()> { // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; let is_yuyv = using_fmt == "YUYV"; - let is_uyvy = using_fmt == "UYVY"; // Accurate pacing using absolute schedule (no drift) let mut ticker = tokio::time::interval(Duration::from_secs_f64(1.0 / pace_fps)); @@ -216,41 +205,26 @@ async fn main() -> Result<()> { let t1 = Instant::now(); let (stride_y, stride_u, stride_v) = frame.buffer.strides(); let (data_y, data_u, data_v) = frame.buffer.data_mut(); - // Fast path for YUYV/UYVY: convert directly to I420 via libyuv - let t2 = if is_yuyv || is_uyvy { + // Fast path for YUYV: convert directly to I420 via libyuv + let t2 = if is_yuyv { let src = frame_buf.buffer(); let src_bytes = src.as_ref(); - let src_stride = (width * 2) as i32; // packed 4:2:2 - let t2_local = t1; // no decode step in packed YUV path + let src_stride = (width * 2) as i32; // YUYV packed 4:2:2 + let t2_local = t1; // no decode step in YUYV path unsafe { // returns 0 on success - if is_yuyv { - let _ = yuv_sys::rs_YUY2ToI420( - src_bytes.as_ptr(), - src_stride, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } else { - let _ = yuv_sys::rs_UYVYToI420( - src_bytes.as_ptr(), - src_stride, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } + let _ = yuv_sys::rs_YUY2ToI420( + src_bytes.as_ptr(), + src_stride, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); } t2_local } else { diff --git a/livekit-protocol/src/livekit.rs b/livekit-protocol/src/livekit.rs index e39604819..676becb62 100644 --- a/livekit-protocol/src/livekit.rs +++ b/livekit-protocol/src/livekit.rs @@ -199,6 +199,12 @@ pub struct Pagination { #[prost(int32, tag="2")] pub limit: i32, } +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct TokenPagination { + #[prost(string, tag="1")] + pub token: ::prost::alloc::string::String, +} /// ListUpdate is used for updated APIs where 'repeated string' field is modified. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -206,6 +212,15 @@ pub struct ListUpdate { /// set the field to a new list #[prost(string, repeated, tag="1")] pub set: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// append items to a list, avoiding duplicates + #[prost(string, repeated, tag="2")] + pub add: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// delete items from a list + #[prost(string, repeated, tag="3")] + pub del: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, + /// sets the list to an empty list + #[prost(bool, tag="4")] + pub clear: bool, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -484,6 +499,14 @@ pub struct SimulcastCodecInfo { pub cid: ::prost::alloc::string::String, #[prost(message, repeated, tag="4")] pub layers: ::prost::alloc::vec::Vec, + #[prost(enumeration="video_layer::Mode", tag="5")] + pub video_layer_mode: i32, + /// cid (client side id for track) could be different between + /// signalling (AddTrackRequest) and SDP offer. This field + /// will be populated only if it is different to avoid + /// duplication and keep the representation concise. + #[prost(string, tag="6")] + pub sdp_cid: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -498,20 +521,30 @@ pub struct TrackInfo { pub muted: bool, /// original width of video (unset for audio) /// clients may receive a lower resolution version with simulcast + #[deprecated] #[prost(uint32, tag="5")] pub width: u32, /// original height of video (unset for audio) + #[deprecated] #[prost(uint32, tag="6")] pub height: u32, /// true if track is simulcasted + /// + /// see `video_layer_mode` in `codecs` + #[deprecated] #[prost(bool, tag="7")] pub simulcast: bool, /// true if DTX (Discontinuous Transmission) is disabled for audio + /// + /// deprecated in favor of `audio_features` + #[deprecated] #[prost(bool, tag="8")] pub disable_dtx: bool, /// source of media #[prost(enumeration="TrackSource", tag="9")] pub source: i32, + /// see `codecs` for layers of individual codec + #[deprecated] #[prost(message, repeated, tag="10")] pub layers: ::prost::alloc::vec::Vec, /// mime type of codec @@ -521,6 +554,8 @@ pub struct TrackInfo { pub mid: ::prost::alloc::string::String, #[prost(message, repeated, tag="13")] pub codecs: ::prost::alloc::vec::Vec, + /// deprecated in favor of `audio_features` + #[deprecated] #[prost(bool, tag="14")] pub stereo: bool, /// true if RED (Redundant Encoding) is disabled for audio @@ -553,6 +588,42 @@ pub struct VideoLayer { pub bitrate: u32, #[prost(uint32, tag="5")] pub ssrc: u32, + #[prost(int32, tag="6")] + pub spatial_layer: i32, + #[prost(string, tag="7")] + pub rid: ::prost::alloc::string::String, +} +/// Nested message and enum types in `VideoLayer`. +pub mod video_layer { + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[repr(i32)] + pub enum Mode { + Unused = 0, + OneSpatialLayerPerStream = 1, + MultipleSpatialLayersPerStream = 2, + } + impl Mode { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + Mode::Unused => "MODE_UNUSED", + Mode::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", + Mode::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option { + match value { + "MODE_UNUSED" => Some(Self::Unused), + "ONE_SPATIAL_LAYER_PER_STREAM" => Some(Self::OneSpatialLayerPerStream), + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Some(Self::MultipleSpatialLayersPerStream), + _ => None, + } + } + } } /// new DataPacket API #[allow(clippy::derive_partial_eq_without_eq)] @@ -573,7 +644,7 @@ pub struct DataPacket { /// sid of the user that sent the message #[prost(string, tag="17")] pub participant_sid: ::prost::alloc::string::String, - #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15")] + #[prost(oneof="data_packet::Value", tags="2, 3, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 18")] pub value: ::core::option::Option, } /// Nested message and enum types in `DataPacket`. @@ -631,6 +702,50 @@ pub mod data_packet { StreamChunk(super::data_stream::Chunk), #[prost(message, tag="15")] StreamTrailer(super::data_stream::Trailer), + #[prost(message, tag="18")] + EncryptedPacket(super::EncryptedPacket), + } +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct EncryptedPacket { + #[prost(enumeration="encryption::Type", tag="1")] + pub encryption_type: i32, + #[prost(bytes="vec", tag="2")] + pub iv: ::prost::alloc::vec::Vec, + #[prost(uint32, tag="3")] + pub key_index: u32, + /// This is an encrypted EncryptedPacketPayload message representation + #[prost(bytes="vec", tag="4")] + pub encrypted_value: ::prost::alloc::vec::Vec, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct EncryptedPacketPayload { + #[prost(oneof="encrypted_packet_payload::Value", tags="1, 3, 4, 5, 6, 7, 8, 9")] + pub value: ::core::option::Option, +} +/// Nested message and enum types in `EncryptedPacketPayload`. +pub mod encrypted_packet_payload { + #[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Oneof)] + pub enum Value { + #[prost(message, tag="1")] + User(super::UserPacket), + #[prost(message, tag="3")] + ChatMessage(super::ChatMessage), + #[prost(message, tag="4")] + RpcRequest(super::RpcRequest), + #[prost(message, tag="5")] + RpcAck(super::RpcAck), + #[prost(message, tag="6")] + RpcResponse(super::RpcResponse), + #[prost(message, tag="7")] + StreamHeader(super::data_stream::Header), + #[prost(message, tag="8")] + StreamChunk(super::data_stream::Chunk), + #[prost(message, tag="9")] + StreamTrailer(super::data_stream::Trailer), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -675,7 +790,7 @@ pub struct UserPacket { /// topic under which the message was published #[prost(string, optional, tag="4")] pub topic: ::core::option::Option<::prost::alloc::string::String>, - /// Unique ID to indentify the message + /// Unique ID to identify the message #[prost(string, optional, tag="8")] pub id: ::core::option::Option<::prost::alloc::string::String>, /// start and end time allow relating the message to specific media time @@ -898,6 +1013,7 @@ pub mod client_info { UnityWeb = 11, Node = 12, Unreal = 13, + Esp32 = 14, } impl Sdk { /// String value of the enum field names used in the ProtoBuf definition. @@ -920,6 +1036,7 @@ pub mod client_info { Sdk::UnityWeb => "UNITY_WEB", Sdk::Node => "NODE", Sdk::Unreal => "UNREAL", + Sdk::Esp32 => "ESP32", } } /// Creates an enum from field names used in the ProtoBuf definition. @@ -939,6 +1056,7 @@ pub mod client_info { "UNITY_WEB" => Some(Self::UnityWeb), "NODE" => Some(Self::Node), "UNREAL" => Some(Self::Unreal), + "ESP32" => Some(Self::Esp32), _ => None, } } @@ -1231,7 +1349,8 @@ pub mod data_stream { /// only populated for finite streams, if it's a stream of unknown size this stays empty #[prost(uint64, optional, tag="5")] pub total_length: ::core::option::Option, - /// defaults to NONE + /// this is set on the DataPacket + #[deprecated] #[prost(enumeration="super::encryption::Type", tag="7")] pub encryption_type: i32, /// user defined attributes map that can carry additional info @@ -1267,7 +1386,8 @@ pub mod data_stream { /// a version indicating that this chunk_index has been retroactively modified and the original one needs to be replaced #[prost(int32, tag="4")] pub version: i32, - /// optional, initialization vector for AES-GCM encryption + /// this is set on the DataPacket + #[deprecated] #[prost(bytes="vec", optional, tag="5")] pub iv: ::core::option::Option<::prost::alloc::vec::Vec>, } @@ -2188,6 +2308,12 @@ pub struct S3Upload { pub secret: ::prost::alloc::string::String, #[prost(string, tag="11")] pub session_token: ::prost::alloc::string::String, + /// ARN of the role to assume for file upload. Egress will make an AssumeRole API call using the provided access_key and secret to assume that role. On LiveKit cloud, this is only available on accounts that have the feature enabled + #[prost(string, tag="12")] + pub assume_role_arn: ::prost::alloc::string::String, + /// ExternalID to use when assuming role for upload + #[prost(string, tag="13")] + pub assume_role_external_id: ::prost::alloc::string::String, #[prost(string, tag="3")] pub region: ::prost::alloc::string::String, #[prost(string, tag="4")] @@ -2874,10 +3000,10 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] pub enum Message { - /// initial join exchange, for publisher + /// participant offer for publisher #[prost(message, tag="1")] Offer(super::SessionDescription), - /// participant answering publisher offer + /// participant answering subscriber offer #[prost(message, tag="2")] Answer(super::SessionDescription), #[prost(message, tag="3")] @@ -2930,7 +3056,7 @@ pub mod signal_request { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SignalResponse { - #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24")] + #[prost(oneof="signal_response::Message", tags="1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25")] pub message: ::core::option::Option, } /// Nested message and enum types in `SignalResponse`. @@ -3010,6 +3136,9 @@ pub mod signal_response { /// notify to the participant when they have been moved to a new room #[prost(message, tag="24")] RoomMoved(super::RoomMovedResponse), + /// notify number of required media sections to satisfy subscribed tracks + #[prost(message, tag="25")] + MediaSectionsRequirement(super::MediaSectionsRequirement), } } #[allow(clippy::derive_partial_eq_without_eq)] @@ -3019,6 +3148,10 @@ pub struct SimulcastCodec { pub codec: ::prost::alloc::string::String, #[prost(string, tag="2")] pub cid: ::prost::alloc::string::String, + #[prost(message, repeated, tag="4")] + pub layers: ::prost::alloc::vec::Vec, + #[prost(enumeration="video_layer::Mode", tag="5")] + pub video_layer_mode: i32, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -3030,7 +3163,6 @@ pub struct AddTrackRequest { pub name: ::prost::alloc::string::String, #[prost(enumeration="TrackType", tag="3")] pub r#type: i32, - /// to be deprecated in favor of layers #[prost(uint32, tag="4")] pub width: u32, #[prost(uint32, tag="5")] @@ -3434,7 +3566,9 @@ pub struct RoomMovedResponse { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct SyncState { - /// last subscribe answer before reconnecting + /// last subscribe/publish answer before reconnecting + /// subscribe answer if using dual peer connection + /// publish answer if using single peer connection #[prost(message, optional, tag="1")] pub answer: ::core::option::Option, #[prost(message, optional, tag="2")] @@ -3443,7 +3577,9 @@ pub struct SyncState { pub publish_tracks: ::prost::alloc::vec::Vec, #[prost(message, repeated, tag="4")] pub data_channels: ::prost::alloc::vec::Vec, - /// last received server side offer before reconnecting + /// last received server side offer/sent client side offer before reconnecting + /// received server side offer if using dual peer connection + /// sent client side offer if using single peer connection #[prost(message, optional, tag="5")] pub offer: ::core::option::Option, #[prost(string, repeated, tag="6")] @@ -3603,6 +3739,92 @@ pub struct TrackSubscribed { #[prost(string, tag="1")] pub track_sid: ::prost::alloc::string::String, } +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct ConnectionSettings { + #[prost(bool, tag="1")] + pub auto_subscribe: bool, + #[prost(bool, tag="2")] + pub adaptive_stream: bool, + #[prost(bool, optional, tag="3")] + pub subscriber_allow_pause: ::core::option::Option, + #[prost(bool, tag="4")] + pub disable_ice_lite: bool, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct JoinRequest { + #[prost(message, optional, tag="1")] + pub client_info: ::core::option::Option, + #[prost(message, optional, tag="2")] + pub connection_settings: ::core::option::Option, + /// if not empty, will overwrite `metadata` in token + #[prost(string, tag="3")] + pub metadata: ::prost::alloc::string::String, + /// will set keys provided via this + /// will overwrite if the same key is in the token + /// will not delete keys from token if there is a key collision and this sets that key to empty value + #[prost(map="string, string", tag="4")] + pub participant_attributes: ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>, + #[prost(message, repeated, tag="5")] + pub add_track_requests: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag="6")] + pub publisher_offer: ::core::option::Option, + #[prost(bool, tag="7")] + pub reconnect: bool, + #[prost(enumeration="ReconnectReason", tag="8")] + pub reconnect_reason: i32, + #[prost(string, tag="9")] + pub participant_sid: ::prost::alloc::string::String, + #[prost(message, optional, tag="10")] + pub sync_state: ::core::option::Option, +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct WrappedJoinRequest { + #[prost(enumeration="wrapped_join_request::Compression", tag="1")] + pub compression: i32, + /// marshalled JoinRequest + potentially compressed + #[prost(bytes="vec", tag="2")] + pub join_request: ::prost::alloc::vec::Vec, +} +/// Nested message and enum types in `WrappedJoinRequest`. +pub mod wrapped_join_request { + #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[repr(i32)] + pub enum Compression { + None = 0, + Gzip = 1, + } + impl Compression { + /// String value of the enum field names used in the ProtoBuf definition. + /// + /// The values are not transformed in any way and thus are considered stable + /// (if the ProtoBuf definition does not change) and safe for programmatic use. + pub fn as_str_name(&self) -> &'static str { + match self { + Compression::None => "NONE", + Compression::Gzip => "GZIP", + } + } + /// Creates an enum from field names used in the ProtoBuf definition. + pub fn from_str_name(value: &str) -> ::core::option::Option { + match value { + "NONE" => Some(Self::None), + "GZIP" => Some(Self::Gzip), + _ => None, + } + } + } +} +#[allow(clippy::derive_partial_eq_without_eq)] +#[derive(Clone, PartialEq, ::prost::Message)] +pub struct MediaSectionsRequirement { + #[prost(uint32, tag="1")] + pub num_audios: u32, + #[prost(uint32, tag="2")] + pub num_videos: u32, +} #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] #[repr(i32)] pub enum SignalTarget { @@ -3722,6 +3944,10 @@ pub struct JobState { pub updated_at: i64, #[prost(string, tag="6")] pub participant_identity: ::prost::alloc::string::String, + #[prost(string, tag="7")] + pub worker_id: ::prost::alloc::string::String, + #[prost(string, tag="8")] + pub agent_id: ::prost::alloc::string::String, } /// from Worker to Server #[allow(clippy::derive_partial_eq_without_eq)] @@ -4290,6 +4516,9 @@ pub struct RoomConfiguration { /// limit number of participants that can be in a room, excluding Egress and Ingress participants #[prost(uint32, tag="4")] pub max_participants: u32, + /// metadata of room + #[prost(string, tag="11")] + pub metadata: ::prost::alloc::string::String, /// egress #[prost(message, optional, tag="5")] pub egress: ::core::option::Option, @@ -4751,7 +4980,7 @@ impl IngressVideoEncodingPreset { #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct WebhookEvent { - /// one of room_started, room_finished, participant_joined, participant_left, + /// one of room_started, room_finished, participant_joined, participant_left, participant_connection_aborted, /// track_published, track_unpublished, egress_started, egress_updated, egress_ended, /// ingress_started, ingress_ended #[prost(string, tag="1")] diff --git a/livekit-protocol/src/livekit.serde.rs b/livekit-protocol/src/livekit.serde.rs index 5c411a433..3c79f6c7a 100644 --- a/livekit-protocol/src/livekit.serde.rs +++ b/livekit-protocol/src/livekit.serde.rs @@ -2848,6 +2848,7 @@ impl serde::Serialize for client_info::Sdk { Self::UnityWeb => "UNITY_WEB", Self::Node => "NODE", Self::Unreal => "UNREAL", + Self::Esp32 => "ESP32", }; serializer.serialize_str(variant) } @@ -2873,6 +2874,7 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB", "NODE", "UNREAL", + "ESP32", ]; struct GeneratedVisitor; @@ -2927,6 +2929,7 @@ impl<'de> serde::Deserialize<'de> for client_info::Sdk { "UNITY_WEB" => Ok(client_info::Sdk::UnityWeb), "NODE" => Ok(client_info::Sdk::Node), "UNREAL" => Ok(client_info::Sdk::Unreal), + "ESP32" => Ok(client_info::Sdk::Esp32), _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), } } @@ -3353,6 +3356,156 @@ impl<'de> serde::Deserialize<'de> for ConnectionQualityUpdate { deserializer.deserialize_struct("livekit.ConnectionQualityUpdate", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for ConnectionSettings { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.auto_subscribe { + len += 1; + } + if self.adaptive_stream { + len += 1; + } + if self.subscriber_allow_pause.is_some() { + len += 1; + } + if self.disable_ice_lite { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.ConnectionSettings", len)?; + if self.auto_subscribe { + struct_ser.serialize_field("autoSubscribe", &self.auto_subscribe)?; + } + if self.adaptive_stream { + struct_ser.serialize_field("adaptiveStream", &self.adaptive_stream)?; + } + if let Some(v) = self.subscriber_allow_pause.as_ref() { + struct_ser.serialize_field("subscriberAllowPause", v)?; + } + if self.disable_ice_lite { + struct_ser.serialize_field("disableIceLite", &self.disable_ice_lite)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for ConnectionSettings { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "auto_subscribe", + "autoSubscribe", + "adaptive_stream", + "adaptiveStream", + "subscriber_allow_pause", + "subscriberAllowPause", + "disable_ice_lite", + "disableIceLite", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + AutoSubscribe, + AdaptiveStream, + SubscriberAllowPause, + DisableIceLite, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "autoSubscribe" | "auto_subscribe" => Ok(GeneratedField::AutoSubscribe), + "adaptiveStream" | "adaptive_stream" => Ok(GeneratedField::AdaptiveStream), + "subscriberAllowPause" | "subscriber_allow_pause" => Ok(GeneratedField::SubscriberAllowPause), + "disableIceLite" | "disable_ice_lite" => Ok(GeneratedField::DisableIceLite), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = ConnectionSettings; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.ConnectionSettings") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut auto_subscribe__ = None; + let mut adaptive_stream__ = None; + let mut subscriber_allow_pause__ = None; + let mut disable_ice_lite__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::AutoSubscribe => { + if auto_subscribe__.is_some() { + return Err(serde::de::Error::duplicate_field("autoSubscribe")); + } + auto_subscribe__ = Some(map_.next_value()?); + } + GeneratedField::AdaptiveStream => { + if adaptive_stream__.is_some() { + return Err(serde::de::Error::duplicate_field("adaptiveStream")); + } + adaptive_stream__ = Some(map_.next_value()?); + } + GeneratedField::SubscriberAllowPause => { + if subscriber_allow_pause__.is_some() { + return Err(serde::de::Error::duplicate_field("subscriberAllowPause")); + } + subscriber_allow_pause__ = map_.next_value()?; + } + GeneratedField::DisableIceLite => { + if disable_ice_lite__.is_some() { + return Err(serde::de::Error::duplicate_field("disableIceLite")); + } + disable_ice_lite__ = Some(map_.next_value()?); + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(ConnectionSettings { + auto_subscribe: auto_subscribe__.unwrap_or_default(), + adaptive_stream: adaptive_stream__.unwrap_or_default(), + subscriber_allow_pause: subscriber_allow_pause__, + disable_ice_lite: disable_ice_lite__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.ConnectionSettings", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for CreateAgentDispatchRequest { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -5586,6 +5739,9 @@ impl serde::Serialize for DataPacket { data_packet::Value::StreamTrailer(v) => { struct_ser.serialize_field("streamTrailer", v)?; } + data_packet::Value::EncryptedPacket(v) => { + struct_ser.serialize_field("encryptedPacket", v)?; + } } } struct_ser.end() @@ -5626,6 +5782,8 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamChunk", "stream_trailer", "streamTrailer", + "encrypted_packet", + "encryptedPacket", ]; #[allow(clippy::enum_variant_names)] @@ -5647,6 +5805,7 @@ impl<'de> serde::Deserialize<'de> for DataPacket { StreamHeader, StreamChunk, StreamTrailer, + EncryptedPacket, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -5686,6 +5845,7 @@ impl<'de> serde::Deserialize<'de> for DataPacket { "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), + "encryptedPacket" | "encrypted_packet" => Ok(GeneratedField::EncryptedPacket), _ => Ok(GeneratedField::__SkipField__), } } @@ -5827,6 +5987,13 @@ impl<'de> serde::Deserialize<'de> for DataPacket { return Err(serde::de::Error::duplicate_field("streamTrailer")); } value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::StreamTrailer) +; + } + GeneratedField::EncryptedPacket => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptedPacket")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(data_packet::Value::EncryptedPacket) ; } GeneratedField::__SkipField__ => { @@ -9211,6 +9378,365 @@ impl<'de> serde::Deserialize<'de> for EncodingOptionsPreset { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for EncryptedPacket { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.encryption_type != 0 { + len += 1; + } + if !self.iv.is_empty() { + len += 1; + } + if self.key_index != 0 { + len += 1; + } + if !self.encrypted_value.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacket", len)?; + if self.encryption_type != 0 { + let v = encryption::Type::try_from(self.encryption_type) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.encryption_type)))?; + struct_ser.serialize_field("encryptionType", &v)?; + } + if !self.iv.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("iv", pbjson::private::base64::encode(&self.iv).as_str())?; + } + if self.key_index != 0 { + struct_ser.serialize_field("keyIndex", &self.key_index)?; + } + if !self.encrypted_value.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("encryptedValue", pbjson::private::base64::encode(&self.encrypted_value).as_str())?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for EncryptedPacket { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "encryption_type", + "encryptionType", + "iv", + "key_index", + "keyIndex", + "encrypted_value", + "encryptedValue", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + EncryptionType, + Iv, + KeyIndex, + EncryptedValue, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "encryptionType" | "encryption_type" => Ok(GeneratedField::EncryptionType), + "iv" => Ok(GeneratedField::Iv), + "keyIndex" | "key_index" => Ok(GeneratedField::KeyIndex), + "encryptedValue" | "encrypted_value" => Ok(GeneratedField::EncryptedValue), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = EncryptedPacket; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.EncryptedPacket") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut encryption_type__ = None; + let mut iv__ = None; + let mut key_index__ = None; + let mut encrypted_value__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::EncryptionType => { + if encryption_type__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptionType")); + } + encryption_type__ = Some(map_.next_value::()? as i32); + } + GeneratedField::Iv => { + if iv__.is_some() { + return Err(serde::de::Error::duplicate_field("iv")); + } + iv__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::KeyIndex => { + if key_index__.is_some() { + return Err(serde::de::Error::duplicate_field("keyIndex")); + } + key_index__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::EncryptedValue => { + if encrypted_value__.is_some() { + return Err(serde::de::Error::duplicate_field("encryptedValue")); + } + encrypted_value__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(EncryptedPacket { + encryption_type: encryption_type__.unwrap_or_default(), + iv: iv__.unwrap_or_default(), + key_index: key_index__.unwrap_or_default(), + encrypted_value: encrypted_value__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.EncryptedPacket", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for EncryptedPacketPayload { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.value.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.EncryptedPacketPayload", len)?; + if let Some(v) = self.value.as_ref() { + match v { + encrypted_packet_payload::Value::User(v) => { + struct_ser.serialize_field("user", v)?; + } + encrypted_packet_payload::Value::ChatMessage(v) => { + struct_ser.serialize_field("chatMessage", v)?; + } + encrypted_packet_payload::Value::RpcRequest(v) => { + struct_ser.serialize_field("rpcRequest", v)?; + } + encrypted_packet_payload::Value::RpcAck(v) => { + struct_ser.serialize_field("rpcAck", v)?; + } + encrypted_packet_payload::Value::RpcResponse(v) => { + struct_ser.serialize_field("rpcResponse", v)?; + } + encrypted_packet_payload::Value::StreamHeader(v) => { + struct_ser.serialize_field("streamHeader", v)?; + } + encrypted_packet_payload::Value::StreamChunk(v) => { + struct_ser.serialize_field("streamChunk", v)?; + } + encrypted_packet_payload::Value::StreamTrailer(v) => { + struct_ser.serialize_field("streamTrailer", v)?; + } + } + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for EncryptedPacketPayload { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "user", + "chat_message", + "chatMessage", + "rpc_request", + "rpcRequest", + "rpc_ack", + "rpcAck", + "rpc_response", + "rpcResponse", + "stream_header", + "streamHeader", + "stream_chunk", + "streamChunk", + "stream_trailer", + "streamTrailer", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + User, + ChatMessage, + RpcRequest, + RpcAck, + RpcResponse, + StreamHeader, + StreamChunk, + StreamTrailer, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "user" => Ok(GeneratedField::User), + "chatMessage" | "chat_message" => Ok(GeneratedField::ChatMessage), + "rpcRequest" | "rpc_request" => Ok(GeneratedField::RpcRequest), + "rpcAck" | "rpc_ack" => Ok(GeneratedField::RpcAck), + "rpcResponse" | "rpc_response" => Ok(GeneratedField::RpcResponse), + "streamHeader" | "stream_header" => Ok(GeneratedField::StreamHeader), + "streamChunk" | "stream_chunk" => Ok(GeneratedField::StreamChunk), + "streamTrailer" | "stream_trailer" => Ok(GeneratedField::StreamTrailer), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = EncryptedPacketPayload; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.EncryptedPacketPayload") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut value__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::User => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("user")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::User) +; + } + GeneratedField::ChatMessage => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("chatMessage")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::ChatMessage) +; + } + GeneratedField::RpcRequest => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcRequest")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcRequest) +; + } + GeneratedField::RpcAck => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcAck")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcAck) +; + } + GeneratedField::RpcResponse => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("rpcResponse")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::RpcResponse) +; + } + GeneratedField::StreamHeader => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamHeader")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamHeader) +; + } + GeneratedField::StreamChunk => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamChunk")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamChunk) +; + } + GeneratedField::StreamTrailer => { + if value__.is_some() { + return Err(serde::de::Error::duplicate_field("streamTrailer")); + } + value__ = map_.next_value::<::std::option::Option<_>>()?.map(encrypted_packet_payload::Value::StreamTrailer) +; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(EncryptedPacketPayload { + value: value__, + }) + } + } + deserializer.deserialize_struct("livekit.EncryptedPacketPayload", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for Encryption { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -13485,6 +14011,12 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { len += 1; } + if !self.worker_id.is_empty() { + len += 1; + } + if !self.agent_id.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.JobState", len)?; if self.status != 0 { let v = JobStatus::try_from(self.status) @@ -13512,6 +14044,12 @@ impl serde::Serialize for JobState { if !self.participant_identity.is_empty() { struct_ser.serialize_field("participantIdentity", &self.participant_identity)?; } + if !self.worker_id.is_empty() { + struct_ser.serialize_field("workerId", &self.worker_id)?; + } + if !self.agent_id.is_empty() { + struct_ser.serialize_field("agentId", &self.agent_id)?; + } struct_ser.end() } } @@ -13532,6 +14070,10 @@ impl<'de> serde::Deserialize<'de> for JobState { "updatedAt", "participant_identity", "participantIdentity", + "worker_id", + "workerId", + "agent_id", + "agentId", ]; #[allow(clippy::enum_variant_names)] @@ -13542,6 +14084,8 @@ impl<'de> serde::Deserialize<'de> for JobState { EndedAt, UpdatedAt, ParticipantIdentity, + WorkerId, + AgentId, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -13570,6 +14114,8 @@ impl<'de> serde::Deserialize<'de> for JobState { "endedAt" | "ended_at" => Ok(GeneratedField::EndedAt), "updatedAt" | "updated_at" => Ok(GeneratedField::UpdatedAt), "participantIdentity" | "participant_identity" => Ok(GeneratedField::ParticipantIdentity), + "workerId" | "worker_id" => Ok(GeneratedField::WorkerId), + "agentId" | "agent_id" => Ok(GeneratedField::AgentId), _ => Ok(GeneratedField::__SkipField__), } } @@ -13595,6 +14141,8 @@ impl<'de> serde::Deserialize<'de> for JobState { let mut ended_at__ = None; let mut updated_at__ = None; let mut participant_identity__ = None; + let mut worker_id__ = None; + let mut agent_id__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Status => { @@ -13639,6 +14187,18 @@ impl<'de> serde::Deserialize<'de> for JobState { } participant_identity__ = Some(map_.next_value()?); } + GeneratedField::WorkerId => { + if worker_id__.is_some() { + return Err(serde::de::Error::duplicate_field("workerId")); + } + worker_id__ = Some(map_.next_value()?); + } + GeneratedField::AgentId => { + if agent_id__.is_some() { + return Err(serde::de::Error::duplicate_field("agentId")); + } + agent_id__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -13651,6 +14211,8 @@ impl<'de> serde::Deserialize<'de> for JobState { ended_at: ended_at__.unwrap_or_default(), updated_at: updated_at__.unwrap_or_default(), participant_identity: participant_identity__.unwrap_or_default(), + worker_id: worker_id__.unwrap_or_default(), + agent_id: agent_id__.unwrap_or_default(), }) } } @@ -13904,6 +14466,266 @@ impl<'de> serde::Deserialize<'de> for JobType { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for JoinRequest { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.client_info.is_some() { + len += 1; + } + if self.connection_settings.is_some() { + len += 1; + } + if !self.metadata.is_empty() { + len += 1; + } + if !self.participant_attributes.is_empty() { + len += 1; + } + if !self.add_track_requests.is_empty() { + len += 1; + } + if self.publisher_offer.is_some() { + len += 1; + } + if self.reconnect { + len += 1; + } + if self.reconnect_reason != 0 { + len += 1; + } + if !self.participant_sid.is_empty() { + len += 1; + } + if self.sync_state.is_some() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.JoinRequest", len)?; + if let Some(v) = self.client_info.as_ref() { + struct_ser.serialize_field("clientInfo", v)?; + } + if let Some(v) = self.connection_settings.as_ref() { + struct_ser.serialize_field("connectionSettings", v)?; + } + if !self.metadata.is_empty() { + struct_ser.serialize_field("metadata", &self.metadata)?; + } + if !self.participant_attributes.is_empty() { + struct_ser.serialize_field("participantAttributes", &self.participant_attributes)?; + } + if !self.add_track_requests.is_empty() { + struct_ser.serialize_field("addTrackRequests", &self.add_track_requests)?; + } + if let Some(v) = self.publisher_offer.as_ref() { + struct_ser.serialize_field("publisherOffer", v)?; + } + if self.reconnect { + struct_ser.serialize_field("reconnect", &self.reconnect)?; + } + if self.reconnect_reason != 0 { + let v = ReconnectReason::try_from(self.reconnect_reason) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.reconnect_reason)))?; + struct_ser.serialize_field("reconnectReason", &v)?; + } + if !self.participant_sid.is_empty() { + struct_ser.serialize_field("participantSid", &self.participant_sid)?; + } + if let Some(v) = self.sync_state.as_ref() { + struct_ser.serialize_field("syncState", v)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for JoinRequest { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "client_info", + "clientInfo", + "connection_settings", + "connectionSettings", + "metadata", + "participant_attributes", + "participantAttributes", + "add_track_requests", + "addTrackRequests", + "publisher_offer", + "publisherOffer", + "reconnect", + "reconnect_reason", + "reconnectReason", + "participant_sid", + "participantSid", + "sync_state", + "syncState", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + ClientInfo, + ConnectionSettings, + Metadata, + ParticipantAttributes, + AddTrackRequests, + PublisherOffer, + Reconnect, + ReconnectReason, + ParticipantSid, + SyncState, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "clientInfo" | "client_info" => Ok(GeneratedField::ClientInfo), + "connectionSettings" | "connection_settings" => Ok(GeneratedField::ConnectionSettings), + "metadata" => Ok(GeneratedField::Metadata), + "participantAttributes" | "participant_attributes" => Ok(GeneratedField::ParticipantAttributes), + "addTrackRequests" | "add_track_requests" => Ok(GeneratedField::AddTrackRequests), + "publisherOffer" | "publisher_offer" => Ok(GeneratedField::PublisherOffer), + "reconnect" => Ok(GeneratedField::Reconnect), + "reconnectReason" | "reconnect_reason" => Ok(GeneratedField::ReconnectReason), + "participantSid" | "participant_sid" => Ok(GeneratedField::ParticipantSid), + "syncState" | "sync_state" => Ok(GeneratedField::SyncState), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = JoinRequest; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.JoinRequest") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut client_info__ = None; + let mut connection_settings__ = None; + let mut metadata__ = None; + let mut participant_attributes__ = None; + let mut add_track_requests__ = None; + let mut publisher_offer__ = None; + let mut reconnect__ = None; + let mut reconnect_reason__ = None; + let mut participant_sid__ = None; + let mut sync_state__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::ClientInfo => { + if client_info__.is_some() { + return Err(serde::de::Error::duplicate_field("clientInfo")); + } + client_info__ = map_.next_value()?; + } + GeneratedField::ConnectionSettings => { + if connection_settings__.is_some() { + return Err(serde::de::Error::duplicate_field("connectionSettings")); + } + connection_settings__ = map_.next_value()?; + } + GeneratedField::Metadata => { + if metadata__.is_some() { + return Err(serde::de::Error::duplicate_field("metadata")); + } + metadata__ = Some(map_.next_value()?); + } + GeneratedField::ParticipantAttributes => { + if participant_attributes__.is_some() { + return Err(serde::de::Error::duplicate_field("participantAttributes")); + } + participant_attributes__ = Some( + map_.next_value::>()? + ); + } + GeneratedField::AddTrackRequests => { + if add_track_requests__.is_some() { + return Err(serde::de::Error::duplicate_field("addTrackRequests")); + } + add_track_requests__ = Some(map_.next_value()?); + } + GeneratedField::PublisherOffer => { + if publisher_offer__.is_some() { + return Err(serde::de::Error::duplicate_field("publisherOffer")); + } + publisher_offer__ = map_.next_value()?; + } + GeneratedField::Reconnect => { + if reconnect__.is_some() { + return Err(serde::de::Error::duplicate_field("reconnect")); + } + reconnect__ = Some(map_.next_value()?); + } + GeneratedField::ReconnectReason => { + if reconnect_reason__.is_some() { + return Err(serde::de::Error::duplicate_field("reconnectReason")); + } + reconnect_reason__ = Some(map_.next_value::()? as i32); + } + GeneratedField::ParticipantSid => { + if participant_sid__.is_some() { + return Err(serde::de::Error::duplicate_field("participantSid")); + } + participant_sid__ = Some(map_.next_value()?); + } + GeneratedField::SyncState => { + if sync_state__.is_some() { + return Err(serde::de::Error::duplicate_field("syncState")); + } + sync_state__ = map_.next_value()?; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(JoinRequest { + client_info: client_info__, + connection_settings: connection_settings__, + metadata: metadata__.unwrap_or_default(), + participant_attributes: participant_attributes__.unwrap_or_default(), + add_track_requests: add_track_requests__.unwrap_or_default(), + publisher_offer: publisher_offer__, + reconnect: reconnect__.unwrap_or_default(), + reconnect_reason: reconnect_reason__.unwrap_or_default(), + participant_sid: participant_sid__.unwrap_or_default(), + sync_state: sync_state__, + }) + } + } + deserializer.deserialize_struct("livekit.JoinRequest", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for JoinResponse { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -16384,10 +17206,28 @@ impl serde::Serialize for ListUpdate { if !self.set.is_empty() { len += 1; } + if !self.add.is_empty() { + len += 1; + } + if !self.del.is_empty() { + len += 1; + } + if self.clear { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.ListUpdate", len)?; if !self.set.is_empty() { struct_ser.serialize_field("set", &self.set)?; } + if !self.add.is_empty() { + struct_ser.serialize_field("add", &self.add)?; + } + if !self.del.is_empty() { + struct_ser.serialize_field("del", &self.del)?; + } + if self.clear { + struct_ser.serialize_field("clear", &self.clear)?; + } struct_ser.end() } } @@ -16399,11 +17239,17 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { const FIELDS: &[&str] = &[ "set", + "add", + "del", + "clear", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Set, + Add, + Del, + Clear, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -16427,6 +17273,9 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { { match value { "set" => Ok(GeneratedField::Set), + "add" => Ok(GeneratedField::Add), + "del" => Ok(GeneratedField::Del), + "clear" => Ok(GeneratedField::Clear), _ => Ok(GeneratedField::__SkipField__), } } @@ -16447,6 +17296,9 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { V: serde::de::MapAccess<'de>, { let mut set__ = None; + let mut add__ = None; + let mut del__ = None; + let mut clear__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Set => { @@ -16455,6 +17307,24 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } set__ = Some(map_.next_value()?); } + GeneratedField::Add => { + if add__.is_some() { + return Err(serde::de::Error::duplicate_field("add")); + } + add__ = Some(map_.next_value()?); + } + GeneratedField::Del => { + if del__.is_some() { + return Err(serde::de::Error::duplicate_field("del")); + } + del__ = Some(map_.next_value()?); + } + GeneratedField::Clear => { + if clear__.is_some() { + return Err(serde::de::Error::duplicate_field("clear")); + } + clear__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -16462,12 +17332,133 @@ impl<'de> serde::Deserialize<'de> for ListUpdate { } Ok(ListUpdate { set: set__.unwrap_or_default(), + add: add__.unwrap_or_default(), + del: del__.unwrap_or_default(), + clear: clear__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.ListUpdate", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for MediaSectionsRequirement { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.num_audios != 0 { + len += 1; + } + if self.num_videos != 0 { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.MediaSectionsRequirement", len)?; + if self.num_audios != 0 { + struct_ser.serialize_field("numAudios", &self.num_audios)?; + } + if self.num_videos != 0 { + struct_ser.serialize_field("numVideos", &self.num_videos)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for MediaSectionsRequirement { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "num_audios", + "numAudios", + "num_videos", + "numVideos", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + NumAudios, + NumVideos, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "numAudios" | "num_audios" => Ok(GeneratedField::NumAudios), + "numVideos" | "num_videos" => Ok(GeneratedField::NumVideos), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = MediaSectionsRequirement; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.MediaSectionsRequirement") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut num_audios__ = None; + let mut num_videos__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::NumAudios => { + if num_audios__.is_some() { + return Err(serde::de::Error::duplicate_field("numAudios")); + } + num_audios__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::NumVideos => { + if num_videos__.is_some() { + return Err(serde::de::Error::duplicate_field("numVideos")); + } + num_videos__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(MediaSectionsRequirement { + num_audios: num_audios__.unwrap_or_default(), + num_videos: num_videos__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.MediaSectionsRequirement", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for MetricLabel { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -23352,6 +24343,9 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { len += 1; } + if !self.metadata.is_empty() { + len += 1; + } if self.egress.is_some() { len += 1; } @@ -23380,6 +24374,9 @@ impl serde::Serialize for RoomConfiguration { if self.max_participants != 0 { struct_ser.serialize_field("maxParticipants", &self.max_participants)?; } + if !self.metadata.is_empty() { + struct_ser.serialize_field("metadata", &self.metadata)?; + } if let Some(v) = self.egress.as_ref() { struct_ser.serialize_field("egress", v)?; } @@ -23412,6 +24409,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "departureTimeout", "max_participants", "maxParticipants", + "metadata", "egress", "min_playout_delay", "minPlayoutDelay", @@ -23428,6 +24426,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { EmptyTimeout, DepartureTimeout, MaxParticipants, + Metadata, Egress, MinPlayoutDelay, MaxPlayoutDelay, @@ -23459,6 +24458,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { "emptyTimeout" | "empty_timeout" => Ok(GeneratedField::EmptyTimeout), "departureTimeout" | "departure_timeout" => Ok(GeneratedField::DepartureTimeout), "maxParticipants" | "max_participants" => Ok(GeneratedField::MaxParticipants), + "metadata" => Ok(GeneratedField::Metadata), "egress" => Ok(GeneratedField::Egress), "minPlayoutDelay" | "min_playout_delay" => Ok(GeneratedField::MinPlayoutDelay), "maxPlayoutDelay" | "max_playout_delay" => Ok(GeneratedField::MaxPlayoutDelay), @@ -23487,6 +24487,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { let mut empty_timeout__ = None; let mut departure_timeout__ = None; let mut max_participants__ = None; + let mut metadata__ = None; let mut egress__ = None; let mut min_playout_delay__ = None; let mut max_playout_delay__ = None; @@ -23524,6 +24525,12 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } + GeneratedField::Metadata => { + if metadata__.is_some() { + return Err(serde::de::Error::duplicate_field("metadata")); + } + metadata__ = Some(map_.next_value()?); + } GeneratedField::Egress => { if egress__.is_some() { return Err(serde::de::Error::duplicate_field("egress")); @@ -23568,6 +24575,7 @@ impl<'de> serde::Deserialize<'de> for RoomConfiguration { empty_timeout: empty_timeout__.unwrap_or_default(), departure_timeout: departure_timeout__.unwrap_or_default(), max_participants: max_participants__.unwrap_or_default(), + metadata: metadata__.unwrap_or_default(), egress: egress__, min_playout_delay: min_playout_delay__.unwrap_or_default(), max_playout_delay: max_playout_delay__.unwrap_or_default(), @@ -24604,6 +25612,12 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { len += 1; } + if !self.assume_role_arn.is_empty() { + len += 1; + } + if !self.assume_role_external_id.is_empty() { + len += 1; + } if !self.region.is_empty() { len += 1; } @@ -24638,6 +25652,12 @@ impl serde::Serialize for S3Upload { if !self.session_token.is_empty() { struct_ser.serialize_field("sessionToken", &self.session_token)?; } + if !self.assume_role_arn.is_empty() { + struct_ser.serialize_field("assumeRoleArn", &self.assume_role_arn)?; + } + if !self.assume_role_external_id.is_empty() { + struct_ser.serialize_field("assumeRoleExternalId", &self.assume_role_external_id)?; + } if !self.region.is_empty() { struct_ser.serialize_field("region", &self.region)?; } @@ -24677,6 +25697,10 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "secret", "session_token", "sessionToken", + "assume_role_arn", + "assumeRoleArn", + "assume_role_external_id", + "assumeRoleExternalId", "region", "endpoint", "bucket", @@ -24694,6 +25718,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { AccessKey, Secret, SessionToken, + AssumeRoleArn, + AssumeRoleExternalId, Region, Endpoint, Bucket, @@ -24727,6 +25753,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { "accessKey" | "access_key" => Ok(GeneratedField::AccessKey), "secret" => Ok(GeneratedField::Secret), "sessionToken" | "session_token" => Ok(GeneratedField::SessionToken), + "assumeRoleArn" | "assume_role_arn" => Ok(GeneratedField::AssumeRoleArn), + "assumeRoleExternalId" | "assume_role_external_id" => Ok(GeneratedField::AssumeRoleExternalId), "region" => Ok(GeneratedField::Region), "endpoint" => Ok(GeneratedField::Endpoint), "bucket" => Ok(GeneratedField::Bucket), @@ -24757,6 +25785,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { let mut access_key__ = None; let mut secret__ = None; let mut session_token__ = None; + let mut assume_role_arn__ = None; + let mut assume_role_external_id__ = None; let mut region__ = None; let mut endpoint__ = None; let mut bucket__ = None; @@ -24785,6 +25815,18 @@ impl<'de> serde::Deserialize<'de> for S3Upload { } session_token__ = Some(map_.next_value()?); } + GeneratedField::AssumeRoleArn => { + if assume_role_arn__.is_some() { + return Err(serde::de::Error::duplicate_field("assumeRoleArn")); + } + assume_role_arn__ = Some(map_.next_value()?); + } + GeneratedField::AssumeRoleExternalId => { + if assume_role_external_id__.is_some() { + return Err(serde::de::Error::duplicate_field("assumeRoleExternalId")); + } + assume_role_external_id__ = Some(map_.next_value()?); + } GeneratedField::Region => { if region__.is_some() { return Err(serde::de::Error::duplicate_field("region")); @@ -24844,6 +25886,8 @@ impl<'de> serde::Deserialize<'de> for S3Upload { access_key: access_key__.unwrap_or_default(), secret: secret__.unwrap_or_default(), session_token: session_token__.unwrap_or_default(), + assume_role_arn: assume_role_arn__.unwrap_or_default(), + assume_role_external_id: assume_role_external_id__.unwrap_or_default(), region: region__.unwrap_or_default(), endpoint: endpoint__.unwrap_or_default(), bucket: bucket__.unwrap_or_default(), @@ -31459,6 +32503,9 @@ impl serde::Serialize for SignalResponse { signal_response::Message::RoomMoved(v) => { struct_ser.serialize_field("roomMoved", v)?; } + signal_response::Message::MediaSectionsRequirement(v) => { + struct_ser.serialize_field("mediaSectionsRequirement", v)?; + } } } struct_ser.end() @@ -31508,6 +32555,8 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "trackSubscribed", "room_moved", "roomMoved", + "media_sections_requirement", + "mediaSectionsRequirement", ]; #[allow(clippy::enum_variant_names)] @@ -31535,6 +32584,7 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { RequestResponse, TrackSubscribed, RoomMoved, + MediaSectionsRequirement, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -31580,6 +32630,7 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { "requestResponse" | "request_response" => Ok(GeneratedField::RequestResponse), "trackSubscribed" | "track_subscribed" => Ok(GeneratedField::TrackSubscribed), "roomMoved" | "room_moved" => Ok(GeneratedField::RoomMoved), + "mediaSectionsRequirement" | "media_sections_requirement" => Ok(GeneratedField::MediaSectionsRequirement), _ => Ok(GeneratedField::__SkipField__), } } @@ -31759,6 +32810,13 @@ impl<'de> serde::Deserialize<'de> for SignalResponse { return Err(serde::de::Error::duplicate_field("roomMoved")); } message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::RoomMoved) +; + } + GeneratedField::MediaSectionsRequirement => { + if message__.is_some() { + return Err(serde::de::Error::duplicate_field("mediaSectionsRequirement")); + } + message__ = map_.next_value::<::std::option::Option<_>>()?.map(signal_response::Message::MediaSectionsRequirement) ; } GeneratedField::__SkipField__ => { @@ -32197,6 +33255,12 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { len += 1; } + if !self.layers.is_empty() { + len += 1; + } + if self.video_layer_mode != 0 { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodec", len)?; if !self.codec.is_empty() { struct_ser.serialize_field("codec", &self.codec)?; @@ -32204,6 +33268,14 @@ impl serde::Serialize for SimulcastCodec { if !self.cid.is_empty() { struct_ser.serialize_field("cid", &self.cid)?; } + if !self.layers.is_empty() { + struct_ser.serialize_field("layers", &self.layers)?; + } + if self.video_layer_mode != 0 { + let v = video_layer::Mode::try_from(self.video_layer_mode) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; + struct_ser.serialize_field("videoLayerMode", &v)?; + } struct_ser.end() } } @@ -32216,12 +33288,17 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { const FIELDS: &[&str] = &[ "codec", "cid", + "layers", + "video_layer_mode", + "videoLayerMode", ]; #[allow(clippy::enum_variant_names)] enum GeneratedField { Codec, Cid, + Layers, + VideoLayerMode, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -32246,6 +33323,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { match value { "codec" => Ok(GeneratedField::Codec), "cid" => Ok(GeneratedField::Cid), + "layers" => Ok(GeneratedField::Layers), + "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), _ => Ok(GeneratedField::__SkipField__), } } @@ -32267,6 +33346,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { { let mut codec__ = None; let mut cid__ = None; + let mut layers__ = None; + let mut video_layer_mode__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Codec => { @@ -32281,6 +33362,18 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { } cid__ = Some(map_.next_value()?); } + GeneratedField::Layers => { + if layers__.is_some() { + return Err(serde::de::Error::duplicate_field("layers")); + } + layers__ = Some(map_.next_value()?); + } + GeneratedField::VideoLayerMode => { + if video_layer_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("videoLayerMode")); + } + video_layer_mode__ = Some(map_.next_value::()? as i32); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -32289,6 +33382,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodec { Ok(SimulcastCodec { codec: codec__.unwrap_or_default(), cid: cid__.unwrap_or_default(), + layers: layers__.unwrap_or_default(), + video_layer_mode: video_layer_mode__.unwrap_or_default(), }) } } @@ -32315,6 +33410,12 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { len += 1; } + if self.video_layer_mode != 0 { + len += 1; + } + if !self.sdp_cid.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.SimulcastCodecInfo", len)?; if !self.mime_type.is_empty() { struct_ser.serialize_field("mimeType", &self.mime_type)?; @@ -32328,6 +33429,14 @@ impl serde::Serialize for SimulcastCodecInfo { if !self.layers.is_empty() { struct_ser.serialize_field("layers", &self.layers)?; } + if self.video_layer_mode != 0 { + let v = video_layer::Mode::try_from(self.video_layer_mode) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.video_layer_mode)))?; + struct_ser.serialize_field("videoLayerMode", &v)?; + } + if !self.sdp_cid.is_empty() { + struct_ser.serialize_field("sdpCid", &self.sdp_cid)?; + } struct_ser.end() } } @@ -32343,6 +33452,10 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid", "cid", "layers", + "video_layer_mode", + "videoLayerMode", + "sdp_cid", + "sdpCid", ]; #[allow(clippy::enum_variant_names)] @@ -32351,6 +33464,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { Mid, Cid, Layers, + VideoLayerMode, + SdpCid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -32377,6 +33492,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { "mid" => Ok(GeneratedField::Mid), "cid" => Ok(GeneratedField::Cid), "layers" => Ok(GeneratedField::Layers), + "videoLayerMode" | "video_layer_mode" => Ok(GeneratedField::VideoLayerMode), + "sdpCid" | "sdp_cid" => Ok(GeneratedField::SdpCid), _ => Ok(GeneratedField::__SkipField__), } } @@ -32400,6 +33517,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { let mut mid__ = None; let mut cid__ = None; let mut layers__ = None; + let mut video_layer_mode__ = None; + let mut sdp_cid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::MimeType => { @@ -32426,6 +33545,18 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { } layers__ = Some(map_.next_value()?); } + GeneratedField::VideoLayerMode => { + if video_layer_mode__.is_some() { + return Err(serde::de::Error::duplicate_field("videoLayerMode")); + } + video_layer_mode__ = Some(map_.next_value::()? as i32); + } + GeneratedField::SdpCid => { + if sdp_cid__.is_some() { + return Err(serde::de::Error::duplicate_field("sdpCid")); + } + sdp_cid__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -32436,6 +33567,8 @@ impl<'de> serde::Deserialize<'de> for SimulcastCodecInfo { mid: mid__.unwrap_or_default(), cid: cid__.unwrap_or_default(), layers: layers__.unwrap_or_default(), + video_layer_mode: video_layer_mode__.unwrap_or_default(), + sdp_cid: sdp_cid__.unwrap_or_default(), }) } } @@ -34961,8 +36094,115 @@ impl<'de> serde::Deserialize<'de> for TimedVersion { E: serde::de::Error, { match value { - "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), - "ticks" => Ok(GeneratedField::Ticks), + "unixMicro" | "unix_micro" => Ok(GeneratedField::UnixMicro), + "ticks" => Ok(GeneratedField::Ticks), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = TimedVersion; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.TimedVersion") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut unix_micro__ = None; + let mut ticks__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::UnixMicro => { + if unix_micro__.is_some() { + return Err(serde::de::Error::duplicate_field("unixMicro")); + } + unix_micro__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::Ticks => { + if ticks__.is_some() { + return Err(serde::de::Error::duplicate_field("ticks")); + } + ticks__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(TimedVersion { + unix_micro: unix_micro__.unwrap_or_default(), + ticks: ticks__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for TokenPagination { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if !self.token.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.TokenPagination", len)?; + if !self.token.is_empty() { + struct_ser.serialize_field("token", &self.token)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for TokenPagination { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "token", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Token, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "token" => Ok(GeneratedField::Token), _ => Ok(GeneratedField::__SkipField__), } } @@ -34972,48 +36212,36 @@ impl<'de> serde::Deserialize<'de> for TimedVersion { } struct GeneratedVisitor; impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { - type Value = TimedVersion; + type Value = TokenPagination; fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - formatter.write_str("struct livekit.TimedVersion") + formatter.write_str("struct livekit.TokenPagination") } - fn visit_map(self, mut map_: V) -> std::result::Result + fn visit_map(self, mut map_: V) -> std::result::Result where V: serde::de::MapAccess<'de>, { - let mut unix_micro__ = None; - let mut ticks__ = None; + let mut token__ = None; while let Some(k) = map_.next_key()? { match k { - GeneratedField::UnixMicro => { - if unix_micro__.is_some() { - return Err(serde::de::Error::duplicate_field("unixMicro")); - } - unix_micro__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; - } - GeneratedField::Ticks => { - if ticks__.is_some() { - return Err(serde::de::Error::duplicate_field("ticks")); + GeneratedField::Token => { + if token__.is_some() { + return Err(serde::de::Error::duplicate_field("token")); } - ticks__ = - Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) - ; + token__ = Some(map_.next_value()?); } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } } } - Ok(TimedVersion { - unix_micro: unix_micro__.unwrap_or_default(), - ticks: ticks__.unwrap_or_default(), + Ok(TokenPagination { + token: token__.unwrap_or_default(), }) } } - deserializer.deserialize_struct("livekit.TimedVersion", FIELDS, GeneratedVisitor) + deserializer.deserialize_struct("livekit.TokenPagination", FIELDS, GeneratedVisitor) } } impl serde::Serialize for TrackCompositeEgressRequest { @@ -40417,6 +41645,12 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { len += 1; } + if self.spatial_layer != 0 { + len += 1; + } + if !self.rid.is_empty() { + len += 1; + } let mut struct_ser = serializer.serialize_struct("livekit.VideoLayer", len)?; if self.quality != 0 { let v = VideoQuality::try_from(self.quality) @@ -40435,6 +41669,12 @@ impl serde::Serialize for VideoLayer { if self.ssrc != 0 { struct_ser.serialize_field("ssrc", &self.ssrc)?; } + if self.spatial_layer != 0 { + struct_ser.serialize_field("spatialLayer", &self.spatial_layer)?; + } + if !self.rid.is_empty() { + struct_ser.serialize_field("rid", &self.rid)?; + } struct_ser.end() } } @@ -40450,6 +41690,9 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height", "bitrate", "ssrc", + "spatial_layer", + "spatialLayer", + "rid", ]; #[allow(clippy::enum_variant_names)] @@ -40459,6 +41702,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Height, Bitrate, Ssrc, + SpatialLayer, + Rid, __SkipField__, } impl<'de> serde::Deserialize<'de> for GeneratedField { @@ -40486,6 +41731,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { "height" => Ok(GeneratedField::Height), "bitrate" => Ok(GeneratedField::Bitrate), "ssrc" => Ok(GeneratedField::Ssrc), + "spatialLayer" | "spatial_layer" => Ok(GeneratedField::SpatialLayer), + "rid" => Ok(GeneratedField::Rid), _ => Ok(GeneratedField::__SkipField__), } } @@ -40510,6 +41757,8 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { let mut height__ = None; let mut bitrate__ = None; let mut ssrc__ = None; + let mut spatial_layer__ = None; + let mut rid__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Quality => { @@ -40550,6 +41799,20 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) ; } + GeneratedField::SpatialLayer => { + if spatial_layer__.is_some() { + return Err(serde::de::Error::duplicate_field("spatialLayer")); + } + spatial_layer__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::Rid => { + if rid__.is_some() { + return Err(serde::de::Error::duplicate_field("rid")); + } + rid__ = Some(map_.next_value()?); + } GeneratedField::__SkipField__ => { let _ = map_.next_value::()?; } @@ -40561,12 +41824,88 @@ impl<'de> serde::Deserialize<'de> for VideoLayer { height: height__.unwrap_or_default(), bitrate: bitrate__.unwrap_or_default(), ssrc: ssrc__.unwrap_or_default(), + spatial_layer: spatial_layer__.unwrap_or_default(), + rid: rid__.unwrap_or_default(), }) } } deserializer.deserialize_struct("livekit.VideoLayer", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for video_layer::Mode { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + let variant = match self { + Self::Unused => "MODE_UNUSED", + Self::OneSpatialLayerPerStream => "ONE_SPATIAL_LAYER_PER_STREAM", + Self::MultipleSpatialLayersPerStream => "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + }; + serializer.serialize_str(variant) + } +} +impl<'de> serde::Deserialize<'de> for video_layer::Mode { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "MODE_UNUSED", + "ONE_SPATIAL_LAYER_PER_STREAM", + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM", + ]; + + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = video_layer::Mode; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + fn visit_i64(self, v: i64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) + }) + } + + fn visit_u64(self, v: u64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) + }) + } + + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "MODE_UNUSED" => Ok(video_layer::Mode::Unused), + "ONE_SPATIAL_LAYER_PER_STREAM" => Ok(video_layer::Mode::OneSpatialLayerPerStream), + "MULTIPLE_SPATIAL_LAYERS_PER_STREAM" => Ok(video_layer::Mode::MultipleSpatialLayersPerStream), + _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), + } + } + } + deserializer.deserialize_any(GeneratedVisitor) + } +} impl serde::Serialize for VideoQuality { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result @@ -41793,3 +43132,193 @@ impl<'de> serde::Deserialize<'de> for WorkerStatus { deserializer.deserialize_any(GeneratedVisitor) } } +impl serde::Serialize for WrappedJoinRequest { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.compression != 0 { + len += 1; + } + if !self.join_request.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("livekit.WrappedJoinRequest", len)?; + if self.compression != 0 { + let v = wrapped_join_request::Compression::try_from(self.compression) + .map_err(|_| serde::ser::Error::custom(format!("Invalid variant {}", self.compression)))?; + struct_ser.serialize_field("compression", &v)?; + } + if !self.join_request.is_empty() { + #[allow(clippy::needless_borrow)] + #[allow(clippy::needless_borrows_for_generic_args)] + struct_ser.serialize_field("joinRequest", pbjson::private::base64::encode(&self.join_request).as_str())?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for WrappedJoinRequest { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "compression", + "join_request", + "joinRequest", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Compression, + JoinRequest, + __SkipField__, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "compression" => Ok(GeneratedField::Compression), + "joinRequest" | "join_request" => Ok(GeneratedField::JoinRequest), + _ => Ok(GeneratedField::__SkipField__), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = WrappedJoinRequest; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct livekit.WrappedJoinRequest") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut compression__ = None; + let mut join_request__ = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::Compression => { + if compression__.is_some() { + return Err(serde::de::Error::duplicate_field("compression")); + } + compression__ = Some(map_.next_value::()? as i32); + } + GeneratedField::JoinRequest => { + if join_request__.is_some() { + return Err(serde::de::Error::duplicate_field("joinRequest")); + } + join_request__ = + Some(map_.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; + } + GeneratedField::__SkipField__ => { + let _ = map_.next_value::()?; + } + } + } + Ok(WrappedJoinRequest { + compression: compression__.unwrap_or_default(), + join_request: join_request__.unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("livekit.WrappedJoinRequest", FIELDS, GeneratedVisitor) + } +} +impl serde::Serialize for wrapped_join_request::Compression { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + let variant = match self { + Self::None => "NONE", + Self::Gzip => "GZIP", + }; + serializer.serialize_str(variant) + } +} +impl<'de> serde::Deserialize<'de> for wrapped_join_request::Compression { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "NONE", + "GZIP", + ]; + + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = wrapped_join_request::Compression; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + fn visit_i64(self, v: i64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Signed(v), &self) + }) + } + + fn visit_u64(self, v: u64) -> std::result::Result + where + E: serde::de::Error, + { + i32::try_from(v) + .ok() + .and_then(|x| x.try_into().ok()) + .ok_or_else(|| { + serde::de::Error::invalid_value(serde::de::Unexpected::Unsigned(v), &self) + }) + } + + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "NONE" => Ok(wrapped_join_request::Compression::None), + "GZIP" => Ok(wrapped_join_request::Compression::Gzip), + _ => Err(serde::de::Error::unknown_variant(value, FIELDS)), + } + } + } + deserializer.deserialize_any(GeneratedVisitor) + } +} From 16e624a8324310faad3578c4084b4ba07d8527b8 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 23:33:16 -0700 Subject: [PATCH 09/19] remove extraneous feature --- examples/local_video/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/local_video/Cargo.toml b/examples/local_video/Cargo.toml index 7ded6dc99..6872927ec 100644 --- a/examples/local_video/Cargo.toml +++ b/examples/local_video/Cargo.toml @@ -14,7 +14,7 @@ path = "src/subscriber.rs" [dependencies] tokio = { version = "1", features = ["full", "parking_lot"] } -livekit = { workspace = true, features = ["rustls-tls-native-roots"] } +livekit = { workspace = true } webrtc-sys = { workspace = true } libwebrtc = { workspace = true } livekit-api = { workspace = true } From 5d39dde2f0728774ba79fa766d3a1a4df898f512 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 23:39:31 -0700 Subject: [PATCH 10/19] wip fixing mjpeg decode --- examples/local_video/src/publisher.rs | 90 ++++++++++++++++++++++----- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index ee130b179..a9eeb3c44 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -145,6 +145,7 @@ async fn main() -> Result<()> { let height = fmt.height(); let fps = fmt.frame_rate(); info!("Camera opened: {}x{} @ {} fps (format: {})", width, height, fps, using_fmt); + debug!("Negotiated nokhwa CameraFormat: {:?}", fmt); // Pace publishing at the requested FPS (not the camera-reported FPS) to hit desired cadence let pace_fps = args.fps as f64; @@ -172,6 +173,10 @@ async fn main() -> Result<()> { // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; let is_yuyv = using_fmt == "YUYV"; + info!( + "Selected conversion path: {}", + if is_yuyv { "YUYV->I420 (libyuv)" } else { "MJPEG->RGB->I420" } + ); // Accurate pacing using absolute schedule (no drift) let mut ticker = tokio::time::interval(Duration::from_secs_f64(1.0 / pace_fps)); @@ -193,6 +198,7 @@ async fn main() -> Result<()> { let mut sum_capture_ms = 0.0; let mut sum_sleep_ms = 0.0; let mut sum_iter_ms = 0.0; + let mut logged_mjpeg_fallback = false; loop { // Wait until the scheduled next frame time let wait_start = Instant::now(); @@ -228,23 +234,73 @@ async fn main() -> Result<()> { } t2_local } else { - // Fallback (e.g., MJPEG): decode to RGB24 then convert to I420 - let rgb = frame_buf.decode_image::()?; - let t2_local = Instant::now(); - unsafe { - let _ = yuv_sys::rs_RGB24ToI420( - rgb.as_raw().as_ptr(), - (width * 3) as i32, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } + // Fallback (e.g., MJPEG): try nokhwa's decode first; if that fails, use image crate + let t2_local = match frame_buf.decode_image::() { + Ok(rgb) => { + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + rgb.as_raw().as_ptr(), + (width * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + Instant::now() + } + Err(e) => { + if !logged_mjpeg_fallback { + log::warn!( + "MJPEG decode via nokhwa failed: {}. Falling back to image crate decode.", + e + ); + logged_mjpeg_fallback = true; + } + let src = frame_buf.buffer(); + match image::load_from_memory(src.as_ref()) { + Ok(img_dyn) => { + let rgb8 = img_dyn.to_rgb8(); + let dec_w = rgb8.width() as u32; + let dec_h = rgb8.height() as u32; + if dec_w != width || dec_h != height { + log::warn!( + "Decoded MJPEG size {}x{} differs from camera {}x{}; skipping resize and attempting convert as-is", + dec_w, + dec_h, + width, + height + ); + } + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + rgb8.as_raw().as_ptr(), + (dec_w * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + Instant::now() + } + Err(e2) => { + return Err(anyhow::anyhow!( + "MJPEG decode failed: {}; fallback with image crate also failed: {}", + e, e2 + )); + } + } + } + }; t2_local }; let t3 = Instant::now(); From 27b8705b955782d8ff1c023cd4bd57502d5e0174 Mon Sep 17 00:00:00 2001 From: David Chen Date: Wed, 29 Oct 2025 23:51:28 -0700 Subject: [PATCH 11/19] revert removal of feature, does not connect w/o it --- examples/local_video/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/local_video/Cargo.toml b/examples/local_video/Cargo.toml index 6872927ec..7ded6dc99 100644 --- a/examples/local_video/Cargo.toml +++ b/examples/local_video/Cargo.toml @@ -14,7 +14,7 @@ path = "src/subscriber.rs" [dependencies] tokio = { version = "1", features = ["full", "parking_lot"] } -livekit = { workspace = true } +livekit = { workspace = true, features = ["rustls-tls-native-roots"] } webrtc-sys = { workspace = true } libwebrtc = { workspace = true } livekit-api = { workspace = true } From 03a64997306d5963e2330ae459890b7456ea06af Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 00:09:37 -0700 Subject: [PATCH 12/19] wip --- examples/local_video/src/publisher.rs | 120 ++++++++++++-------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index a9eeb3c44..bc96098af 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -172,10 +172,10 @@ async fn main() -> Result<()> { // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) }; - let is_yuyv = using_fmt == "YUYV"; + let is_yuyv = fmt.format() == FrameFormat::YUYV; info!( "Selected conversion path: {}", - if is_yuyv { "YUYV->I420 (libyuv)" } else { "MJPEG->RGB->I420" } + if is_yuyv { "YUYV->I420 (libyuv)" } else { "Auto (RGB24 or MJPEG)" } ); // Accurate pacing using absolute schedule (no drift) @@ -234,70 +234,64 @@ async fn main() -> Result<()> { } t2_local } else { - // Fallback (e.g., MJPEG): try nokhwa's decode first; if that fails, use image crate - let t2_local = match frame_buf.decode_image::() { - Ok(rgb) => { - unsafe { - let _ = yuv_sys::rs_RGB24ToI420( - rgb.as_raw().as_ptr(), - (width * 3) as i32, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } - Instant::now() + // Auto path (either RGB24 already or compressed MJPEG) + let src = frame_buf.buffer(); + let t2_local = if src.len() == (width as usize * height as usize * 3) { + // Already RGB24 from backend; convert directly + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + src.as_ref().as_ptr(), + (width * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); } - Err(e) => { - if !logged_mjpeg_fallback { - log::warn!( - "MJPEG decode via nokhwa failed: {}. Falling back to image crate decode.", - e - ); - logged_mjpeg_fallback = true; - } - let src = frame_buf.buffer(); - match image::load_from_memory(src.as_ref()) { - Ok(img_dyn) => { - let rgb8 = img_dyn.to_rgb8(); - let dec_w = rgb8.width() as u32; - let dec_h = rgb8.height() as u32; - if dec_w != width || dec_h != height { - log::warn!( - "Decoded MJPEG size {}x{} differs from camera {}x{}; skipping resize and attempting convert as-is", - dec_w, - dec_h, - width, - height - ); - } - unsafe { - let _ = yuv_sys::rs_RGB24ToI420( - rgb8.as_raw().as_ptr(), - (dec_w * 3) as i32, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } - Instant::now() + Instant::now() + } else { + // Try decoding as MJPEG via image crate + match image::load_from_memory(src.as_ref()) { + Ok(img_dyn) => { + let rgb8 = img_dyn.to_rgb8(); + let dec_w = rgb8.width() as u32; + let dec_h = rgb8.height() as u32; + if dec_w != width || dec_h != height { + log::warn!( + "Decoded MJPEG size {}x{} differs from requested {}x{}; dropping frame", + dec_w, dec_h, width, height + ); + continue; } - Err(e2) => { - return Err(anyhow::anyhow!( - "MJPEG decode failed: {}; fallback with image crate also failed: {}", - e, e2 - )); + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + rgb8.as_raw().as_ptr(), + (dec_w * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + Instant::now() + } + Err(e2) => { + if !logged_mjpeg_fallback { + log::error!( + "MJPEG decode failed; buffer not RGB24 and image decode failed: {}", + e2 + ); + logged_mjpeg_fallback = true; } + continue; } } }; From 7cb75e994eb933b28c8e33eca8b26df0a6448c1e Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 10:56:02 -0700 Subject: [PATCH 13/19] experiement with mjpg -> I420 conversino --- Cargo.lock | 1 + examples/local_video/src/publisher.rs | 96 +++++++++++++++++---------- yuv-sys/Cargo.toml | 1 + yuv-sys/build.rs | 24 ++++++- 4 files changed, 83 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a3df9840..d8c7a80aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7512,6 +7512,7 @@ version = "0.3.10" dependencies = [ "bindgen 0.72.1", "cc", + "pkg-config", "rayon", "regex", ] diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index bc96098af..853de55f4 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -254,44 +254,68 @@ async fn main() -> Result<()> { } Instant::now() } else { - // Try decoding as MJPEG via image crate - match image::load_from_memory(src.as_ref()) { - Ok(img_dyn) => { - let rgb8 = img_dyn.to_rgb8(); - let dec_w = rgb8.width() as u32; - let dec_h = rgb8.height() as u32; - if dec_w != width || dec_h != height { - log::warn!( - "Decoded MJPEG size {}x{} differs from requested {}x{}; dropping frame", - dec_w, dec_h, width, height - ); - continue; - } - unsafe { - let _ = yuv_sys::rs_RGB24ToI420( - rgb8.as_raw().as_ptr(), - (dec_w * 3) as i32, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); + // Try fast MJPEG->I420 via libyuv if available; fallback to image crate + let mut used_fast_mjpeg = false; + let t2_try = unsafe { + // rs_MJPGToI420 returns 0 on success + let ret = yuv_sys::rs_MJPGToI420( + src.as_ref().as_ptr(), + src.len(), + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + width as i32, + height as i32, + ); + if ret == 0 { used_fast_mjpeg = true; Instant::now() } else { t1 } + }; + if used_fast_mjpeg { + t2_try + } else { + // Fallback: decode MJPEG using image crate then RGB24->I420 + match image::load_from_memory(src.as_ref()) { + Ok(img_dyn) => { + let rgb8 = img_dyn.to_rgb8(); + let dec_w = rgb8.width() as u32; + let dec_h = rgb8.height() as u32; + if dec_w != width || dec_h != height { + log::warn!( + "Decoded MJPEG size {}x{} differs from requested {}x{}; dropping frame", + dec_w, dec_h, width, height + ); + continue; + } + unsafe { + let _ = yuv_sys::rs_RGB24ToI420( + rgb8.as_raw().as_ptr(), + (dec_w * 3) as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + Instant::now() } - Instant::now() - } - Err(e2) => { - if !logged_mjpeg_fallback { - log::error!( - "MJPEG decode failed; buffer not RGB24 and image decode failed: {}", - e2 - ); - logged_mjpeg_fallback = true; + Err(e2) => { + if !logged_mjpeg_fallback { + log::error!( + "MJPEG decode failed; buffer not RGB24 and image decode failed: {}", + e2 + ); + logged_mjpeg_fallback = true; + } + continue; } - continue; } } }; diff --git a/yuv-sys/Cargo.toml b/yuv-sys/Cargo.toml index 47fdaab61..f75e103d3 100644 --- a/yuv-sys/Cargo.toml +++ b/yuv-sys/Cargo.toml @@ -11,3 +11,4 @@ bindgen = "0.72.1" cc = "1.0" regex = "1" rayon = "1.8" +pkg-config = "0.3" diff --git a/yuv-sys/build.rs b/yuv-sys/build.rs index 4c5c503cb..3e9a40bd3 100644 --- a/yuv-sys/build.rs +++ b/yuv-sys/build.rs @@ -134,11 +134,29 @@ fn main() { rename_symbols(&fnc_list, &include_files, &source_files); } - cc::Build::new() + // Try to detect system libjpeg (or libjpeg-turbo) via pkg-config to enable MJPEG fast path + let jpeg_pkg = + pkg_config::Config::new() + .probe("libjpeg") + .or_else(|_| pkg_config::Config::new().probe("libjpeg-turbo")) + .or_else(|_| pkg_config::Config::new().probe("jpeg")) + .ok(); + + let mut build = cc::Build::new(); + build .warnings(false) .include(libyuv_dir.join("include")) - .files(source_files.iter().map(|f| f.path())) - .compile("yuv"); + .files(source_files.iter().map(|f| f.path())); + + if let Some(pkg) = &jpeg_pkg { + // Enable JPEG in libyuv and add include paths from pkg-config + build.define("HAVE_JPEG", None); + for p in &pkg.include_paths { + build.include(p); + } + } + + build.compile("yuv"); let mut bindgen = bindgen::Builder::default() .header(include_dir.join("libyuv.h").to_string_lossy()) From 4db0ae4492651fd3936db8d09d9b07d29741d281 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 11:40:57 -0700 Subject: [PATCH 14/19] add conversion path for I400 -> I420 --- examples/local_video/src/publisher.rs | 33 +++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 853de55f4..71908bb95 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -234,13 +234,32 @@ async fn main() -> Result<()> { } t2_local } else { - // Auto path (either RGB24 already or compressed MJPEG) + // Auto path: handle GREY (I400), RGB24, or compressed MJPEG let src = frame_buf.buffer(); - let t2_local = if src.len() == (width as usize * height as usize * 3) { + let src_bytes = src.as_ref(); + let grey_len = (width as usize) * (height as usize); + let t2_local = if src_bytes.len() == grey_len { + // GREY/I400: use libyuv converter + unsafe { + let _ = yuv_sys::rs_I400ToI420( + src_bytes.as_ptr(), + width as i32, + data_y.as_mut_ptr(), + stride_y as i32, + data_u.as_mut_ptr(), + stride_u as i32, + data_v.as_mut_ptr(), + stride_v as i32, + width as i32, + height as i32, + ); + } + Instant::now() + } else if src_bytes.len() == (width as usize * height as usize * 3) { // Already RGB24 from backend; convert directly unsafe { let _ = yuv_sys::rs_RGB24ToI420( - src.as_ref().as_ptr(), + src_bytes.as_ptr(), (width * 3) as i32, data_y.as_mut_ptr(), stride_y as i32, @@ -259,8 +278,8 @@ async fn main() -> Result<()> { let t2_try = unsafe { // rs_MJPGToI420 returns 0 on success let ret = yuv_sys::rs_MJPGToI420( - src.as_ref().as_ptr(), - src.len(), + src_bytes.as_ptr(), + src_bytes.len(), data_y.as_mut_ptr(), stride_y as i32, data_u.as_mut_ptr(), @@ -278,7 +297,7 @@ async fn main() -> Result<()> { t2_try } else { // Fallback: decode MJPEG using image crate then RGB24->I420 - match image::load_from_memory(src.as_ref()) { + match image::load_from_memory(src_bytes) { Ok(img_dyn) => { let rgb8 = img_dyn.to_rgb8(); let dec_w = rgb8.width() as u32; @@ -309,7 +328,7 @@ async fn main() -> Result<()> { Err(e2) => { if !logged_mjpeg_fallback { log::error!( - "MJPEG decode failed; buffer not RGB24 and image decode failed: {}", + "MJPEG decode failed; buffer not RGB24/GRY8 and image decode failed: {}", e2 ); logged_mjpeg_fallback = true; From 60daefafcadb629dc755312261d1fd00a1da26c7 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 11:46:00 -0700 Subject: [PATCH 15/19] try to open camera in GREY --- examples/local_video/src/publisher.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 71908bb95..0fc712f5c 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -123,7 +123,7 @@ async fn main() -> Result<()> { let index = CameraIndex::Index(args.camera_index as u32); let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); let mut camera = Camera::new(index, requested)?; - // Try raw YUYV first (cheaper than MJPEG), fall back to MJPEG + // Try raw YUYV first (cheaper than MJPEG), then GREY, then fall back to MJPEG let wanted = CameraFormat::new( Resolution::new(args.width, args.height), FrameFormat::YUYV, @@ -131,13 +131,23 @@ async fn main() -> Result<()> { ); let mut using_fmt = "YUYV"; if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { - let alt = CameraFormat::new( + // Try GREY (I400) + let grey = CameraFormat::new( Resolution::new(args.width, args.height), - FrameFormat::MJPEG, + FrameFormat::GRAY, args.fps, ); - using_fmt = "MJPEG"; - let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); + using_fmt = "GREY"; + if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(grey))) { + // Fall back to MJPEG + let alt = CameraFormat::new( + Resolution::new(args.width, args.height), + FrameFormat::MJPEG, + args.fps, + ); + using_fmt = "MJPEG"; + let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); + } } camera.open_stream()?; let fmt = camera.camera_format(); From 6069a917118152b2aebc1fe2c20a81f7ef8abe42 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 11:48:32 -0700 Subject: [PATCH 16/19] add more logging --- examples/local_video/src/publisher.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 0fc712f5c..77d0b721b 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -130,6 +130,10 @@ async fn main() -> Result<()> { args.fps, ); let mut using_fmt = "YUYV"; + info!( + "Requesting camera format: YUYV {}x{} @ {} fps", + args.width, args.height, args.fps + ); if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { // Try GREY (I400) let grey = CameraFormat::new( @@ -138,6 +142,10 @@ async fn main() -> Result<()> { args.fps, ); using_fmt = "GREY"; + info!( + "Requesting camera format: GREY {}x{} @ {} fps", + args.width, args.height, args.fps + ); if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(grey))) { // Fall back to MJPEG let alt = CameraFormat::new( @@ -146,6 +154,10 @@ async fn main() -> Result<()> { args.fps, ); using_fmt = "MJPEG"; + info!( + "Requesting camera format: MJPEG {}x{} @ {} fps", + args.width, args.height, args.fps + ); let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); } } From 9529512c719b2a77b31e187e0651e5cf4e05c057 Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 12:05:47 -0700 Subject: [PATCH 17/19] clean up --- examples/local_video/src/publisher.rs | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 77d0b721b..fa0123251 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -9,6 +9,7 @@ use livekit_api::access_token; use log::{debug, info}; use yuv_sys as yuv_sys; use nokhwa::pixel_format::RgbFormat; +use nokhwa::pixel_format::LumaFormat; use nokhwa::utils::{ApiBackend, CameraFormat, CameraIndex, FrameFormat, RequestedFormat, RequestedFormatType, Resolution}; use nokhwa::Camera; use std::env; @@ -121,8 +122,26 @@ async fn main() -> Result<()> { // Setup camera let index = CameraIndex::Index(args.camera_index as u32); - let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); - let mut camera = Camera::new(index, requested)?; + // Prefer LumaFormat for grayscale cameras; fall back to RgbFormat if not supported + let mut camera = match Camera::new( + index.clone(), + RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate), + ) { + Ok(cam) => { + info!("Opened camera with LumaFormat output (highest framerate)"); + cam + } + Err(e) => { + info!( + "LumaFormat not available ({}); falling back to RgbFormat output", + e + ); + Camera::new( + index.clone(), + RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate), + )? + } + }; // Try raw YUYV first (cheaper than MJPEG), then GREY, then fall back to MJPEG let wanted = CameraFormat::new( Resolution::new(args.width, args.height), From 6929eda32ec1384bf75e5b62d5abfa0b26f5c22a Mon Sep 17 00:00:00 2001 From: David Chen Date: Thu, 30 Oct 2025 12:36:05 -0700 Subject: [PATCH 18/19] remove grey support for now --- examples/local_video/src/publisher.rs | 88 +++++---------------------- 1 file changed, 14 insertions(+), 74 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index fa0123251..853de55f4 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -9,7 +9,6 @@ use livekit_api::access_token; use log::{debug, info}; use yuv_sys as yuv_sys; use nokhwa::pixel_format::RgbFormat; -use nokhwa::pixel_format::LumaFormat; use nokhwa::utils::{ApiBackend, CameraFormat, CameraIndex, FrameFormat, RequestedFormat, RequestedFormatType, Resolution}; use nokhwa::Camera; use std::env; @@ -122,63 +121,23 @@ async fn main() -> Result<()> { // Setup camera let index = CameraIndex::Index(args.camera_index as u32); - // Prefer LumaFormat for grayscale cameras; fall back to RgbFormat if not supported - let mut camera = match Camera::new( - index.clone(), - RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate), - ) { - Ok(cam) => { - info!("Opened camera with LumaFormat output (highest framerate)"); - cam - } - Err(e) => { - info!( - "LumaFormat not available ({}); falling back to RgbFormat output", - e - ); - Camera::new( - index.clone(), - RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate), - )? - } - }; - // Try raw YUYV first (cheaper than MJPEG), then GREY, then fall back to MJPEG + let requested = RequestedFormat::new::(RequestedFormatType::AbsoluteHighestFrameRate); + let mut camera = Camera::new(index, requested)?; + // Try raw YUYV first (cheaper than MJPEG), fall back to MJPEG let wanted = CameraFormat::new( Resolution::new(args.width, args.height), FrameFormat::YUYV, args.fps, ); let mut using_fmt = "YUYV"; - info!( - "Requesting camera format: YUYV {}x{} @ {} fps", - args.width, args.height, args.fps - ); if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(wanted))) { - // Try GREY (I400) - let grey = CameraFormat::new( + let alt = CameraFormat::new( Resolution::new(args.width, args.height), - FrameFormat::GRAY, + FrameFormat::MJPEG, args.fps, ); - using_fmt = "GREY"; - info!( - "Requesting camera format: GREY {}x{} @ {} fps", - args.width, args.height, args.fps - ); - if let Err(_) = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(grey))) { - // Fall back to MJPEG - let alt = CameraFormat::new( - Resolution::new(args.width, args.height), - FrameFormat::MJPEG, - args.fps, - ); - using_fmt = "MJPEG"; - info!( - "Requesting camera format: MJPEG {}x{} @ {} fps", - args.width, args.height, args.fps - ); - let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); - } + using_fmt = "MJPEG"; + let _ = camera.set_camera_requset(RequestedFormat::new::(RequestedFormatType::Exact(alt))); } camera.open_stream()?; let fmt = camera.camera_format(); @@ -275,32 +234,13 @@ async fn main() -> Result<()> { } t2_local } else { - // Auto path: handle GREY (I400), RGB24, or compressed MJPEG + // Auto path (either RGB24 already or compressed MJPEG) let src = frame_buf.buffer(); - let src_bytes = src.as_ref(); - let grey_len = (width as usize) * (height as usize); - let t2_local = if src_bytes.len() == grey_len { - // GREY/I400: use libyuv converter - unsafe { - let _ = yuv_sys::rs_I400ToI420( - src_bytes.as_ptr(), - width as i32, - data_y.as_mut_ptr(), - stride_y as i32, - data_u.as_mut_ptr(), - stride_u as i32, - data_v.as_mut_ptr(), - stride_v as i32, - width as i32, - height as i32, - ); - } - Instant::now() - } else if src_bytes.len() == (width as usize * height as usize * 3) { + let t2_local = if src.len() == (width as usize * height as usize * 3) { // Already RGB24 from backend; convert directly unsafe { let _ = yuv_sys::rs_RGB24ToI420( - src_bytes.as_ptr(), + src.as_ref().as_ptr(), (width * 3) as i32, data_y.as_mut_ptr(), stride_y as i32, @@ -319,8 +259,8 @@ async fn main() -> Result<()> { let t2_try = unsafe { // rs_MJPGToI420 returns 0 on success let ret = yuv_sys::rs_MJPGToI420( - src_bytes.as_ptr(), - src_bytes.len(), + src.as_ref().as_ptr(), + src.len(), data_y.as_mut_ptr(), stride_y as i32, data_u.as_mut_ptr(), @@ -338,7 +278,7 @@ async fn main() -> Result<()> { t2_try } else { // Fallback: decode MJPEG using image crate then RGB24->I420 - match image::load_from_memory(src_bytes) { + match image::load_from_memory(src.as_ref()) { Ok(img_dyn) => { let rgb8 = img_dyn.to_rgb8(); let dec_w = rgb8.width() as u32; @@ -369,7 +309,7 @@ async fn main() -> Result<()> { Err(e2) => { if !logged_mjpeg_fallback { log::error!( - "MJPEG decode failed; buffer not RGB24/GRY8 and image decode failed: {}", + "MJPEG decode failed; buffer not RGB24 and image decode failed: {}", e2 ); logged_mjpeg_fallback = true; From 77ef1df67ee4547e4339ff9f38a6c8293fcb2f77 Mon Sep 17 00:00:00 2001 From: David Chen Date: Fri, 31 Oct 2025 22:38:22 -0700 Subject: [PATCH 19/19] try h265 --- examples/local_video/src/publisher.rs | 48 ++++++++++++++++++++------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/examples/local_video/src/publisher.rs b/examples/local_video/src/publisher.rs index 853de55f4..31171281e 100644 --- a/examples/local_video/src/publisher.rs +++ b/examples/local_video/src/publisher.rs @@ -56,6 +56,10 @@ struct Args { /// LiveKit API secret #[arg(long)] api_secret: Option, + + /// Use H.265/HEVC encoding if supported (falls back to H.264 on failure) + #[arg(long, default_value_t = false)] + h265: bool, } fn list_cameras() -> Result<()> { @@ -156,19 +160,39 @@ async fn main() -> Result<()> { RtcVideoSource::Native(rtc_source.clone()), ); - room + // Choose requested codec and attempt to publish; if H.265 fails, retry with H.264 + let requested_codec = if args.h265 { VideoCodec::H265 } else { VideoCodec::H264 }; + info!("Attempting publish with codec: {}", requested_codec.as_str()); + + let publish_opts = |codec: VideoCodec| TrackPublishOptions { + source: TrackSource::Camera, + simulcast: false, + video_codec: codec, + ..Default::default() + }; + + let publish_result = room .local_participant() - .publish_track( - LocalTrack::Video(track.clone()), - TrackPublishOptions { - source: TrackSource::Camera, - simulcast: false, - video_codec: VideoCodec::H264, - ..Default::default() - }, - ) - .await?; - info!("Published camera track"); + .publish_track(LocalTrack::Video(track.clone()), publish_opts(requested_codec)) + .await; + + if let Err(e) = publish_result { + if matches!(requested_codec, VideoCodec::H265) { + log::warn!( + "H.265 publish failed ({}). Falling back to H.264...", + e + ); + room + .local_participant() + .publish_track(LocalTrack::Video(track.clone()), publish_opts(VideoCodec::H264)) + .await?; + info!("Published camera track with H.264 fallback"); + } else { + return Err(e.into()); + } + } else { + info!("Published camera track"); + } // Reusable I420 buffer and frame let mut frame = VideoFrame { rotation: VideoRotation::VideoRotation0, timestamp_us: 0, buffer: I420Buffer::new(width, height) };