648540858
|
9abc1974a5
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
|
2024-04-09 17:28:52 +08:00 |
|
648540858
|
0fa9a1506c
|
Merge branch '2.7.0'
|
2024-04-09 17:26:25 +08:00 |
|
648540858
|
de5d025cee
|
修复单端口收流时音频禁用失败的问题
|
2024-04-09 16:10:02 +08:00 |
|
648540858
|
ab318fcf70
|
修复点播错误时关闭rtpserver
|
2024-04-09 14:53:11 +08:00 |
|
648540858
|
6dd870e74c
|
修复点播端口为空
|
2024-04-09 10:59:59 +08:00 |
|
648540858
|
bbf19c7909
|
合并主线
|
2024-04-09 10:40:16 +08:00 |
|
648540858
|
b1b6fae22c
|
Merge branch 'master' into dev/zlm
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
# src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
|
2024-04-09 10:35:11 +08:00 |
|
648540858
|
0b2f635176
|
移除非主线内容
|
2024-04-09 10:30:00 +08:00 |
leesam
|
b6d70c6807
|
Merge branch 'develop-add-api-key' of https://github.com/ancienter/wvp-GB28181-pro into develop-add-api-key
|
2024-04-09 09:59:06 +08:00 |
ancienter
|
25ff2fc4ef
|
Merge branch '648540858:master' into develop-add-api-key
|
2024-04-09 09:52:23 +08:00 |
|
648540858
|
a890b62fa1
|
Merge branch '2.7.0'
|
2024-04-08 18:13:33 +08:00 |
|
648540858
|
48351c875e
|
国标级联支持制定200OK中sdp的IP
|
2024-04-08 18:13:15 +08:00 |
|
648540858
|
7d0aebd311
|
Merge branch '2.7.0'
|
2024-04-07 20:26:01 +08:00 |
|
648540858
|
aeb75c0df1
|
优化推流结束后发送BYE
|
2024-04-07 20:25:44 +08:00 |
|
648540858
|
7d53009987
|
优化推流通知
|
2024-04-07 20:06:48 +08:00 |
|
648540858
|
62f716be9c
|
添加idea logo
|
2024-04-03 15:04:33 +08:00 |
|
648540858
|
5743917439
|
添加idea logo
|
2024-04-03 15:03:49 +08:00 |
|
648540858
|
a1c02605c1
|
abl-实现closeRtpServer
|
2024-04-02 14:41:02 +08:00 |
|
648540858
|
86a35f3612
|
合并开源主线
|
2024-04-02 11:25:19 +08:00 |
|
648540858
|
1bb813758a
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2024-04-02 11:20:51 +08:00 |
|
648540858
|
67688d4a4b
|
优化停止国标收流
|
2024-04-02 11:20:19 +08:00 |
|
648540858
|
969ff86ebe
|
放行abl hook 接口
|
2024-04-02 09:53:47 +08:00 |
|
648540858
|
8b90fade9e
|
支持使用abl接收国标流
|
2024-04-02 00:05:09 +08:00 |
|
648540858
|
b78769f997
|
临时提交
|
2024-04-01 18:35:26 +08:00 |
|
648540858
|
33b75be71a
|
支持abl hook
|
2024-04-01 18:21:38 +08:00 |
|
648540858
|
b7b950ec8b
|
支持展示abl-logo
|
2024-04-01 16:47:45 +08:00 |
|
648540858
|
4d6f881460
|
修复空指针异常
|
2024-04-01 16:20:30 +08:00 |
|
648540858
|
722f1d0ee7
|
国标级联-修复拉流代理播放
|
2024-04-01 16:17:01 +08:00 |
|
648540858
|
426ea72d7f
|
修复拉流代理播放
|
2024-04-01 15:46:36 +08:00 |
|
648540858
|
73733ab13f
|
修复推流播放
|
2024-04-01 15:40:21 +08:00 |
|
648540858
|
fd2ef6effe
|
修复国标点播
|
2024-04-01 15:29:49 +08:00 |
|
648540858
|
ecd1d2a414
|
临时提交
|
2024-04-01 15:22:45 +08:00 |
|
leesam
|
23beb4fde0
|
Merge branch 'master' into develop-add-api-key
|
2024-04-01 09:19:46 +08:00 |
|
648540858
|
2738750c3e
|
移除失效的服务
|
2024-04-01 09:11:56 +08:00 |
|
648540858
|
5973dcd975
|
修复点播与录像回放
|
2024-03-31 00:34:44 +08:00 |
|
648540858
|
4548695a0b
|
hook优化
|
2024-03-31 00:28:45 +08:00 |
|
648540858
|
0447b83c3a
|
临时提交
|
2024-03-29 23:41:00 +08:00 |
|
648540858
|
0324855190
|
Merge branch 'master' into dev/abl支持
|
2024-03-29 22:55:09 +08:00 |
|
648540858
|
bb6ecb1552
|
Merge remote-tracking branch 'origin/master'
|
2024-03-29 19:18:50 +08:00 |
|
648540858
|
486daf4dfe
|
调整看守位控制接口
|
2024-03-29 19:18:34 +08:00 |
pei
|
728e60ce84
|
处理可能会出现的空指针异常
|
2024-03-29 11:55:44 +08:00 |
|
648540858
|
d34371a9f9
|
优化通道列表按钮排列
|
2024-03-28 23:06:27 +08:00 |
|
648540858
|
7a3b9c6f69
|
调整hook订阅通知的位置
|
2024-03-28 19:10:53 +08:00 |
|
648540858
|
cc793d16f5
|
调整hook订阅通知的位置
|
2024-03-28 18:35:28 +08:00 |
|
648540858
|
d6df7c8355
|
Merge branch 'master' into dev/abl支持
|
2024-03-28 18:13:36 +08:00 |
|
648540858
|
cf3d98102a
|
Merge branch 'master' into 2.7.0
|
2024-03-28 18:08:57 +08:00 |
|
648540858
|
1de344674a
|
使用冒号分隔redis的key
|
2024-03-28 18:08:33 +08:00 |
|
648540858
|
f3ac974036
|
临时提交
|
2024-03-28 17:12:31 +08:00 |
|
648540858
|
dae67453c4
|
Merge branch 'master' into dev/abl支持
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
|
2024-03-28 16:50:44 +08:00 |
|
648540858
|
53d4d10e1c
|
Merge branch 'master' into 2.7.0
|
2024-03-28 16:31:08 +08:00 |