Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,401 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

1401 Commits (06bbe3fe01e5af9486c309693a975077df813f7c)

Author SHA1 Message Date
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858 ebe8667b13 Merge branch 'wvp-28181-2.0' 2022-09-26 15:40:31 +08:00
648540858 386b48192d 修复点播时viatag不规范的问题 2022-09-26 15:38:55 +08:00
648540858 6ae33f2a67 修复空指针 2022-09-26 14:01:22 +08:00
648540858 2ff3cdb6a1 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-09-26 11:25:53 +08:00
648540858 30979eb6ea
Merge pull request #627 from 648540858/wvp-dialog 
修复兼通api错误
 2022-09-26 10:41:04 +08:00
648540858 3fb9694c2d 修复兼通api错误 2022-09-26 10:40:20 +08:00
648540858 bf97908c5e
Merge pull request #626 from 648540858/wvp-dialog 
合并bug修复
 2022-09-26 10:38:48 +08:00
648540858 0cc5917d8a 修复通道更新 2022-09-26 10:14:31 +08:00
648540858 559fbf1258 添加缺失的打印信息 2022-09-26 10:02:26 +08:00
648540858 d7a1b94f90 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
 2022-09-24 21:04:58 +08:00
648540858 d176b5231b
Merge pull request #620 from xu-bin-bin/wvp-28181-2.0 
处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
 2022-09-23 23:18:06 +08:00
648540858 d7355a671b
Merge pull request #625 from 648540858/wvp-dialog 
强化对与不通设备的兼容能力
 2022-09-23 23:17:39 +08:00
648540858 2ea1bc8ae1 Merge remote-tracking branch 'origin/wvp-dialog' into wvp-dialog 2022-09-23 23:15:57 +08:00
648540858 4c6c77be7a 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
648540858 cd117ed228 dialog去除以及异常情况处理优化 2022-09-23 23:15:39 +08:00
648540858 e44e3dc940 异常情况打印信息优化 2022-09-23 23:08:58 +08:00
648540858 b79a49fa76 dialog去除以及异常情况处理优化 2022-09-23 22:45:23 +08:00
xubinbin fc7f1b3459 处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。 2022-09-23 10:55:42 +08:00
648540858 a574ff0944 修复使用队列导致的问题 2022-09-22 16:56:20 +08:00
648540858 70c20364af 修复流注销时移除流认证信息 2022-09-22 14:10:26 +08:00
648540858 1abfced3b4 修复点播后bye信息的发送 2022-09-22 11:32:01 +08:00
648540858 5e73874880 添加队列处理redis消息和sip消息，支持使用推流状态作为通道在线状态 2022-09-22 11:22:08 +08:00
648540858 710600db6f 优化sip消息，去除自动dialog创建 2022-09-21 18:18:37 +08:00
648540858 1ee56d50d8 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-16 18:04:13 +08:00
648540858 692f716788 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
648540858 7462e2776b
Merge pull request #608 from wenyanjun/wvp-28181-2.0 
修复下载录像失败问题
 2022-09-15 10:49:31 +08:00
648540858 ab74d1cff9 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
 2022-09-14 20:51:21 +08:00
648540858 5b3dc4d595 优化点播结束后关闭RTPServer 2022-09-14 16:11:18 +08:00
wenyanjun 12571e0db1 修复下载录像失败问题 2022-09-14 14:32:22 +08:00
648540858 250a059ca0 优化目录发送 2022-09-13 14:53:41 +08:00
648540858 243edbd143 为User-Agent添加必要的版本信息 2022-09-09 23:19:19 +08:00
648540858 221f99c764 优化sip消息 2022-09-09 17:06:19 +08:00
648540858 b5fb82934e 修复发送目录信息是状态错误 2022-09-08 21:22:49 +08:00
648540858 bd5b9ca1f7 获取实际内容长度，不使用header中的长度信息 2022-09-08 20:20:43 +08:00
648540858 feb9996538 修复添加业务分组失败 2022-09-08 17:51:12 +08:00
648540858 394c40d8bb 修复目录订阅的状态异常 2022-09-08 16:42:46 +08:00
648540858 4bda14b098 修复cseq序号回退 2022-09-08 15:27:47 +08:00
648540858 a6f9c090cb 重启服务时上级平台直接注销再注册 2022-09-08 10:50:44 +08:00
648540858 2f76fa98bb Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-09-08 09:46:35 +08:00
648540858 6a5ab117f5 修复推流列表状态过滤 2022-09-08 09:21:11 +08:00
648540858 f1c7d612ca
Merge pull request #590 from ixingqiao/wvp-28181-2.0 
1.解决轮询内存增长过快问题
 2022-09-08 09:19:57 +08:00
648540858 60c4f767f0 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-09-07 16:18:52 +08:00
648540858 ec0ec5eb54 修复并发点播时可能出现的rtpServer开启但是还未收到流的情况，编码类型136，137,138默认开启音频通道 2022-09-07 16:18:35 +08:00
jiang 3884e9a56a 1.根据redis消息更新推流列表时同时更新在线状态 
2.推流列表的模板增加在线状态
 2022-09-07 15:56:48 +08:00
648540858 e7bdcc1f8d 修复选择通道时默认节点显示错误的问题 2022-09-06 16:31:28 +08:00
648540858 d5e8aa62a1 添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活 2022-09-05 17:10:21 +08:00
648540858 aa6bce35c7 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2022-09-05 09:44:24 +08:00
648540858 cfe9c762d6 修复前端播放 2022-09-05 09:40:14 +08:00
648540858 0134488428 优化推流列表查询 2022-09-02 17:00:41 +08:00