Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support rtsp client #144

Merged
merged 5 commits into from
Aug 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 23 additions & 117 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions application/pprtmp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
5 changes: 3 additions & 2 deletions application/pprtmp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions application/pprtmp/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
);
Expand All @@ -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,
);
Expand Down
7 changes: 7 additions & 0 deletions application/xiu/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading