Skip to content

Commit 4919e0e

Browse files
authored
Merge pull request #144 from harlanc/support_rtsp_client
support rtsp client
2 parents eed8bdb + a791035 commit 4919e0e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2511
-1260
lines changed

Cargo.lock

+23-117
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

application/pprtmp/CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
99

1010
## [Unreleased] - ReleaseDate
1111

12+
## [0.1.4] - 2021-08-11
13+
- Reference new RTMP and streamhub versions.
14+
1215
## [0.1.3] - 2021-05-18
1316
- Reference new RTMP and streamhub versions.
1417

application/pprtmp/Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ log = "0.4.0"
1616
env_logger = "0.10.0"
1717
clap = "4.1.4"
1818

19-
rtmp = "0.4.0"
20-
streamhub = "0.1.0"
19+
streamhub = { path = "../../library/streamhub/" }
20+
rtmp = { path = "../../protocol/rtmp/" }
21+
2122

2223
[dependencies.tokio]
2324
version = "1.26.0"

application/pprtmp/src/main.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use {
22
anyhow::Result,
33
clap::{value_parser, Arg, Command},
44
rtmp::session::client_session::ClientSession,
5-
rtmp::session::client_session::ClientType,
5+
rtmp::session::client_session::ClientSessionType,
66
rtmp::utils::RtmpUrlParser,
77
std::env,
88
std::process::exit,
@@ -59,13 +59,13 @@ async fn main() -> Result<()> {
5959
log::error!("err: {}", err);
6060
}
6161
pull_parser.append_port(String::from("1935"));
62-
let stream1 = TcpStream::connect(pull_parser.raw_domain_name.clone()).await?;
62+
let stream1 = TcpStream::connect(pull_parser.host_with_port.clone()).await?;
6363
let mut pull_client_session = ClientSession::new(
6464
stream1,
65-
ClientType::Play,
66-
pull_parser.raw_domain_name,
65+
ClientSessionType::Pull,
66+
pull_parser.host_with_port,
6767
pull_parser.app_name.clone(),
68-
pull_parser.raw_stream_name,
68+
pull_parser.stream_name_with_query,
6969
producer.clone(),
7070
0,
7171
);
@@ -83,13 +83,13 @@ async fn main() -> Result<()> {
8383
}
8484
push_parser.append_port(String::from("1935"));
8585
// push the rtmp stream from local to remote rtmp server
86-
let stream2 = TcpStream::connect(push_parser.raw_domain_name.clone()).await?;
86+
let stream2 = TcpStream::connect(push_parser.host_with_port.clone()).await?;
8787
let mut push_client_session = ClientSession::new(
8888
stream2,
89-
ClientType::Publish,
90-
push_parser.raw_domain_name,
89+
ClientSessionType::Push,
90+
push_parser.host_with_port,
9191
push_parser.app_name,
92-
push_parser.raw_stream_name,
92+
push_parser.stream_name_with_query,
9393
producer.clone(),
9494
0,
9595
);

application/xiu/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
99

1010
## [Unreleased] - ReleaseDate
1111

12+
## [0.13.0] - 2021-08-11
13+
- Feat: Abstract streamhub message notifications. by @karaler
14+
- Feat: Add optional push_password for simple authentication. by @Ceron257
15+
- Feat: Implement Authorization header support for WebRTC. by @Ceron257
16+
- Fix: XIU cannot receive RTSP stream published by gstreamer #135
17+
- Feat: Support Rtsp pull client logic, and you can pull a remote RTSP stream using HTTP API to XIU now.
18+
1219
## [0.12.7] - 2021-05-18
1320
- Fix: RTMP publish single AAC from ffmpeg client. by @suzp1984
1421
- Fix: RTMP Auth failing due to empty string query string in packet. by @radiohertz

0 commit comments

Comments
 (0)