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

全面支持265(包括rtmp)

Browse Source
This commit is contained in:
xiongziliang 2020-04-04 23:20:42 +08:00
parent 070c2c46d7
commit f226aed145
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
README.md
View File

@ -45,6 +45,7 @@
- 支持http[s]-flv直播 - 支持http[s]-flv直播
- 支持websocket-flv直播 - 支持websocket-flv直播
- 支持任意编码格式的rtmp推流，只是除H264/H265+AAC外无法转协议 - 支持任意编码格式的rtmp推流，只是除H264/H265+AAC外无法转协议
- 支持[RTMP-H265](https://github.com/ksvc/FFmpeg/wiki)
- HLS - HLS
- 支持HLS文件生成，自带HTTP文件服务器 - 支持HLS文件生成，自带HTTP文件服务器
@ -85,14 +86,14 @@
| 功能/编码格式 | H264 | H265 | AAC | other | | 功能/编码格式 | H264 | H265 | AAC | other |
| :------------------------------: | :--: | :--: | :--: | :---: | | :------------------------------: | :--: | :--: | :--: | :---: |
| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N | | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | Y | Y | N |
| RTMP --> RTSP[S] | Y | N | Y | N | | RTMP --> RTSP[S] | Y | Y | Y | N |
| RTSP[S] --> HLS | Y | Y | 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 | Y | Y | N | | RTSP[S] --> MP4 | Y | Y | Y | N |
| RTMP --> MP4 | Y | N | Y | N | | RTMP --> MP4 | Y | Y | Y | N |
| MP4 --> RTSP[S] | Y | Y | Y | N | | MP4 --> RTSP[S] | Y | Y | Y | N |
| MP4 --> RTMP | Y | N | Y | N | | MP4 --> RTMP | Y | Y | Y | N |
- 流生成： - 流生成：

11
README_en.md
View File

@ -31,6 +31,7 @@
- H264/AAC codec. - H264/AAC codec.
- Recorded as flv or mp4. - Recorded as flv or mp4.
- Vod of mp4. - Vod of mp4.
- support [RTMP-H265](https://github.com/ksvc/FFmpeg/wiki)
- HLS - HLS
- RTSP RTMP can be converted into HLS,built-in HTTP server. - RTSP RTMP can be converted into HLS,built-in HTTP server.
@ -58,14 +59,14 @@
| protocol/codec | H264 | H265 | AAC | other | | protocol/codec | H264 | H265 | AAC | other |
| :------------------------------: | :--: | :--: | :--: | :---: | | :------------------------------: | :--: | :--: | :--: | :---: |
| RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | N | Y | N | | RTSP[S] --> RTMP/HTTP[S]-FLV/FLV | Y | Y | Y | N |
| RTMP --> RTSP[S] | Y | N | Y | N | | RTMP --> RTSP[S] | Y | Y | Y | N |
| RTSP[S] --> HLS | Y | Y | 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 | Y | Y | N | | RTSP[S] --> MP4 | Y | Y | Y | N |
| RTMP --> MP4 | Y | N | Y | N | | RTMP --> MP4 | Y | Y | Y | N |
| MP4 --> RTSP[S] | Y | Y | Y | N | | MP4 --> RTSP[S] | Y | Y | Y | N |
| MP4 --> RTMP | Y | N | Y | N | | MP4 --> RTMP | Y | Y | Y | N |
- Stream generation： - Stream generation：

2
src/Common/config.h
View File

@ -41,7 +41,7 @@ bool loadIniConfig(const char *ini_path = nullptr);
#define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;} #define CLEAR_ARR(arr) for(auto &item : arr){ item = 0;}
#endif //CLEAR_ARR #endif //CLEAR_ARR
#define SERVER_NAME "ZLMediaKit-4.0(build in " __DATE__ " " __TIME__ ")" #define SERVER_NAME "ZLMediaKit-5.0(build in " __DATE__ " " __TIME__ ")"
#define VHOST_KEY "vhost" #define VHOST_KEY "vhost"
#define HTTP_SCHEMA "http" #define HTTP_SCHEMA "http"
#define RTSP_SCHEMA "rtsp" #define RTSP_SCHEMA "rtsp"