From e89e7af5e71329afefc79457e6d4cfe3f7ab9a9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com> Date: Tue, 20 Aug 2019 09:45:21 +0800 Subject: [PATCH 1/4] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c573bb67..4f7b2f6b 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,12 @@ - Apple OSX(Darwin), both 32 and 64bits. - All hardware with x86/x86_64/arm/mips cpu. - Windows. -- **You must use git to clone the complete code. Do not download the source code by downloading zip package. Otherwise, the sub-module code will not be downloaded by default.** +- **You must use git to clone the complete code. Do not download the source code by downloading zip package. Otherwise, the sub-module code will not be downloaded by default.You can do it like this:** +``` +git clone https://github.com/zlmediakit/ZLMediaKit.git +cd ZLMediaKit +git submodule update --init +``` From 1fcb0f6284a7ad2f045a63c3f990ab93b3d87f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com> Date: Tue, 20 Aug 2019 09:46:41 +0800 Subject: [PATCH 2/4] Update README_CN.md --- README_CN.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README_CN.md b/README_CN.md index 447efd93..3b453fe8 100644 --- a/README_CN.md +++ b/README_CN.md @@ -128,7 +128,12 @@ ## 编译要求 - 编译器支持C++11，GCC4.8/Clang3.3/VC2015或以上 - cmake3.2或以上 -- **必须使用git下载完整的代码，不要使用下载zip包的方式下载源码，否则子模块代码默认不下载！** +- **必须使用git下载完整的代码，不要使用下载zip包的方式下载源码，否则子模块代码默认不下载！你可以像以下这样操作:** +``` +git clone https://github.com/zlmediakit/ZLMediaKit.git +cd ZLMediaKit +git submodule update --init +``` ## 编译(Linux) - 我的编译环境 From 63caabf4f19d4b781aa24e9783ed5165e2825a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com> Date: Tue, 20 Aug 2019 09:54:23 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4f7b2f6b..efff6ddf 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumber ## Usage - As server： - ``` + ```cpp TcpServer::Ptr rtspSrv(new TcpServer()); TcpServer::Ptr rtmpSrv(new TcpServer()); TcpServer::Ptr httpSrv(new TcpServer()); @@ -250,7 +250,7 @@ It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumber ``` - As player： - ``` + ```cpp MediaPlayer::Ptr player(new MediaPlayer()); weak_ptr weakPlayer = player; player->setOnPlayResult([weakPlayer](const SockException &ex) { @@ -279,7 +279,7 @@ It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumber player->play("rtsp://admin:jzan123456@192.168.0.122/"); ``` - As proxy server： - ``` + ```cpp //support rtmp and rtsp url //just support H264+AAC auto urlList = {"rtmp://live.hkstv.hk.lxdns.com/live/hks", @@ -294,7 +294,7 @@ It is recommended to compile on Ubuntu or MacOS，compiling on windows is cumber ``` - As puser： - ``` + ```cpp PlayerProxy::Ptr player(new PlayerProxy("app","stream")); player->play("rtmp://live.hkstv.hk.lxdns.com/live/hks"); From 64350a5b1011081fc06b3b47cffe68a150dd45e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E6=A5=9A?= <771730766@qq.com> Date: Tue, 20 Aug 2019 09:55:18 +0800 Subject: [PATCH 4/4] Update README_CN.md --- README_CN.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README_CN.md b/README_CN.md index 3b453fe8..504cf0b6 100644 --- a/README_CN.md +++ b/README_CN.md @@ -225,7 +225,7 @@ git submodule update --init ``` ## 使用方法 - 作为服务器： - ``` + ```cpp TcpServer::Ptr rtspSrv(new TcpServer()); TcpServer::Ptr rtmpSrv(new TcpServer()); TcpServer::Ptr httpSrv(new TcpServer()); @@ -238,7 +238,7 @@ git submodule update --init ``` - 作为播放器： - ``` + ```cpp MediaPlayer::Ptr player(new MediaPlayer()); weak_ptr weakPlayer = player; player->setOnPlayResult([weakPlayer](const SockException &ex) { @@ -267,7 +267,7 @@ git submodule update --init player->play("rtsp://admin:jzan123456@192.168.0.122/"); ``` - 作为代理服务器： - ``` + ```cpp //support rtmp and rtsp url //just support H264+AAC auto urlList = {"rtmp://live.hkstv.hk.lxdns.com/live/hks", @@ -291,7 +291,7 @@ git submodule update --init ``` - 作为推流客户端器： - ``` + ```cpp PlayerProxy::Ptr player(new PlayerProxy("app","stream")); //拉一个流，生成一个RtmpMediaSource，源的名称是"app/stream" //你也可以以其他方式生成RtmpMediaSource，比如说MP4文件（请研读MediaReader代码）