diff --git a/gst-warp-sink/.gitignore b/gst-warp-sink/.gitignore new file mode 100644 index 0000000..bc8e85f --- /dev/null +++ b/gst-warp-sink/.gitignore @@ -0,0 +1,16 @@ +/target + +/moq-transport/target + +# Added by cargo +# +# already existing elements were commented out + +#/target +/hls* + +# Added by cargo +# +# already existing elements were commented out + +#/target diff --git a/gst-warp-sink/Cargo.lock b/gst-warp-sink/Cargo.lock index e6e2804..d7a7041 100644 --- a/gst-warp-sink/Cargo.lock +++ b/gst-warp-sink/Cargo.lock @@ -648,7 +648,7 @@ version = "0.12.0-alpha.1" source = "git+https://github.com/sdroege/gst-plugin-rs#c7f961cc2216f24e282ed81dbed9be7d29d5ecd0" dependencies = [ "anyhow", - "gst-plugin-version-helper", + "gst-plugin-version-helper 0.8.0 (git+https://github.com/sdroege/gst-plugin-rs)", "gstreamer", "gstreamer-audio", "gstreamer-base", @@ -665,6 +665,15 @@ dependencies = [ "toml_edit 0.21.0", ] +[[package]] +name = "gst-plugin-version-helper" +version = "0.8.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs#caa1451fe80852ea34917bc0bca1429d0e0f5f1b" +dependencies = [ + "chrono", + "toml_edit 0.21.0", +] + [[package]] name = "gstreamer" version = "0.22.0" @@ -1060,6 +1069,7 @@ dependencies = [ "bytes", "chrono", "gst-plugin-fmp4", + "gst-plugin-version-helper 0.8.0 (git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs)", "gstreamer", "gstreamer-app", "gstreamer-base", diff --git a/gst-warp-sink/Cargo.toml b/gst-warp-sink/Cargo.toml index 1184d8f..e8de9f4 100644 --- a/gst-warp-sink/Cargo.toml +++ b/gst-warp-sink/Cargo.toml @@ -22,3 +22,14 @@ isobmff = { git = "https://github.com/LMinJae/isobmff-rs", version = "0.1.0" } bytes = "1.5.0" mp4 = "0.14.0" moq-transport = { git = "https://github.com/kixelated/moq-rs", version = "0.2.0" } + +[lib] +name = "gstmoq" +crate-type = ["cdylib", "rlib"] +path = "src/lib.rs" + +[dev-dependencies] +gst-plugin-version-helper = { git = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" } + +[build-dependencies] +gst-plugin-version-helper = { git = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs", version = "0.8.0" } diff --git a/gst-warp-sink/src/moqsink/imp.rs b/gst-warp-sink/src/moqsink/imp.rs index 638aec0..29b0f90 100644 --- a/gst-warp-sink/src/moqsink/imp.rs +++ b/gst-warp-sink/src/moqsink/imp.rs @@ -329,6 +329,7 @@ impl MoqSink { fn send_to_network(&self, buffer: gst::Buffer) -> Result<(), Box> { //Let this be our publisher + Ok(()) } } @@ -362,11 +363,17 @@ impl ObjectSubclass for MoqSink { srcpad, } } + + type Interfaces; + + type Instance; + + type Class; } impl ObjectImpl for MoqSink { fn constructed(&self, obj: &Self::Type) { - self.parent_constructed(obj); + self.parent_constructed(); obj.add_pad(&self.srcpad).unwrap(); } } @@ -536,12 +543,13 @@ impl Sender { .with_no_client_auth(); // Allow disabling TLS verification altogether. - if config.tls_disable_verify { - let noop = NoCertificateVerification {}; - tls_config - .dangerous() - .set_certificate_verifier(Arc::new(noop)); - } + // if config.tls_disable_verify { + // let noop = NoCertificateVerification {}; + // tls_config + // .dangerous() + // .set_certificate_verifier(Arc::new(noop)); + // } + Ok(()) } async fn send_segment(