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

合并 #2183

Browse Source
This commit is contained in:
ziyue 2023-01-02 12:04:06 +08:00
parent 08c47ff4f0
commit f5755a17e7
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/media-server

@ -1 +1 @@
Subproject commit 357ef885afa5112c8cb873eab21d94d26744c0ab Subproject commit 51e08ea0cc366ed772e5690f874cebbbeebe591e

3
AUTHORS
View File

@ -64,4 +64,5 @@ WuPeng <wp@zafu.edu.cn>
[custompal](https://github.com/custompal) [custompal](https://github.com/custompal)
[PioLing](https://github.com/PioLing) [PioLing](https://github.com/PioLing)
[KevinZang](https://github.com/ZSC714725) [KevinZang](https://github.com/ZSC714725)
[gongluck](https://github.com/gongluck) [gongluck](https://github.com/gongluck)
[a-ucontrol](https://github.com/a-ucontrol)

3
README.md
View File

@ -80,7 +80,7 @@
- fMP4 - fMP4
- 支持http[s]-fmp4直播 - 支持http[s]-fmp4直播
- 支持ws[s]-fmp4直播 - 支持ws[s]-fmp4直播
- 支持H264/H265/AAC/G711/OPUS编码 - 支持H264/H265/AAC/G711/OPUS/MJPEG编码
- HTTP[S]与WebSocket - HTTP[S]与WebSocket
- 服务器支持`目录索引生成`,`文件下载`,`表单提交请求` - 服务器支持`目录索引生成`,`文件下载`,`表单提交请求`
@ -290,6 +290,7 @@ bash build_docker_images.sh
[PioLing](https://github.com/PioLing) [PioLing](https://github.com/PioLing)
[KevinZang](https://github.com/ZSC714725) [KevinZang](https://github.com/ZSC714725)
[gongluck](https://github.com/gongluck) [gongluck](https://github.com/gongluck)
[a-ucontrol](https://github.com/a-ucontrol)
## 使用案例 ## 使用案例

2
src/Rtsp/RtspSession.h
View File

@ -74,6 +74,8 @@ protected:
//回复客户端 //回复客户端
virtual bool sendRtspResponse(const std::string &res_code, const StrCaseMap &header = StrCaseMap(), const std::string &sdp = "", const char *protocol = "RTSP/1.0"); virtual bool sendRtspResponse(const std::string &res_code, const StrCaseMap &header = StrCaseMap(), const std::string &sdp = "", const char *protocol = "RTSP/1.0");
protected:
//url解析后保存的相关信息 //url解析后保存的相关信息
MediaInfo _media_info; MediaInfo _media_info;