amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-25 20:27:34 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复rtmps默认端口不对导致无法推/拉流问题 (#2996)

Browse Source 
在使用rtmps推流或者拉流时，端口被默认设置成了1935，正确的端口应该是443.
This commit is contained in:
Jovial Young 2023-11-19 14:37:04 +08:00 committed by GitHub
parent 22f5f56130
commit a13b8417e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Rtmp/RtmpPlayer.cpp
View File

@ -69,7 +69,7 @@ void RtmpPlayer::play(const string &url) {
} }
DebugL << host_url << " " << _app << " " << _stream_id; DebugL << host_url << " " << _app << " " << _stream_id;
uint16_t port = 1935; uint16_t port = start_with(url, "rtmps") ? 443 : 1935;
splitUrl(host_url, host_url, port); splitUrl(host_url, host_url, port);
if (!(*this)[Client::kNetAdapter].empty()) { if (!(*this)[Client::kNetAdapter].empty()) {

2
src/Rtmp/RtmpPusher.cpp
View File

@ -82,7 +82,7 @@ void RtmpPusher::publish(const string &url) {
} }
DebugL << host_url << " " << _app << " " << _stream_id; DebugL << host_url << " " << _app << " " << _stream_id;
uint16_t port = 1935; uint16_t port = start_with(url, "rtmps") ? 443 : 1935;
splitUrl(host_url, host_url, port); splitUrl(host_url, host_url, port);
weak_ptr<RtmpPusher> weakSelf = static_pointer_cast<RtmpPusher>(shared_from_this()); weak_ptr<RtmpPusher> weakSelf = static_pointer_cast<RtmpPusher>(shared_from_this());

3
tests/test_pusherMp4.cpp
View File

@ -116,5 +116,6 @@ int domain(const string &file, const string &url) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// 可以使用test_server生成的mp4文件 // 可以使用test_server生成的mp4文件
// 文件使用绝对路径，推流url支持rtsp和rtmp // 文件使用绝对路径，推流url支持rtsp和rtmp
return domain("/Users/xiongziliang/Downloads/mp4/Quantum.mp4", "rtsp://127.0.0.1/live/rtsp_push"); // return domain("/Users/xiongziliang/Downloads/mp4/Quantum.mp4", "rtsp://127.0.0.1/live/rtsp_push");
return domain(argv[1], argv[2]);
} }