Skip to content

Commit

Permalink
Merge pull request #2 from levaitamas/ietf
Browse files Browse the repository at this point in the history
Adapt to the IETF MoQ implementation
  • Loading branch information
englishm authored Nov 7, 2024
2 parents d8436e6 + 7b3dc0b commit d1347df
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
113 changes: 35 additions & 78 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand Down
4 changes: 2 additions & 2 deletions src/sink/imp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d1347df

Please sign in to comment.