Rename rtpav1 plugin to just rtp

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/243

16 files changed, 24 insertions, 20 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 6cf2b3bef..980dd8142 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ members = [
     "net/onvif",
     "net/raptorq",
     "net/reqwest",
-    "net/rtpav1",
+    "net/rtp",
     "net/webrtc-http",
     "net/webrtc",
     "net/webrtc/protocol",
@@ -67,7 +67,7 @@ default-members = [
     "net/onvif",
     "net/raptorq",
     "net/reqwest",
-    "net/rtpav1",
+    "net/rtp",
     "net/webrtc-http",
     "net/webrtc",
     "net/webrtc/protocol",
diff --git a/meson.build b/meson.build
index 6b653dcef..a0aa1289e 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,7 @@ plugins = {
   'gst-plugin-onvif': 'libgstrsonvif',
   'gst-plugin-raptorq': 'libgstraptorq',
   'gst-plugin-reqwest': 'libgstreqwest',
-  'gst-plugin-rtpav1': 'libgstrtpav1',
+  'gst-plugin-rtp': 'libgstrsrtp',
   'gst-plugin-webrtchttp': 'libgstwebrtchttp',
   'gst-plugin-webrtc': 'libgstrswebrtc',
 
diff --git a/net/rtpav1/Cargo.toml b/net/rtp/Cargo.toml
index b0ffd57f6..5569ed454 100644
--- a/net/rtpav1/Cargo.toml
+++ b/net/rtp/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "gst-plugin-rtpav1"
+name = "gst-plugin-rtp"
 version = "0.9.0-alpha.1"
-authors = ["Vivienne Watermeier <vwatermeier@igalia.com>"]
+authors = ["Vivienne Watermeier <vwatermeier@igalia.com>", "Sebastian Dröge <sebastian@centricular.com>"]
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 license = "MPL-2.0"
 edition = "2021"
-description = "AV1 RTP (De)payloader Plugins"
+description = "GStreamer Rust RTP Plugin"
 rust-version = "1.63"
 
 [dependencies]
@@ -22,7 +22,7 @@ gst-check = { package = "gstreamer-check",  git = "https://gitlab.freedesktop.or
 gst-plugin-version-helper = { path = "../../version-helper" }
 
 [lib]
-name = "gstrtpav1"
+name = "gstrsrtp"
 crate-type = ["cdylib", "rlib"]
 path = "src/lib.rs"
 
diff --git a/net/rtpav1/build.rs b/net/rtp/build.rs
index abb3ea50c..abb3ea50c 100644
--- a/net/rtpav1/build.rs
+++ b/net/rtp/build.rs
diff --git a/net/rtpav1/src/common/aggr_header.rs b/net/rtp/src/av1/common/aggr_header.rs
index 16db80fa8..74c3462df 100644
--- a/net/rtpav1/src/common/aggr_header.rs
+++ b/net/rtp/src/av1/common/aggr_header.rs
@@ -54,7 +54,7 @@ impl From<AggregationHeader> for u8 {
 
 #[cfg(test)]
 mod tests {
-    use crate::common::*;
+    use crate::av1::common::*;
 
     const HEADERS: [(u8, AggregationHeader); 3] = [
         (
diff --git a/net/rtpav1/src/common/error.rs b/net/rtp/src/av1/common/error.rs
index 29d1026a6..29d1026a6 100644
--- a/net/rtpav1/src/common/error.rs
+++ b/net/rtp/src/av1/common/error.rs
diff --git a/net/rtpav1/src/common/integers.rs b/net/rtp/src/av1/common/integers.rs
index e084e9d17..e084e9d17 100644
--- a/net/rtpav1/src/common/integers.rs
+++ b/net/rtp/src/av1/common/integers.rs
diff --git a/net/rtpav1/src/common/mod.rs b/net/rtp/src/av1/common/mod.rs
index 53b30e956..53b30e956 100644
--- a/net/rtpav1/src/common/mod.rs
+++ b/net/rtp/src/av1/common/mod.rs
diff --git a/net/rtpav1/src/common/obu.rs b/net/rtp/src/av1/common/obu.rs
index dedaba072..53360a72b 100644
--- a/net/rtpav1/src/common/obu.rs
+++ b/net/rtp/src/av1/common/obu.rs
@@ -7,7 +7,7 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-use crate::common::{leb128_size, parse_leb128};
+use crate::av1::common::{leb128_size, parse_leb128};
 use bitstream_io::{BitRead, BitReader, Endianness};
 use std::io::{self, Read, Seek};
 
diff --git a/net/rtpav1/src/depay/imp.rs b/net/rtp/src/av1/depay/imp.rs
index 0d1dd6c66..c2a163a2d 100644
--- a/net/rtpav1/src/depay/imp.rs
+++ b/net/rtp/src/av1/depay/imp.rs
@@ -18,7 +18,7 @@ use std::{
 use bitstream_io::{BitReader, BitWriter};
 use once_cell::sync::Lazy;
 
-use crate::common::{
+use crate::av1::common::{
     err_opt, leb128_size, parse_leb128, write_leb128, AggregationHeader, ObuType, SizedObu,
     UnsizedObu, CLOCK_RATE, ENDIANNESS,
 };
diff --git a/net/rtpav1/src/depay/mod.rs b/net/rtp/src/av1/depay/mod.rs
index 3f7cd5af8..3f7cd5af8 100644
--- a/net/rtpav1/src/depay/mod.rs
+++ b/net/rtp/src/av1/depay/mod.rs
diff --git a/net/rtp/src/av1/mod.rs b/net/rtp/src/av1/mod.rs
new file mode 100644
index 000000000..1bf621352
--- /dev/null
+++ b/net/rtp/src/av1/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: MPL-2.0
+
+mod common;
+pub mod depay;
+pub mod pay;
diff --git a/net/rtpav1/src/pay/imp.rs b/net/rtp/src/av1/pay/imp.rs
index fdd5ae261..1aaf525eb 100644
--- a/net/rtpav1/src/pay/imp.rs
+++ b/net/rtp/src/av1/pay/imp.rs
@@ -19,7 +19,7 @@ use std::{
 use bitstream_io::{BitReader, BitWriter};
 use once_cell::sync::Lazy;
 
-use crate::common::{
+use crate::av1::common::{
     err_flow, leb128_size, write_leb128, ObuType, SizedObu, CLOCK_RATE, ENDIANNESS,
 };
 
@@ -680,7 +680,7 @@ impl RTPBasePayloadImpl for RTPAv1Pay {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::common::*;
+    use crate::av1::common::*;
 
     #[test]
     fn test_consider_new_packet() {
diff --git a/net/rtpav1/src/pay/mod.rs b/net/rtp/src/av1/pay/mod.rs
index 151039535..151039535 100644
--- a/net/rtpav1/src/pay/mod.rs
+++ b/net/rtp/src/av1/pay/mod.rs
diff --git a/net/rtpav1/src/lib.rs b/net/rtp/src/lib.rs
index 9ad78ec6c..eeb716b15 100644
--- a/net/rtpav1/src/lib.rs
+++ b/net/rtp/src/lib.rs
@@ -9,24 +9,23 @@
 #![allow(unused_doc_comments)]
 
 /**
- * plugin-rtpav1:
+ * plugin-rsrtp:
  *
  * Since: plugins-rs-0.9.0
  */
 use gst::glib;
 
-mod common;
-pub mod depay;
-pub mod pay;
+mod av1;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
-    depay::register(plugin)?;
-    pay::register(plugin)?;
+    av1::depay::register(plugin)?;
+    av1::pay::register(plugin)?;
+
     Ok(())
 }
 
 gst::plugin_define!(
-    rtpav1,
+    rsrtp,
     env!("CARGO_PKG_DESCRIPTION"),
     plugin_init,
     concat!(env!("CARGO_PKG_VERSION"), "-", env!("COMMIT_ID")),
diff --git a/net/rtpav1/tests/rtpav1.rs b/net/rtp/tests/rtpav1.rs
index 8f7db7032..d8623c524 100644
--- a/net/rtpav1/tests/rtpav1.rs
+++ b/net/rtp/tests/rtpav1.rs
@@ -17,7 +17,7 @@ fn init() {
 
     INIT.call_once(|| {
         gst::init().unwrap();
-        gstrtpav1::plugin_register_static().expect("rtpav1 test");
+        gstrsrtp::plugin_register_static().expect("rtpav1 test");
     });
 }