diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1ffb218..d1d6f0d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Install Rust with clippy/rustfmt - uses: actions-rust-lang/setup-rust-toolchain@v1 diff --git a/Cargo.lock b/Cargo.lock index 9d874ab..f8edeaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,17 +105,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.3.0" @@ -245,9 +234,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.8" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c" dependencies = [ "smallvec", "target-lexicon", @@ -385,19 +374,6 @@ dependencies = [ "regex", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.11.5" @@ -562,9 +538,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "gio-sys" -version = "0.19.8" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" +checksum = "217f464cad5946ae4369c355155e2d16b488c08920601083cb4891e352ae777b" dependencies = [ "glib-sys", "gobject-sys", @@ -575,9 +551,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.9" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" +checksum = "358431b0e0eb15b9d02db52e1f19c805b953c5c168099deb3de88beab761768c" dependencies = [ "bitflags", "futures-channel", @@ -592,14 +568,13 @@ dependencies = [ "libc", "memchr", "smallvec", - "thiserror", ] [[package]] name = "glib-macros" -version = "0.19.9" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" +checksum = "e7d21ca27acfc3e91da70456edde144b4ac7c36f78ee77b10189b3eb4901c156" dependencies = [ "heck", "proc-macro-crate", @@ -610,9 +585,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.19.8" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" +checksum = "8a5911863ab7ecd4a6f8d5976f12eeba076b23669c49b066d877e742544aa389" dependencies = [ "libc", "system-deps", @@ -626,9 +601,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.19.8" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" +checksum = "a4c674d2ff8478cf0ec29d2be730ed779fef54415a2fb4b565c52def62696462" dependencies = [ "glib-sys", "libc", @@ -647,9 +622,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.7" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0b90646bb67fccf80d228f5333f2a0745526818ccefbf5a97326c76d30e4d" +checksum = "680006694e79692f831ca4f3ba6e147b8c23db289b2df1d33a4a97fd038145d7" dependencies = [ "cfg-if", "futures-channel", @@ -672,9 +647,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39d55668b23fc69f1843daa42b43d289c00fe38e9586c5453b134783d2dd75a3" +checksum = "a11df90e3abf1d9747111c41902338fc1bd13b1c23b27fb828d43e57bd190134" dependencies = [ "atomic_refcell", "cfg-if", @@ -686,9 +661,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5448abb00c197e3ad306710293bf757303cbeab4036b5ccad21c7642b8bf00c9" +checksum = "d691b2bb51a9e5727fb33c3b53fb64ee5b80c40cbbd250941a6d44b142f7a6a0" dependencies = [ "glib-sys", "gobject-sys", @@ -699,9 +674,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.6" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f147e7c6bc9313d5569eb15da61f6f64026ec69791922749de230583a07286" +checksum = "db89964774a97d5b092e2d124debc6bbcaf34b5c7cdef1759f4a9e1e3f8326ef" dependencies = [ "glib-sys", "gobject-sys", @@ -721,15 +696,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.9" @@ -956,7 +922,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "wasi", "windows-sys 0.52.0", @@ -978,16 +944,16 @@ dependencies = [ ] [[package]] -name = "moq-gst" +name = "moq-gst-ietf" version = "0.1.0" dependencies = [ "anyhow", "bytes", - "env_logger 0.9.3", + "env_logger", "gst-plugin-version-helper", "gstreamer", "gstreamer-base", - "moq-native", + "moq-native-ietf", "moq-pub", "moq-transport", "once_cell", @@ -996,10 +962,10 @@ dependencies = [ ] [[package]] -name = "moq-native" -version = "0.4.0" +name = "moq-native-ietf" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "431ed68c3fc33dc8013c0ef8538fb240a68de1a4947b6601e1cf806863dca44d" +checksum = "39b631331a29beb91fd91aa906c9391a37f8cae19a1f96b4953661db4b4361c7" dependencies = [ "anyhow", "clap", @@ -1021,17 +987,17 @@ dependencies = [ [[package]] name = "moq-pub" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3712e4f294e21f6a6b8f8a9267aa9aee85dc26a3a580344a49707dd2cc698" +checksum = "bdc673305674b2c13c1a3dbca15b1d6d5724dd199fe18e2cddea61613829e9c0" dependencies = [ "anyhow", "bytes", "clap", - "env_logger 0.11.5", + "env_logger", "log", "moq-catalog", - "moq-native", + "moq-native-ietf", "moq-transport", "mp4", "rfc6381-codec", @@ -1044,9 +1010,9 @@ dependencies = [ [[package]] name = "moq-transport" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddda15a420e8510d349c1f33ac006cc950f282f61201e77b6dd555a6f8955f92" +checksum = "4839a5cb144549cc0f654a03e50c7d96c95ebb6f887ef19f3378a9f261ad2c95" dependencies = [ "bytes", "futures", @@ -1719,9 +1685,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.2" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "66d23aaf9f331227789a99e8de4c91bf46703add012bdfd45fdecdfb2975a005" dependencies = [ "cfg-expr", "heck", @@ -1736,15 +1702,6 @@ version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.63" diff --git a/Cargo.toml b/Cargo.toml index 5f7d34d..eaa50be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "moq-gst" +name = "moq-gst-ietf" description = "Media over QUIC - gstreamer plugin" authors = ["Luke Curley"] -repository = "https://github.com/kixelated/moq-gst" +repository = "https://github.com/englishm/moq-gst" license = "MIT OR Apache-2.0" version = "0.1.0" @@ -14,23 +14,23 @@ categories = ["multimedia", "network-programming", "web-programming"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -moq-transport = "0.6" -moq-native = "0.4" -moq-pub = "0.7" +moq-transport = "0.8" +moq-native-ietf = "0.5" +moq-pub = "0.8" -gst = { package = "gstreamer", version = "0.22" } -gst-base = { package = "gstreamer-base", version = "0.22" } +gst = { package = "gstreamer", version = "0.23" } +gst-base = { package = "gstreamer-base", version = "0.23" } once_cell = "1" bytes = "1" url = "2" tokio = { version = "1", features = ["full"] } -env_logger = "0.9" +env_logger = "0.11" anyhow = { version = "1", features = ["backtrace"] } [build-dependencies] gst-plugin-version-helper = "0.8" [lib] -name = "gstmoq" +name = "gstmoqietf" crate-type = ["cdylib","rlib"] path = "src/lib.rs" diff --git a/src/lib.rs b/src/lib.rs index 3273a01..fbbf7ab 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,7 +8,7 @@ pub fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { } gst::plugin_define!( - gstmoq, + moqietf, env!("CARGO_PKG_DESCRIPTION"), plugin_init, concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")), diff --git a/src/sink/imp.rs b/src/sink/imp.rs index 2f52547..460bee0 100644 --- a/src/sink/imp.rs +++ b/src/sink/imp.rs @@ -4,8 +4,8 @@ use gst::prelude::*; use gst::subclass::prelude::*; use gst_base::subclass::prelude::*; -use moq_native::quic; -use moq_native::tls; +use moq_native_ietf::quic; +use moq_native_ietf::tls; use moq_transport::serve::Tracks; use moq_transport::serve::TracksReader; use once_cell::sync::Lazy;