From b7b47db91e67a1ba142f2ab66798eb416bab2f01 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Thu, 13 Jan 2022 16:23:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AUTHORS | 1 + README.md | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index a9da4a0a..41b3771f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,3 +45,4 @@ Xinghua Zhao <(holychaossword@hotmail.com> 明月惊鹊 cgm <2958580318@qq.com> hejilin <1724010622@qq.com> +alexliyu7352 \ No newline at end of file diff --git a/README.md b/README.md index ed56895b..0668e589 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ ![logo](https://raw.githubusercontent.com/xia-chu/ZLMediaKit/master/www/logo.png) -[english readme](https://github.com/xia-chu/ZLMediaKit/blob/master/README_en.md) - # 一个基于C++11的高性能运营级流媒体服务框架 [![license](http://img.shields.io/badge/license-MIT-green.svg)](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE) @@ -23,6 +21,7 @@ - 提供完善的[restful api](https://github.com/xia-chu/ZLMediaKit/wiki/MediaServer%E6%94%AF%E6%8C%81%E7%9A%84HTTP-API)以及[web hook](https://github.com/xia-chu/ZLMediaKit/wiki/MediaServer%E6%94%AF%E6%8C%81%E7%9A%84HTTP-HOOK-API)，支持丰富的业务逻辑。 - 打通了视频监控协议栈与直播协议栈，对RTSP/RTMP支持都很完善。 - 全面支持H265/H264/AAC/G711/OPUS。 +- 功能完善，支持集群、按需转协议、按需推拉流、先播后推、断连续推等功能。 ## 项目定位 @@ -111,13 +110,11 @@ - 支持流量统计、推拉流鉴权等事件 - 支持虚拟主机,可以隔离不同域名 - 支持按需拉流，无人观看自动关断拉流 - - 支持先拉流后推流，提高及时推流画面打开率 - - 支持先播放后推流 - - 支持推流异常断开重连续推播放器不断开 + - 支持先播放后推流，提高及时推流画面打开率 - 提供c api sdk - 支持FFmpeg拉流代理任意格式的流 - 支持http api生成并返回实时截图 - - 支持按需解复用、转协议，当有人观看时才开启转协议 + - 支持按需解复用、转协议，当有人观看时才开启转协议，降低cpu占用率 - 支持溯源模式的集群部署，溯源方式支持rtsp/rtmp/hls/http-ts, 边沿站支持hls, 源站支持多个(采用round robin方式溯源) - rtsp/rtmp/webrtc推流异常断开后，可以在超时时间内重连推流，播放器无感知 @@ -256,6 +253,7 @@ bash build_docker_images.sh [明月惊鹊](mingyuejingque@gmail.com) [cgm](2958580318@qq.com) [hejilin](1724010622@qq.com) +[alexliyu7352]() ## 使用案例 From 9284dc00be8a298e9cfd67ea5aeb9628c3efb5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com> Date: Thu, 13 Jan 2022 18:10:20 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0668e589..6bfc86c8 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ - 打通了视频监控协议栈与直播协议栈，对RTSP/RTMP支持都很完善。 - 全面支持H265/H264/AAC/G711/OPUS。 - 功能完善，支持集群、按需转协议、按需推拉流、先播后推、断连续推等功能。 +- 为什么选择zlmedaikit？独家特性[介绍](https://github.com/ZLMediaKit/ZLMediaKit/wiki/ZLMediakit%E7%8B%AC%E5%AE%B6%E7%89%B9%E6%80%A7%E4%BB%8B%E7%BB%8D) ## 项目定位 From d4d7a72dcbd1ff7df83f7f7d20aab771c62fd1fe Mon Sep 17 00:00:00 2001 From: alexliyu7352 Date: Thu, 13 Jan 2022 20:11:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=9C=B0=E5=9D=80markdow?= =?UTF-8?q?n=E4=B8=8D=E8=AF=86=E5=88=AB=20(#1362)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit github好像没办法渲染(<邮件地址>) 改成mailto:直接使用html --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 6bfc86c8..bcafa28c 100644 --- a/README.md +++ b/README.md @@ -214,47 +214,47 @@ bash build_docker_images.sh [γ瑞γミ](https://github.com/JerryLinGd) [linkingvision](https://www.linkingvision.com/) [茄子](https://github.com/taotaobujue2008) -[好心情](<409257224@qq.com>) +[好心情](mailto:409257224@qq.com) [浮沉](https://github.com/MingZhuLiu) [Xiaofeng Wang](https://github.com/wasphin) [doodoocoder](https://github.com/doodoocoder) [qingci](https://github.com/Colibrow) [swwheihei](https://github.com/swwheihei) [KKKKK5G](https://gitee.com/kkkkk5G) -[Zhou Weimin]() +[Zhou Weimin](mailto:zhouweimin@supremind.com) [Jim Jin](https://github.com/jim-king-2000) -[西瓜丶](<392293307@qq.com>) +[西瓜丶](mailto:392293307@qq.com) [MingZhuLiu](https://github.com/MingZhuLiu) [chengxiaosheng](https://github.com/chengxiaosheng) -[big panda](<2381267071@qq.com>) +[big panda](mailto:2381267071@qq.com) [tanningzhong](https://github.com/tanningzhong) [hctym1995](https://github.com/hctym1995) [hewenyuan](https://gitee.com/kingyuanyuan) -[sunhui]() -[mirs](fangpengcheng@bilibili.com>) -[Kevin Cheng](kevin__cheng@outlook.com>) -[Liu Jiang](root@oopy.org>) +[sunhui](mailto:sunhui200475@163.com) +[mirs](mailto:fangpengcheng@bilibili.com) +[Kevin Cheng](mailto:kevin__cheng@outlook.com) +[Liu Jiang](mailto:root@oopy.org) [along](https://github.com/alongl) -[qingci](xpy66swsry@gmail.com>) -[lyg1949](zh.ghlong@qq.com>) -[zhlong](zh.ghlong@qq.com>) -[大裤衩](3503207480@qq.com>) -[droid.chow](droid.chow@gmail.com>) +[qingci](mailto:xpy66swsry@gmail.com) +[lyg1949](mailto:zh.ghlong@qq.com) +[zhlong](mailto:zh.ghlong@qq.com) +[大裤衩](mailto:3503207480@qq.com) +[droid.chow](mailto:droid.chow@gmail.com) [陈晓林](https://github.com/musicwood) [CharleyWangHZ](https://github.com/CharleyWangHZ) [Johnny](https://github.com/johzzy) [DoubleX69](https://github.com/DoubleX69) [lawrencehj](https://github.com/lawrencehj) -[yangkun](xyyangkun@163.com) -[Xinghua Zhao](holychaossword@hotmail.com) +[yangkun](mailto:xyyangkun@163.com) +[Xinghua Zhao](mailto:holychaossword@hotmail.com) [hejilin](https://github.com/brokensword2018) [rqb500](https://github.com/rqb500) [Alex](https://github.com/alexliyu7352) [Dw9](https://github.com/Dw9) -[明月惊鹊](mingyuejingque@gmail.com) -[cgm](2958580318@qq.com) -[hejilin](1724010622@qq.com) -[alexliyu7352]() +[明月惊鹊](mailto:mingyuejingque@gmail.com) +[cgm](mailto:2958580318@qq.com) +[hejilin](mailto:1724010622@qq.com) +[alexliyu7352](mailto:liyu7352@gmail.com) ## 使用案例