From 87acd73efcde49cb5630c266db4ebd3f6b1b9dfd Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期二, 06 四月 2021 15:13:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- README.md | 54 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 46 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 724cfef..fa9fe03 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -# wvp +# wvp-2.0 +鍦�1.0鐨勫熀纭�涓婂疄鐜板浗鏍囩骇鑱� + WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勭綉缁滆棰戝钩鍙帮紝璐熻矗瀹炵幇鏍稿績淇′护涓庤澶囩鐞嗗悗鍙伴儴鍒嗭紝鏀寔NAT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆� 娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit 鍓嶆椤甸潰鍩轰簬MediaServerUI杩涜淇敼. @@ -18,14 +20,27 @@   -# 鍘熺増鐗规�э細 +# 1.0 鏀寔鐗规�� 1. 瑙嗛棰勮; 2. 浜戝彴鎺у埗锛堟柟鍚戙�佺缉鏀炬帶鍒讹級; 3. 瑙嗛璁惧淇℃伅鍚屾; 4. 绂诲湪绾跨洃鎺�; 5. 褰曞儚鏌ヨ涓庡洖鏀撅紙鍩轰簬NVR\DVR锛屾殏涓嶆敮鎸佸揩杩涖�乻eek鎿嶄綔锛�; 6. 鏃犱汉瑙傜湅鑷姩鏂祦; -7. 鏀寔UDP鍜孴CP涓ょ鍥芥爣淇′护浼犺緭妯″紡; +7. 鏀寔UDP鍜孴CP涓ょ鍥芥爣淇′护浼犺緭妯″紡; +8. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�; +9. 鏀寔骞冲彴鎺ュ叆, 閽堝澶у钩鍙板ぇ閲忚澶囩殑鎯呭喌杩涜浼樺寲; +10. 鏀寔妫�绱�,閫氶亾绛涢��; +11. 鏀寔鑷姩閰嶇疆ZLM濯掍綋鏈嶅姟, 鍑忓皯鍥犻厤缃棶棰樻墍鍑虹幇鐨勯棶棰�; +12. 鏀寔鍚敤udp澶氱鍙ｆā寮�, 鎻愰珮udp妯″紡涓嬪獟浣撲紶杈撴�ц兘; +13. 鏀寔閫氶亾鏄惁鍚湁闊抽鐨勮缃�; +14. 鏀寔閫氶亾瀛愮洰褰曟煡璇�; +15. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�; +16. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧� +17. 鏀寔鍥芥爣缃戠粶鏍℃椂 +18. 鏀寔鍏綉閮ㄧ讲, 鏀寔wvp涓巣lm鍒嗗紑閮ㄧ讲 +19. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦(闇�瑕佸皢closeWaitRTPInfo璁句负false) +20. 鎶ヨ淇℃伅澶勭悊锛屾敮鎸佸悜鍓嶇鎺ㄩ�佹姤璀︿俊鎭� # 鏂版敮鎸佺壒鎬� 1. 闆嗘垚web鐣岄潰, 涓嶉渶瑕佸崟鐙儴缃插墠绔湇鍔�, 鐩存帴鍒╃敤wvp鍐呯疆鏂囦欢鏈嶅姟閮ㄧ讲, 闅弚vp涓�璧烽儴缃�; @@ -42,12 +57,35 @@ 12. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦 13. 鏀寔鍥哄畾娴佸湴鍧�鍜岃嚜鍔ㄧ偣鎾紝鍚屾椂鏀寔鏈偣鎾椂鐩存帴鎾斁娴佸湴鍧�锛屼唬鐮佽嚜鍔ㄥ彂璧风偣鎾�. ( [鏌ョ湅WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki/%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8%E5%9B%BA%E5%AE%9A%E6%92%AD%E6%94%BE%E5%9C%B0%E5%9D%80%E4%B8%8E%E8%87%AA%E5%8A%A8%E7%82%B9%E6%92%AD)锛� 14. 鎶ヨ淇℃伅澶勭悊锛屾敮鎸佸悜鍓嶇鎺ㄩ�佹姤璀︿俊鎭� +15. 鏀寔璁㈤槄涓庨�氱煡鏂规硶 + - [X] 绉诲姩浣嶇疆璁㈤槄 + - [X] 绉诲姩浣嶇疆閫氱煡澶勭悊 + - [X] 鎶ヨ浜嬩欢璁㈤槄 + - [X] 鎶ヨ浜嬩欢閫氱煡澶勭悊 + - [ ] 璁惧鐩綍璁㈤槄 + - [X] 璁惧鐩綍閫氱煡澶勭悊 +16. 绉诲姩浣嶇疆鏌ヨ鍜屾樉绀猴紝鍙�氳繃閰嶇疆鏂囦欢璁剧疆绉诲姩浣嶇疆鍘嗗彶鏄惁瀛樺偍 -# 寰呭疄鐜帮細 -涓婄骇绾ц仈 -鎺ㄦ祦鍒楄〃 -鎷夋祦鍒楄〃 -web鐣岄潰绯荤粺璁剧疆 +# 2.0 鏀寔鐗规�� +- [X] 鍥芥爣閫氶亾鍚戜笂绾ц仈 + - [X] WEB娣诲姞涓婄骇骞冲彴 + - [X] 娉ㄥ唽 + - [X] 蹇冭烦淇濇椿 + - [X] 閫氶亾閫夋嫨 + - [X] 閫氶亾鎺ㄩ�� + - [X] 鐐规挱 + - [X] 浜戝彴鎺у埗 + - [X] 骞冲彴鐘舵�佹煡璇� + - [X] 骞冲彴淇℃伅鏌ヨ + - [X] 骞冲彴杩滅▼鍚姩 +- [X] 娣诲姞RTSP瑙嗛 +- [ ] 娣诲姞ONVIF鎺㈡祴灞�鍩熺綉鍐呯殑璁惧 +- [X] 娣诲姞RTMP瑙嗛 +- [ ] 娣诲姞绯荤粺閰嶇疆 +- [ ] 娣诲姞鐢ㄦ埛绠＄悊 + +# 寰呭疄鐜帮細 +web鐣岄潰绯荤粺璁剧疆 浣跨敤mysql浣滀负鏁版嵁搴� # 椤圭洰閮ㄧ讲 -- Gitblit v1.8.0