From 67eb75048cdefc7e1e84f56f8a84ef71aefa469a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com>
Date: Thu, 8 Apr 2021 18:11:21 +0800
Subject: [PATCH 1/3] Update README.md
---
README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 73ba90eb..f4712868 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
## 项目特点
- 基于C++11开发，避免使用裸指针，代码稳定可靠，性能优越。
-- 支持多种协议(RTSP/RTMP/HLS/HTTP-FLV/WebSocket-FLV/GB28181/HTTP-TS/WebSocket-TS/HTTP-fMP4/WebSocket-fMP4/MP4),支持协议互转。
+- 支持多种协议(RTSP/RTMP/HLS/HTTP-FLV/WebSocket-FLV/GB28181/HTTP-TS/WebSocket-TS/HTTP-fMP4/WebSocket-fMP4/MP4/WebRTC),支持协议互转。
- 使用多路复用/多线程/异步网络IO模式开发，并发性能优越，支持海量客户端连接。
- 代码经过长期大量的稳定性、性能测试，已经在线上商用验证已久。
- 支持linux、macos、ios、android、windows全平台。
@@ -92,6 +92,10 @@
- RTSP/RTMP/HTTP-FLV/WS-FLV支持MP4文件点播，支持seek
- 支持H264/H265/AAC/G711/OPUS编码
+- WebRTC(体验,请使用dev分支)
+ - 支持WebRTC推流，支持转其他协议
+ - 支持WebRTC播放，支持其他协议转WebRTC
+
- 其他
- 支持丰富的restful api以及web hook事件
- 支持简单的telnet调试
From e899064b2a273b494f8694628ae830e2cf3ddf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com>
Date: Fri, 9 Apr 2021 19:58:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0webrtc=E7=9B=B8=E5=85=B3?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index f4712868..1322dfa5 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
## 功能清单
### 功能一览
-
+
- RTSP[S]
- RTSP[S] 服务器，支持RTMP/MP4/HLS转RTSP[S],支持亚马逊echo show这样的设备
From 9b57edff09cfb4b71696c15dc133343eac258add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com>
Date: Fri, 9 Apr 2021 20:10:57 +0800
Subject: [PATCH 3/3] webrtc supported
---
README_en.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/README_en.md b/README_en.md
index a89d0ded..b37074c3 100644
--- a/README_en.md
+++ b/README_en.md
@@ -11,7 +11,7 @@
## Why ZLMediaKit?
- Developed based on C++ 11, the code is stable and reliable, avoiding the use of raw pointers, cross-platform porting is simple and convenient, and the code is clear and concise.
-- Support rich streaming media protocols(`RTSP/RTMP/HLS/HTTP-FLV/WebSocket-flv/HTTP-TS/WebSocket-TS/HTTP-fMP4/Websocket-fMP4/MP4`),and support Inter-protocol conversion.
+- Support rich streaming media protocols(`RTSP/RTMP/HLS/HTTP-FLV/WebSocket-flv/HTTP-TS/WebSocket-TS/HTTP-fMP4/Websocket-fMP4/MP4/WebRTC`),and support Inter-protocol conversion.
- Multiplexing asynchronous network IO based on epoll and multi thread，extreme performance.
- Well performance and stable test,can be used commercially.
- Support linux, macos, ios, android, Windows Platforms.
@@ -55,6 +55,10 @@
- WebSocket Server and Client.
- File access authentication.
+- WebRTC(experiential, dev branch)
+ - Support webrtc push stream and transfer to other protocols
+ - Support webrtc play, support other protocol to webrtc
+
- Others
- Support stream proxy by ffmpeg.
- RESTful http api and http hook event api.