feat(livetwo): merged whipinto and whepfrom to livetwo

Cargo.toml

@@ -33,10 +33,9 @@ members = [
     "libs/libwish",
     "libs/signal",
     "libs/net4mqtt",
-    "tools/whepfrom",
-    "tools/whipinto",
     "liveion",
     "liveman",
+    "livetwo",
 ]
 
 [workspace.package]
@@ -59,8 +58,7 @@ tracing = "0.1"
 [dependencies]
 liveion = { path = "liveion" }
 liveman = { path = "liveman" }
-whipinto = { path = "tools/whipinto" }
-whepfrom = { path = "tools/whepfrom" }
+livetwo = { path = "livetwo" }
 signal = { path = "libs/signal" }
 utils = { path = "libs/utils" }
 

tools/whipinto/Cargo.toml → livetwo/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
-name = "whipinto"
-description = "RTP/RTSP to WHIP tool"
+name = "livetwo"
+description = "WHIP/WHEP convert RTP/RTSP tool"
 version.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -10,10 +10,10 @@ repository.workspace = true
 crate-type = ["lib"]
 
 [dependencies]
-cli = { path = "../../libs/cli" }
-rtsp = { path = "../../libs/rtsp" }
-libwish = { path = "../../libs/libwish" }
-signal = { path = "../../libs/signal" }
+cli = { path = "../libs/cli" }
+rtsp = { path = "../libs/rtsp" }
+libwish = { path = "../libs/libwish" }
+signal = { path = "../libs/signal" }
 
 anyhow = { workspace = true }
 tokio = { workspace = true, features = ["full"] }

livetwo/src/lib.rs

@@ -0,0 +1,13 @@
+pub mod whep;
+pub mod whip;
+
+mod payload;
+mod rtspclient;
+
+#[cfg(test)]
+mod test;
+
+const PREFIX_LIB: &str = "WEBRTC";
+const SCHEME_RTSP_SERVER: &str = "rtsp-listen";
+const SCHEME_RTSP_CLIENT: &str = "rtsp";
+const SCHEME_RTP_SDP: &str = "sdp";

tools/whepfrom/src/lib.rs → livetwo/src/whep.rs

@@ -37,12 +37,9 @@ use webrtc::{
 
 use libwish::Client;
 
-const PREFIX_LIB: &str = "WEBRTC";
-const SCHEME_RTSP_SERVER: &str = "rtsp-listen";
-const _SCHEME_RTSP_CLIENT: &str = "rtsp";
-const SCHEME_RTP_SDP: &str = "sdp";
+use crate::{PREFIX_LIB, SCHEME_RTP_SDP, SCHEME_RTSP_SERVER};
 
-pub async fn whepfrom(
+pub async fn from(
     target_url: String,
     set_host: Option<String>,
     whep_url: String,

tools/whipinto/src/lib.rs → livetwo/src/whip.rs

@@ -32,19 +32,12 @@ use webrtc::{
 use cli::{codec_from_str, create_child};
 use libwish::Client;
 
-use rtspclient::setup_rtsp_session;
+use crate::payload;
+use crate::rtspclient::setup_rtsp_session;
 
-mod payload;
-mod rtspclient;
-#[cfg(test)]
-mod test;
+use crate::{PREFIX_LIB, SCHEME_RTP_SDP, SCHEME_RTSP_CLIENT, SCHEME_RTSP_SERVER};
 
-const PREFIX_LIB: &str = "WEBRTC";
-const SCHEME_RTSP_SERVER: &str = "rtsp-listen";
-const SCHEME_RTSP_CLIENT: &str = "rtsp";
-const SCHEME_RTP_SDP: &str = "sdp";
-
-pub async fn whipinto(
+pub async fn into(
     target_url: String,
     set_host: Option<String>,
     whip_url: String,

src/whepfrom.rs

@@ -40,7 +40,7 @@ async fn main() {
         }
     ));
 
-    whepfrom::whepfrom(
+    livetwo::whep::from(
         args.output.clone(),
         args.host.clone(),
         args.whep.clone(),

src/whipinto.rs

@@ -40,7 +40,7 @@ async fn main() {
         }
     ));
 
-    whipinto::whipinto(
+    livetwo::whip::into(
         args.input.clone(),
         args.host.clone(),
         args.whip.clone(),