leesam
|
10e2180c72
|
[bugfix]支持context-path配置
|
2024-04-10 19:07:37 +08:00 |
|
648540858
|
9bb5ef6522
|
修复多个wvp执行推流转发失败的BUG
|
2024-04-10 18:22:42 +08:00 |
|
648540858
|
1d36382986
|
修改抓拍存储
|
2024-04-10 16:52:39 +08:00 |
|
648540858
|
bb350e847d
|
修复抓拍存储
|
2024-04-10 16:35:47 +08:00 |
|
648540858
|
d410a3ca18
|
添加抓拍支持
|
2024-04-10 16:26:46 +08:00 |
|
648540858
|
b08f00104e
|
abl添加getMediaInfo接口实现
|
2024-04-10 00:03:45 +08:00 |
|
648540858
|
2dc7eecb47
|
abl添加checkMediaServer实现
|
2024-04-09 23:41:48 +08:00 |
|
648540858
|
48a0e88b95
|
Merge branch 'refs/heads/master' into dev/abl支持
|
2024-04-09 22:52:33 +08:00 |
|
648540858
|
82ca3a778a
|
优化媒体节点redis数据格式
|
2024-04-09 22:52:06 +08:00 |
|
648540858
|
54b878d2e1
|
优化代码，升级版本号为2.7.1
|
2024-04-09 22:43:45 +08:00 |
|
648540858
|
0077df29d4
|
临时提交
|
2024-04-09 21:42:08 +08:00 |
|
648540858
|
cf8320e749
|
Merge pull request #1400 from Anyuei/master
处理可能会出现的空指针异常
|
2024-04-09 20:57:50 +08:00 |
|
648540858
|
5457407601
|
恢复abl实现
|
2024-04-09 20:56:41 +08:00 |
|
648540858
|
7ed84bed7f
|
Merge pull request #1411 from 648540858/dev/zlm
优化zlm接入以及Hook的订阅机制
|
2024-04-09 20:11:10 +08:00 |
|
648540858
|
a1861038e5
|
修复录像下载
|
2024-04-09 19:53:43 +08:00 |
|
648540858
|
7a59acc8e6
|
合并主线
|
2024-04-09 17:30:18 +08:00 |
|
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
|
ae239c8848
|
Merge branch 'master' into 1078
|
2024-04-08 18:15:06 +08:00 |
|
648540858
|
9badf1c7fe
|
1078-添加位置附加信息定义
|
2024-04-08 18:15:02 +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
|
d54787f323
|
1078-添加读取位置信息汇报附加信息读取
|
2024-04-07 23:50:58 +08:00 |
|
648540858
|
8a2dc6031e
|
1078-实现云台控制接口
|
2024-04-07 22:06:41 +08:00 |
|
648540858
|
9255ea802f
|
1078-添加云台控制接口
|
2024-04-07 20:59:21 +08:00 |
|
648540858
|
349b0442d6
|
Merge remote-tracking branch 'origin/1078' into 1078
|
2024-04-07 20:42:32 +08:00 |
|
648540858
|
403eb4499d
|
Merge branch 'master' into 1078
|
2024-04-07 20:42:10 +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
|
6757f4b719
|
1078-云台变倍控制
|
2024-04-07 07:21:21 +08:00 |
|
648540858
|
8ba30e83ef
|
1078-修复错别字
|
2024-04-07 07:19:02 +08:00 |
|
648540858
|
98d9eb5314
|
1078-添加云台红外补光控制
|
2024-04-07 07:17:35 +08:00 |
|
648540858
|
a8a4aecc15
|
1078-添加云台雨刷控制
|
2024-04-07 07:15:43 +08:00 |
|
648540858
|
b649464753
|
1078-添加云台光圈控制
|
2024-04-07 07:12:51 +08:00 |
|
648540858
|
ebdd9ab534
|
1078-添加云台焦距控制
|
2024-04-07 07:09:49 +08:00 |
|
648540858
|
a1ab834875
|
1078-添加云台旋转
|
2024-04-07 07:07:27 +08:00 |
|
648540858
|
4ec4d618d6
|
1078-添加文件上传控制
|
2024-04-07 07:02:06 +08:00 |
|
648540858
|
5fc1000fcc
|
1078-添加文件上传完成通知
|
2024-04-07 06:56:39 +08:00 |
|
648540858
|
302eb98d51
|
1078-添加文件上传指令
|
2024-04-07 06:44:52 +08:00 |
|
648540858
|
984d8743be
|
1078-优化录像回放开始和停止
|
2024-04-06 00:42:54 +08:00 |
|
648540858
|
26bbeac6c7
|
1078-添加录像回放开始和停止
|
2024-04-06 00:06:40 +08:00 |
|