From cb16cabb64e99d7f505822a49665725ff5b61ff6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 15 八月 2022 15:37:13 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' --- README.md | 103 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 83 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 5a5dcc4..1c131bf 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,18 @@ -# wvp-pro-2.0 + +# 寮�绠卞嵆鐢ㄧ殑28181鍗忚瑙嗛骞冲彴 -WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠粶瑙嗛骞冲彴锛岃礋璐e疄鐜版牳蹇冧俊浠や笌璁惧绠$悊鍚庡彴閮ㄥ垎锛屾敮鎸丯AT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR銆丏VR鎺ュ叆銆傛敮鎸佸浗鏍囩骇鑱旓紝鏀寔rtsp/rtmp绛夎棰戞祦杞彂鍒板浗鏍囧钩鍙帮紝鏀寔rtsp/rtmp绛夋帹娴佽浆鍙戝埌鍥芥爣骞冲彴銆� +[](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) -娴佸獟浣撴湇鍔″熀浜嶼LMediaKit-https://github.com/xiongziliang/ZLMediaKit -鍓嶇椤甸潰鍩轰簬MediaServerUI杩涜淇敼. +WEB VIDEO PLATFORM鏄竴涓熀浜嶨B28181-2016鏍囧噯瀹炵幇鐨勫紑绠卞嵆鐢ㄧ殑缃戠粶瑙嗛骞冲彴锛岃礋璐e疄鐜版牳蹇冧俊浠や笌璁惧绠$悊鍚庡彴閮ㄥ垎锛屾敮鎸丯AT绌块�忥紝鏀寔娴峰悍銆佸ぇ鍗庛�佸畤瑙嗙瓑鍝佺墝鐨処PC銆丯VR鎺ュ叆銆傛敮鎸佸浗鏍囩骇鑱旓紝鏀寔灏嗕笉甯﹀浗鏍囧姛鑳界殑鎽勫儚鏈�/鐩存挱娴�/鐩存挱鎺ㄦ祦杞彂鍒板叾浠栧浗鏍囧钩鍙般�� + +娴佸獟浣撴湇鍔″熀浜嶡澶忔 ZLMediaKit [https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit) +鎾斁鍣ㄤ娇鐢ˊdexter jessibuca [https://github.com/langhuihui/jessibuca/tree/v3](https://github.com/langhuihui/jessibuca/tree/v3) +鍓嶇椤甸潰鍩轰簬@Kyle MediaServerUI [https://gitee.com/kkkkk5G/MediaServerUI](https://gitee.com/kkkkk5G/MediaServerUI) 杩涜淇敼. # 搴旂敤鍦烘櫙锛� 鏀寔娴忚鍣ㄦ棤鎻掍欢鎾斁鎽勫儚澶磋棰戙�� @@ -16,15 +24,20 @@ # 椤圭洰鐩爣 鏃ㄥ湪鎵撻�犱竴涓槗閰嶇疆,鏄撲娇鐢�,渚夸簬缁存姢鐨�28181鍥芥爣淇′护绯荤粺, 渚濇墭浼樼鐨勫紑婧愭祦濯掍綋鏈嶅姟妗嗘灦ZLMediaKit, 瀹炵幇涓�涓畬鏁存槗鐢℅B28181骞冲彴. +# 閮ㄧ讲鏂囨。 +[doc.wvp-pro.cn](https://doc.wvp-pro.cn) + # gitee鍚屾浠撳簱 -https://gitee.com/18010473990/wvp-GB28181.git +https://gitee.com/pan648540858/wvp-GB28181-pro.git # 鎴浘 - - - - - + + + + + + + # 1.0 鍩虹鐗规�� 1. 瑙嗛棰勮; @@ -68,7 +81,7 @@ - [X] 绉诲姩浣嶇疆閫氱煡澶勭悊 - [X] 鎶ヨ浜嬩欢璁㈤槄 - [X] 鎶ヨ浜嬩欢閫氱煡澶勭悊 - - [ ] 璁惧鐩綍璁㈤槄 + - [X] 璁惧鐩綍璁㈤槄 - [X] 璁惧鐩綍閫氱煡澶勭悊 16. 绉诲姩浣嶇疆鏌ヨ鍜屾樉绀猴紝鍙�氳繃閰嶇疆鏂囦欢璁剧疆绉诲姩浣嶇疆鍘嗗彶鏄惁瀛樺偍 @@ -84,25 +97,75 @@ - [X] 骞冲彴鐘舵�佹煡璇� - [X] 骞冲彴淇℃伅鏌ヨ - [X] 骞冲彴杩滅▼鍚姩 + - [X] 姣忎釜绾ц仈骞冲彴鍙嚜瀹氫箟鐨勮櫄鎷熺洰褰� + - [X] 鐩綍璁㈤槄涓庨�氱煡 + - [X] 褰曞儚鏌ョ湅涓庢挱鏀� + - [X] GPS璁㈤槄涓庨�氱煡锛堢洿鎾帹娴侊級 - [X] 娣诲姞RTSP瑙嗛 - [X] 娣诲姞鎺ュ彛閴存潈 -- [ ] 娣诲姞ONVIF鎺㈡祴灞�鍩熺綉鍐呯殑璁惧 - [X] 娣诲姞RTMP瑙嗛 -- [X] 鏀寔浣跨敤mysql浣滀负鏁版嵁搴擄紝 榛樿sqlite3,寮�绠卞嵆鐢ㄣ�� -- [ ] 娣诲姞绯荤粺閰嶇疆 -- [ ] 娣诲姞鐢ㄦ埛绠$悊 +- [X] 浜戠褰曞儚锛堥渶瑕侀儴缃插崟鐙湇鍔¢厤鍚堜娇鐢級 +- [X] 澶氭祦濯掍綋鑺傜偣锛岃嚜鍔ㄩ�夋嫨璐熻浇鏈�浣庣殑鑺傜偣浣跨敤銆� +- [X] WEB绔敮鎸佹挱鏀綡264涓嶩265锛岄煶棰戞敮鎸丟.711A/G.711U/AAC,瑕嗙洊鍥芥爣甯哥敤缂栫爜鏍煎紡銆� +- [X] 鏀寔鐢靛瓙鍦板浘銆� +- [X] 鏀寔鎺ュ叆WGS84鍜孏CJ02涓ょ鍧愭爣绯汇�� +[//]: # (# docker蹇�熶綋楠�) -# 椤圭洰閮ㄧ讲 -鍙傝��:[WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki) +[//]: # (鐩墠浣滆�呯殑docker-compose鍥犱负鏃堕棿鏈夐檺缁存姢涓嶅強鏃讹紝杩欓噷鎻愪緵绗笁鏂规彁渚涚殑渚涘ぇ瀹朵娇鐢紝缁存姢涓嶆槗锛屽ぇ瀹惰寰楃粰杩欎綅灏忎紮浼寸偣涓猻tar銆� ) + +[//]: # (https://github.com/SaltFish001/wvp_pro_compose) + +[//]: # ([https://github.com/SaltFish001/wvp_pro_compose](https://github.com/SaltFish001/wvp_pro_compose)) + +[//]: # (杩欐槸浣滆�呯淮鎶ょ殑涓�涓暅鍍忥紝鍙兘瀛樺湪涓嶅強鏃剁殑闂銆�) + +[//]: # (```shell) + +[//]: # (docker pull 648540858/wvp_pro) + +[//]: # () +[//]: # (docker run --env WVP_IP="浣犵殑IP" -it -p 18080:18080 -p 30000-30500:30000-30500/udp -p 30000-30500:30000-30500/tcp -p 80:80 -p 5060:5060 -p 5060:5060/udp 648540858/wvp_pro) + +[//]: # (```) + +[//]: # (docker浣跨敤璇︽儏鏌ョ湅锛歔https://hub.docker.com/r/648540858/wvp_pro](https://hub.docker.com/r/648540858/wvp_pro)) # gitee鍚屾浠撳簱 -https://gitee.com/18010473990/wvp-GB28181.git +https://gitee.com/pan648540858/wvp-GB28181-pro.git + +# 閬囧埌闂 +鍥芥爣鏈�楹荤儲鐨勫湴鏂瑰湪浜庤澶囩殑鍏煎鎬э紝鎵�浠ラ渶瑕佸ぇ閲忕殑璁惧鏉ユ祴璇曪紝鐩墠浣滆�呮墜閲岀殑璁惧鏈夐檺锛屽啀鍔犱笂浣滆�呮按骞虫湁闄愶紝鎵�浠ラ亣鍒伴棶棰樺湪鎵�闅惧厤锛� +1. 鏌ョ湅wiki锛屼粩缁嗙殑闃呰鍙互甯綘閬垮厤鍑犱箮鎵�鏈夌殑闂 +2. 鎼滅储issues锛岃繖閲屾湁澶ч儴鍒嗙殑绛旀 +3. 鍔燪Q缇わ紝杩欓噷鏈夊ぇ閲忕儹蹇冪殑灏忎紮浼达紝浣嗘槸鍓嶆彁鏂板笇鏈涗綘宸茬粡浠旂粏闃呰浜唚iki鍜屾悳绱簡issues銆� +4. 浣犲彲浠ヨ浣滆�呬负浣犺В绛旓紝浣嗘槸鎴戜笉鏄厤璐圭殑銆� +5. 浣犲彲浠ユ妸閬囧埌闂鐨勮澶囧瘎缁欐垜锛屽彲浠ユ洿瀹规槗鐨勫鐜伴棶棰樸�� + + +# 鍚堜綔 +鐩墠寰堝鎵撶潃鍚堜綔鐨勫箤瀛愭潵绉佽亰鐨勶紝鍏跺疄澶у澶у彲涓嶅繀锛岀洰鍓嶄綔鑰呮病鏈夌簿鍔涳紝浣犳湁闂鍙互浠樿垂鎵炬垜瑙g瓟锛屼篃鍙互鎻怭R +锛屽鏋滃浠g爜鏈夊缓璁彲浠ユ彁ISSUE锛涗篃鍙互鍔犵兢涓�璧疯亰鑱娿�傛垜浠杩庢墍鏈夋湁鍏磋叮鍙備笌鍒伴」鐩腑鏉ョ殑浜恒�� + + # 浣跨敤甯姪 -QQ缇�: 901799015, 542509000(ZLM澶х兢) +QQ缇�: 901799015, ZLM浣跨敤鏂囨。[https://github.com/ZLMediaKit/ZLMediaKit](https://github.com/ZLMediaKit/ZLMediaKit) QQ绉佷俊涓�鑸笉鍥�, 绮惧姏鏈夐檺.娆㈣繋澶у鍦ㄧ兢閲岃璁�.瑙夊緱椤圭洰瀵逛綘鏈夊府鍔╋紝娆㈣繋star鍜屾彁浜r銆� +# 鎺堟潈鍗忚 +鏈」鐩嚜鏈変唬鐮佷娇鐢ㄥ鏉剧殑MIT鍗忚锛屽湪淇濈暀鐗堟潈淇℃伅鐨勬儏鍐典笅鍙互鑷敱搴旂敤浜庡悇鑷晢鐢ㄣ�侀潪鍟嗕笟鐨勯」鐩�� 浣嗘槸鏈」鐩篃闆剁鐨勪娇鐢ㄤ簡涓�浜涘叾浠栫殑寮�婧愪唬鐮侊紝鍦ㄥ晢鐢ㄧ殑鎯呭喌涓嬭鑷鏇夸唬鎴栧墧闄わ紱 鐢变簬浣跨敤鏈」鐩�屼骇鐢熺殑鍟嗕笟绾犵悍鎴栦镜鏉冭涓轰竴姒備笌鏈」鐩強寮�鍙戣�呮棤鍏筹紝璇疯嚜琛屾壙鎷呮硶寰嬮闄┿�� 鍦ㄤ娇鐢ㄦ湰椤圭洰浠g爜鏃讹紝涔熷簲璇ュ湪鎺堟潈鍗忚涓悓鏃惰〃鏄庢湰椤圭洰渚濊禆鐨勭涓夋柟搴撶殑鍗忚 + # 鑷磋阿 -鎰熻阿浣滆�匸澶忔](https://github.com/xia-chu) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦 +鎰熻阿浣滆�匸澶忔](https://github.com/xia-chu) 鎻愪緵杩欎箞妫掔殑寮�婧愭祦濯掍綋鏈嶅姟妗嗘灦,骞跺湪寮�鍙戣繃绋嬩腑缁欎簣鏀寔涓庡府鍔┿�� +鎰熻阿浣滆�匸dexter langhuihui](https://github.com/langhuihui) 寮�婧愯繖涔堝ソ鐢ㄧ殑WEB鎾斁鍣ㄣ�� +鎰熻阿浣滆�匸Kyle](https://gitee.com/kkkkk5G) 寮�婧愪簡濂界敤鐨勫墠绔〉闈� +鎰熻阿鍚勪綅澶т浆鐨勮禐鍔╀互鍙婂椤圭洰鐨勬寚姝d笌甯姪銆傚寘鎷絾涓嶉檺浜庝唬鐮佽础鐚�侀棶棰樺弽棣堛�佽祫閲戞崘璧犵瓑鍚勭鏂瑰紡鐨勬敮鎸侊紒浠ヤ笅鎺掑悕涓嶅垎鍏堝悗锛� +[lawrencehj](https://github.com/lawrencehj) [Smallwhitepig](https://github.com/Smallwhitepig) [swwhaha](https://github.com/swwheihei) +[hotcoffie](https://github.com/hotcoffie) [xiaomu](https://github.com/nikmu) [TristingChen](https://github.com/TristingChen) +[chenparty](https://github.com/chenparty) [Hotleave](https://github.com/hotleave) [ydwxb](https://github.com/ydwxb) +[ydpd](https://github.com/ydpd) [szy833](https://github.com/szy833) [ydwxb](https://github.com/ydwxb) [Albertzhu666](https://github.com/Albertzhu666) +[mk1990](https://github.com/mk1990) + +ps: 鍒氬鍔犱簡杩欎釜鍚嶅崟锛岃偗瀹氶仐婕忎簡涓�浜涘ぇ浣紝娆㈣繋澶т浆鑱旂郴鎴戞坊鍔犮�� -- Gitblit v1.8.0