From 5d44e0eb3c309ce7ad0cfb378d0169d8ce3305b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 23 Oct 2022 18:17:51 +0300 Subject: [PATCH] rtp: Move GCC bandwidth estimation element from webrtc to rtp plugin --- net/rtp/Cargo.toml | 1 + net/{webrtc => rtp}/src/gcc/imp.rs | 0 net/{webrtc => rtp}/src/gcc/mod.rs | 0 net/rtp/src/lib.rs | 2 ++ net/webrtc/Cargo.toml | 1 - net/webrtc/src/lib.rs | 2 -- 6 files changed, 3 insertions(+), 3 deletions(-) rename net/{webrtc => rtp}/src/gcc/imp.rs (100%) rename net/{webrtc => rtp}/src/gcc/mod.rs (100%) diff --git a/net/rtp/Cargo.toml b/net/rtp/Cargo.toml index 5569ed45..b6f4679d 100644 --- a/net/rtp/Cargo.toml +++ b/net/rtp/Cargo.toml @@ -14,6 +14,7 @@ gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/g gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] } gst-rtp = { package = "gstreamer-rtp", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"]} once_cell = "1.0" +chrono = { version = "0.4", default-features = false } [dev-dependencies] gst-check = { package = "gstreamer-check", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_20"] } diff --git a/net/webrtc/src/gcc/imp.rs b/net/rtp/src/gcc/imp.rs similarity index 100% rename from net/webrtc/src/gcc/imp.rs rename to net/rtp/src/gcc/imp.rs diff --git a/net/webrtc/src/gcc/mod.rs b/net/rtp/src/gcc/mod.rs similarity index 100% rename from net/webrtc/src/gcc/mod.rs rename to net/rtp/src/gcc/mod.rs diff --git a/net/rtp/src/lib.rs b/net/rtp/src/lib.rs index eeb716b1..140561a0 100644 --- a/net/rtp/src/lib.rs +++ b/net/rtp/src/lib.rs @@ -16,10 +16,12 @@ use gst::glib; mod av1; +mod gcc; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { av1::depay::register(plugin)?; av1::pay::register(plugin)?; + gcc::register(plugin)?; Ok(()) } diff --git a/net/webrtc/Cargo.toml b/net/webrtc/Cargo.toml index 6acf6a0e..a8d037ab 100644 --- a/net/webrtc/Cargo.toml +++ b/net/webrtc/Cargo.toml @@ -17,7 +17,6 @@ gst-sdp = { git="https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", package gst-rtp = { git="https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", package = "gstreamer-rtp", features = ["v1_20"] } gst-utils = { git="https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", package = "gstreamer-utils" } once_cell = "1.0" -chrono = { version = "0.4", default-features = false } anyhow = "1" thiserror = "1" futures = "0.3" diff --git a/net/webrtc/src/lib.rs b/net/webrtc/src/lib.rs index de194532..a0de1937 100644 --- a/net/webrtc/src/lib.rs +++ b/net/webrtc/src/lib.rs @@ -8,13 +8,11 @@ */ use gst::glib; -pub mod gcc; mod signaller; pub mod webrtcsink; fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> { webrtcsink::register(plugin)?; - gcc::register(plugin)?; Ok(()) }