From 619a66f9998fa646a69903a4c22e2bbf92e2221b Mon Sep 17 00:00:00 2001 From: lawrencehj <1934378145@qq.com> Date: 星期三, 28 七月 2021 09:49:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0 --- README.md | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3335e9f..30cd2c5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,12 @@ # wvp-pro-2.0 +[](https://travis-ci.org/xia-chu/ZLMediaKit) +[](https://github.com/xia-chu/ZLMediaKit/blob/master/LICENSE) +[](https://en.cppreference.com/) +[](https://github.com/xia-chu/ZLMediaKit) +[](https://github.com/xia-chu/ZLMediaKit/pulls) + + WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠粶瑙嗛骞冲彴锛岃礋璐ｅ疄鐜版牳蹇冧俊浠や笌璁惧绠＄悊鍚庡彴閮ㄥ垎锛屾敮鎸丯AT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆傛敮鎸佸浗鏍囩骇鑱旓紝鏀寔rtsp/rtmp绛夎棰戞祦杞彂鍒板浗鏍囧钩鍙帮紝鏀寔rtsp/rtmp绛夋帹娴佽浆鍙戝埌鍥芥爣骞冲彴銆� 娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit @@ -15,6 +22,9 @@ # 椤圭洰鐩爣 鏃ㄥ湪鎵撻�犱竴涓槗閰嶇疆,鏄撲娇鐢�,渚夸簬缁存姢鐨�28181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓�涓畬鏁存槗鐢℅B28181骞冲彴. + +# 閮ㄧ讲鏂囨。 +[https://github.com/648540858/wvp-GB28181-pro/wiki](https://github.com/648540858/wvp-GB28181-pro/wiki) # gitee鍚屾浠撳簱 https://gitee.com/18010473990/wvp-GB28181.git @@ -89,13 +99,12 @@ - [ ] 娣诲姞ONVIF鎺㈡祴灞�鍩熺綉鍐呯殑璁惧 - [X] 娣诲姞RTMP瑙嗛 - [X] 浜戠褰曞儚锛堥渶瑕侀儴缃插崟鐙湇鍔￠厤鍚堜娇鐢級 -- [X] 鏀寔浣跨敤mysql浣滀负鏁版嵁搴擄紝 榛樿sqlite3,寮�绠卞嵆鐢ㄣ�� +- [X] 鏀寔浣跨敤mysql浣滀负鏁版嵁搴擄紝榛樿sqlite3,寮�绠卞嵆鐢ㄣ�� - [ ] 娣诲姞绯荤粺閰嶇疆 - [ ] 娣诲姞鐢ㄦ埛绠＄悊 +- [X] WEB绔敮鎸佹挱鏀綡264涓嶩265锛岄煶棰戞敮鎸丟.711A/G.711U/AAC,瑕嗙洊鍥芥爣甯哥敤缂栫爜鏍煎紡銆� -# 椤圭洰閮ㄧ讲 -鍙傝��:[WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki) # gitee鍚屾浠撳簱 https://gitee.com/18010473990/wvp-GB28181.git -- Gitblit v1.8.0