Merge pull request #144 from harlanc/support_rtsp_client

support rtsp client
harlanc · Aug 10, 2024 · 4919e0e · 4919e0e
2 parents eed8bdb + a791035
commit 4919e0e
Show file tree

Hide file tree

Showing 63 changed files with 2,511 additions and 1,260 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/application/pprtmp/CHANGELOG.md b/application/pprtmp/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+## [0.1.4] - 2021-08-11
+- Reference new RTMP and streamhub versions.
+
 ## [0.1.3] - 2021-05-18
 - Reference new RTMP and streamhub versions.
 

diff --git a/application/pprtmp/Cargo.toml b/application/pprtmp/Cargo.toml
@@ -16,8 +16,9 @@ log = "0.4.0"
 env_logger = "0.10.0"
 clap = "4.1.4"
 
-rtmp = "0.4.0"
-streamhub = "0.1.0"
+streamhub = { path = "../../library/streamhub/" }
+rtmp = { path = "../../protocol/rtmp/" }
+
 
 [dependencies.tokio]
 version = "1.26.0"

diff --git a/application/pprtmp/src/main.rs b/application/pprtmp/src/main.rs
@@ -2,7 +2,7 @@ use {
     anyhow::Result,
     clap::{value_parser, Arg, Command},
     rtmp::session::client_session::ClientSession,
-    rtmp::session::client_session::ClientType,
+    rtmp::session::client_session::ClientSessionType,
     rtmp::utils::RtmpUrlParser,
     std::env,
     std::process::exit,
@@ -59,13 +59,13 @@ async fn main() -> Result<()> {
         log::error!("err: {}", err);
     }
     pull_parser.append_port(String::from("1935"));
-    let stream1 = TcpStream::connect(pull_parser.raw_domain_name.clone()).await?;
+    let stream1 = TcpStream::connect(pull_parser.host_with_port.clone()).await?;
     let mut pull_client_session = ClientSession::new(
         stream1,
-        ClientType::Play,
-        pull_parser.raw_domain_name,
+        ClientSessionType::Pull,
+        pull_parser.host_with_port,
         pull_parser.app_name.clone(),
-        pull_parser.raw_stream_name,
+        pull_parser.stream_name_with_query,
         producer.clone(),
         0,
     );
@@ -83,13 +83,13 @@ async fn main() -> Result<()> {
     }
     push_parser.append_port(String::from("1935"));
     // push the rtmp stream from local to remote rtmp server
-    let stream2 = TcpStream::connect(push_parser.raw_domain_name.clone()).await?;
+    let stream2 = TcpStream::connect(push_parser.host_with_port.clone()).await?;
     let mut push_client_session = ClientSession::new(
         stream2,
-        ClientType::Publish,
-        push_parser.raw_domain_name,
+        ClientSessionType::Push,
+        push_parser.host_with_port,
         push_parser.app_name,
-        push_parser.raw_stream_name,
+        push_parser.stream_name_with_query,
         producer.clone(),
         0,
     );

diff --git a/application/xiu/CHANGELOG.md b/application/xiu/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+## [0.13.0] - 2021-08-11
+- Feat: Abstract streamhub message notifications.  by @karaler 
+- Feat: Add optional push_password for simple authentication. by @Ceron257 
+- Feat: Implement Authorization header support for WebRTC. by @Ceron257 
+- Fix: XIU cannot receive RTSP stream published by gstreamer #135
+- Feat: Support Rtsp pull client logic, and you can pull a remote RTSP stream using HTTP API to XIU now.
+
 ## [0.12.7] - 2021-05-18
 - Fix: RTMP publish single AAC from ffmpeg client.  by @suzp1984
 - Fix: RTMP Auth failing due to empty string query string in packet. by @radiohertz