THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiongziliang 2019-04-02 15:08:39 +08:00
parent 791d84d08e 8e314ff82a
commit 4a8f8e3a40
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -69,8 +69,8 @@
| :------------------------------: | :--: | :--: | :--: | :---: | | :------------------------------: | :--: | :--: | :--: | :---: |
| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N | | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N |
| RTMP --> RTSP[S] | Y | N | Y | N | | RTMP --> RTSP[S] | Y | N | Y | N |
| RTSP[S] --> HLS | Y | N | Y | N | | RTSP[S] --> HLS | Y | Y | Y | N |
| RTMP --> HLS | Y | N | Y | N | | RTMP --> HLS | Y | Y | Y | N |
| RTSP[S] --> MP4 | Y | N | Y | N | | RTSP[S] --> MP4 | Y | N | Y | N |
| RTMP --> MP4 | Y | N | Y | N | | RTMP --> MP4 | Y | N | Y | N |
| MP4 --> RTSP[S] | Y | N | Y | N | | MP4 --> RTSP[S] | Y | N | Y | N |
@ -222,7 +222,6 @@
rtmpSrv->start<RtmpSession>(mINI::Instance()[Config::Rtmp::kPort]); rtmpSrv->start<RtmpSession>(mINI::Instance()[Config::Rtmp::kPort]);
httpSrv->start<HttpSession>(mINI::Instance()[Config::Http::kPort]); httpSrv->start<HttpSession>(mINI::Instance()[Config::Http::kPort]);
httpsSrv->start<HttpsSession>(mINI::Instance()[Config::Http::kSSLPort]); httpsSrv->start<HttpsSession>(mINI::Instance()[Config::Http::kSSLPort]);
EventPoller::Instance().runLoop();
``` ```
- 作为播放器： - 作为播放器：
@ -251,7 +250,7 @@
}); });
//支持rtmp、rtsp //支持rtmp、rtsp
(*player)[RtspPlayer::kRtpType] = PlayerBase::RTP_TCP; (*player)[Client::kRtpType] = Rtsp::RTP_TCP;
player->play("rtsp://admin:jzan123456@192.168.0.122/"); player->play("rtsp://admin:jzan123456@192.168.0.122/");
``` ```
- 作为代理服务器： - 作为代理服务器：
@ -297,7 +296,6 @@
pusher->publish("rtmp://jizan.iok.la/live/test"); pusher->publish("rtmp://jizan.iok.la/live/test");
}); });
EventPoller::Instance().runLoop();
``` ```
## QA ## QA
- 怎么测试服务器性能？ - 怎么测试服务器性能？